Merge pull request #5078 from Superlagg/identifying-wood--yup-it-heal…

…s-you Identifying-wood--yup-it-heals-you
ARF-SS13 · Apr 29, 2024 · 98095eb · 98095eb
2 parents 1a485ef + 9986839
commit 98095eb
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 9 deletions.
diff --git a/code/__DEFINES/artifacts.dm b/code/__DEFINES/artifacts.dm
@@ -112,7 +112,7 @@
 #define ARTVAR_MAX_DELTA "ARTVAR_MAX_DELTA"
 
 #define ART_IDENT_MAX_DELTA 1 SECONDS // fun fact this barely works
-#define ART_IDENT_TIME 10 MINUTES
+#define ART_IDENT_TIME 5 SECONDS
 
 #define ART_PENANCE_TIME 20 MINUTES
 

diff --git a/code/controllers/subsystem/chat.dm b/code/controllers/subsystem/chat.dm
@@ -766,7 +766,11 @@ SUBSYSTEM_DEF(chat)
 		SSchat.start_page(viower, viowed)
 		return TRUE
 	if(action == "show_pic")
-		var/dat = {"<img src='[profile_pic]'>"}
+		var/dat = {"
+			<img src='[profile_pic]' width='100%' height='100%' 'object-fit: scale-down;'>
+			<br>
+			[profile_pic] <- Copy this link to your browser to view the full sized image.
+		"}
 		var/datum/browser/popup = new(viower, "enlargeImage", "Full Sized Picture!",1024,768)
 		popup.set_content(dat)
 		popup.open()

diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
@@ -671,8 +671,13 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
 		usr << browse(text("<HTML><HEAD><TITLE>[]</TITLE></HEAD><BODY><TT>[]</TT></BODY></HTML>", name, replacetext(oocnotes, "\n", "<BR>")), text("window=[];size=500x200", name))
 		onclose(usr, "[name]")
 	if(href_list["enlargeImageCreature"])
-		var/dat = {"<img src='[PfpHostLink(profilePicture)]'>"}
-		var/datum/browser/popup = new(usr, "enlargeImage", "Full Sized Picture!",1024,1024)
+		var/followers_clinic_full_of_big_strong_gay_dogs_in_it = PfpHostLink(profilePicture)
+		var/dat = {"
+			<img src='[followers_clinic_full_of_big_strong_gay_dogs_in_it]' width='100%' height='100%' 'object-fit: scale-down;'>
+			<br>
+			[followers_clinic_full_of_big_strong_gay_dogs_in_it] <- Copy this link to your browser to view the full sized image.
+		"}
+		var/datum/browser/popup = new(usr, "enlargeImage", "Full Sized Picture!",1024,768)
 		popup.set_content(dat)
 		popup.open()
 

diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
@@ -131,6 +131,7 @@
 	var/damage_mult = 1
 	/// dont touch this
 	var/finalmost_damage = 0
+	var/not_harmful = FALSE
 
 	var/damage = 10
 	var/damage_mod = 1 // Makes the gun's damage mod scale faction damage
@@ -596,6 +597,8 @@
 	return hit_something
 
 /obj/item/projectile/proc/faction_check(atom/target)
+	if(not_harmful)
+		return FALSE // its something that shouldnt be harmful
 	if(!isliving(target) || !LAZYLEN(faction))
 		return
 	var/mob/living/maybehit = target

diff --git a/modular_splurt/code/datums/modules/client/verbs/character_directory.dm b/modular_splurt/code/datums/modules/client/verbs/character_directory.dm
@@ -126,6 +126,7 @@ GLOBAL_LIST_INIT(char_directory_erptags, list("Top", "Bottom", "Switch", "No ERP
 		flavor_text = C.prefs.features["flavor_text"]
 
 		fricklist = C.prefs.features["flist"] || FALSE
+		var/thepic = C.prefs.profilePicture ? PfpHostLink(C.prefs.profilePicture, C.prefs.pfphost) : ""
 
 		directory_mobs.Add(list(list(
 			"name" = name,
@@ -142,7 +143,7 @@ GLOBAL_LIST_INIT(char_directory_erptags, list("Top", "Bottom", "Switch", "No ERP
 			"quid" = C.prefs.quester_uid, // love is a quest, and I'm on a quest for love
 			"dms_r_open" = TRUE,
 			"looking_for_friends" = C.prefs.needs_a_friend,
-			"profile_pic" = PfpHostLink(C.prefs.profilePicture, C.prefs.pfphost)
+			"profile_pic" = thepic,
 		)))
 
 	if(SSchat.debug_character_directory)

diff --git a/tgui/packages/tgui/interfaces/CharacterInspection.js b/tgui/packages/tgui/interfaces/CharacterInspection.js
@@ -136,13 +136,15 @@ const MainWindow = (props, context) => { // main screen turn on
     SelectedTab,
     setSelectedTab,
   ] = useLocalState(context, 'SelectedTab', 1);
+  /// check if data.profile_pic contains what is liokely a URL
+  const isURL = (data.profile_pic && data.profile_pic.match(/^(http|https):\/\//));
 
 
   return (
     <>
       {SelectedTab === 1 && (
         <Box>
-          {data.profile_pic && (
+          {isURL && data.profile_pic ? (
             <Box textAlign="center">
               <Button
                 color="transparent"
@@ -156,11 +158,16 @@ const MainWindow = (props, context) => { // main screen turn on
                   height="65vh"
                   src={data.profile_pic}
                   alt="Imagine a cool image here!"
-                  width="auto"
-                  maxWidth="100%"
-                  resizeMode="contain" />
+                  width="100%"
+                  style={{
+                    "objectFit": 'contain',
+                    "maxHeight": '65vh',
+                  }}
+                  />
               </Button>
             </Box>
+          ) : (
+            <Fragment />
           )}
           <Section title="Flavor Text">
             <Box