Bump dreamchecker version to 1.4 (#8711)

2026-07-18 19:39:42 +01:00 · 2020-04-28 15:41:32 +02:00
parent a0938b98c7
commit 4b97822bb4
88 changed files with 153 additions and 293 deletions
@@ -4,7 +4,7 @@
 	if(!istype(src, /mob/living/test) && !client)
 		return

-	if(speaker && !istype(speaker, /mob/living/test) && (!speaker.client && istype(src,/mob/abstract/observer) && client.prefs.toggles & CHAT_GHOSTEARS && !speaker in view(src)))
+	if(speaker && !istype(speaker, /mob/living/test) && (!speaker.client && istype(src,/mob/abstract/observer) && client.prefs.toggles & CHAT_GHOSTEARS && !(speaker in view(src))))
 			//Does the speaker have a client?  It's either random stuff that observers won't care about (Experiment 97B says, 'EHEHEHEHEHEHEHE')
 			//Or someone snoring.  So we make it where they won't hear it.
 		return
@@ -56,7 +56,7 @@
 		if(speaker_name != speaker.real_name && speaker.real_name)
 			speaker_name = "[speaker.real_name] ([speaker_name])"
 		track = "[ghost_follow_link(speaker, src)] "
-		if(client.prefs.toggles & CHAT_GHOSTEARS && speaker in view(src))
+		if((client.prefs.toggles & CHAT_GHOSTEARS) && (speaker in view(src)))
 			message = "<b>[message]</b>"

 	var/hearing_aid = FALSE
@@ -302,12 +302,12 @@ var/list/slot_equipment_priority = list( \
 //Outdated but still in use apparently. This should at least be a human proc.
 /mob/proc/get_equipped_items(var/include_carried = 0)
 	. = list()
-	if(slot_back) . += back
-	if(slot_wear_mask) . += wear_mask
+	if(back) . += back
+	if(wear_mask) . += wear_mask

 	if(include_carried)
-		if(slot_l_hand) . += l_hand
-		if(slot_r_hand) . += r_hand
+		if(l_hand) . += l_hand
+		if(r_hand) . += r_hand



@@ -183,7 +183,7 @@

 // Can we speak this language, as opposed to just understanding it?
 /mob/proc/can_speak(datum/language/speaking)
-	return (universal_speak || (speaking && speaking.flags & INNATE) || speaking in src.languages)
+	return (universal_speak || (speaking && speaking.flags & INNATE) || (speaking in src.languages))

 /mob/proc/get_language_prefix()
 	if(client && client.prefs.language_prefixes && client.prefs.language_prefixes.len)
@@ -230,31 +230,10 @@

 	if (stat != 2)
 		if (machine)
-			if (!( machine.check_eye(src) ))
+			if (machine.check_eye(src) < 1)
 				reset_view(null)
 		else
-			if(client && !client.adminobs)
+			if(!client?.adminobs)
 				reset_view(null)

 	return 1
-
-	if (stat != 2)
-		if (machine)
-			if (machine.check_eye(src) < 0)
-				reset_view(null)
-		else
-			if(client && !client.adminobs)
-				reset_view(null)
-
-/*/mob/living/carbon/brain/emp_act(severity)
-	if(!(container && istype(container, /obj/item/device/mmi)))
-		return
-	else
-		switch(severity)
-			if(1)
-				emp_damage += rand(20,30)
-			if(2)
-				emp_damage += rand(10,20)
-			if(3)
-				emp_damage += rand(0,10)
-	..()*/
@@ -151,7 +151,7 @@
 			var/emote_scream = pick("screams in pain and ", "lets out a sharp cry and ", "cries out and ")
 			emote("me", 1, "[(species.flags & NO_PAIN) ? "" : emote_scream ]drops what they were holding in their [E.name]!")

-		else if(!(E.status & ORGAN_ROBOT) && CE_DROPITEM in chem_effects && prob(chem_effects[CE_DROPITEM]))
+		else if(!(E.status & ORGAN_ROBOT) && (CE_DROPITEM in chem_effects) && prob(chem_effects[CE_DROPITEM]))
 			to_chat(src, span("warning", "Your [E.name] goes limp and unresponsive for a moment, dropping what it was holding!"))
 			emote("me", 1, "drops what they were holding in their [E.name]!")
 			switch(E.body_part)
@@ -382,13 +382,13 @@ This saves us from having to call add_fingerprint() any time something is put in
 	if(w_uniform) items += w_uniform

 	if(include_carried)
-		if(slot_l_hand)     items += l_hand
-		if(slot_r_hand)     items += r_hand
-		if(slot_l_store)    items += l_store
-		if(slot_r_store)    items += r_store
-		if(slot_legcuffed)  items += legcuffed
-		if(slot_handcuffed) items += handcuffed
-		if(slot_s_store)    items += s_store
+		if(l_hand)     items += l_hand
+		if(r_hand)     items += r_hand
+		if(l_store)    items += l_store
+		if(r_store)    items += r_store
+		if(legcuffed)  items += legcuffed
+		if(handcuffed) items += handcuffed
+		if(s_store)    items += s_store

 	return items

@@ -282,7 +282,7 @@
 				var/cword = pick(words)
 				words.Remove(cword)
 				var/suffix = copytext(cword,length(cword)-1,length(cword))
-				while(length(cword)>0 && suffix in list(".",",",";","!",":","?"))
+				while(length(cword)>0 && (suffix in list(".",",",";","!",":","?")))
 					cword  = copytext(cword,1              ,length(cword)-1)
 					suffix = copytext(cword,length(cword)-1,length(cword)  )
 				if(length(cword))
@@ -308,4 +308,4 @@


 			message = "[prefix][jointext(words," ")]"
-	return message
+	return message
@@ -90,6 +90,8 @@
 	updateicon()

 /mob/living/silicon/robot/proc/activated(obj/item/O)
+	updateicon()
+
 	if(module_state_1 == O)
 		return 1
 	else if(module_state_2 == O)
@@ -98,7 +100,6 @@
 		return 1
 	else
 		return 0
-	updateicon()

 //Helper procs for cyborg modules on the UI.
 //These are hackish but they help clean up code elsewhere.
@@ -315,4 +316,4 @@
 	var/selected = get_selected_module()
 	if (selected)
 		result += "\nThe activity light on hardpoint [selected] is on.\n"
-	return result
+	return result
@@ -120,7 +120,7 @@
 				if(M.stat == DEAD && M.client?.prefs.toggles & CHAT_GHOSTEARS)
 					M.hear_say(message, verb, speaking, null, null, src)
 					continue
-				if(M.loc && M.locs[1] in hearturfs)
+				if(M.loc && (M.locs[1] in hearturfs))
 					M.hear_say(message, verb, speaking, null, null, src)
 	else
 		to_chat(src, SPAN_WARNING("No holopad connected."))
@@ -155,4 +155,4 @@

 #undef IS_AI
 #undef IS_ROBOT
-#undef IS_PAI
+#undef IS_PAI
@@ -78,7 +78,7 @@
 	var/mob/living/carbon/human/M = target_mob
 	var/sting_prob = 40 // Bees will always try to sting.
 	var/prob_mult = 1
-	if(M && M in view(src,1)) // Can I see my target?
+	if(M && (M in view(src,1))) // Can I see my target?
 		var/obj/item/clothing/worn_suit = M.wear_suit
 		var/obj/item/clothing/worn_helmet = M.head
 		if(worn_suit) // Are you wearing clothes?
@@ -76,7 +76,7 @@
 		var/current_dist = get_dist(src, friend)

 		if(movement_target != friend)
-			if(current_dist > follow_dist && friend in oview(src))
+			if(current_dist > follow_dist && (friend in oview(src)))
 				//stop existing movement
 				walk_to(src,0)
 				turns_since_scan = 0
@@ -153,4 +153,4 @@

 /mob/living/simple_animal/carp/baby/death()
 	.=..()
-	desc = "A dead baby space carp, what a tragedy!"
+	desc = "A dead baby space carp, what a tragedy!"
@@ -241,8 +241,6 @@
 	held_item = null
 	return 1

-	return
-
 /mob/living/simple_animal/spiderbot/verb/get_item()
 	set name = "Pick up item"
 	set category = "Spiderbot"
@@ -303,4 +301,4 @@
 					layer = initial(layer)

 /mob/living/simple_animal/spiderbot/get_bullet_impact_effect_type(var/def_zone)
-	return BULLET_IMPACT_METAL
+	return BULLET_IMPACT_METAL
@@ -112,7 +112,7 @@
 			stop_automated_movement = 1
 			stance_step++
 			if(stance_step >= 15) //rests for 10 ticks
-				if(target_mob && target_mob in ListTargets(10))
+				if(target_mob && (target_mob in ListTargets(10)))
 					set_stance(HOSTILE_STANCE_ATTACK) //If the mob he was chasing is still nearby, resume the attack, otherwise go idle.
 				else
 					set_stance(HOSTILE_STANCE_IDLE)
@@ -309,7 +309,6 @@ mob/living/simple_animal/hostile/hitby(atom/movable/AM as mob|obj,var/speed = TH


 /mob/living/simple_animal/hostile/proc/check_horde()
-	return 0
 	if(emergency_shuttle.shuttle.location)
 		if(!enroute && !target_mob)	//The shuttle docked, all monsters rush for the escape hallway
 			if(!shuttletarget && escape_list.len) //Make sure we didn't already assign it a target, and that there are targets to pick
@@ -387,4 +386,4 @@ mob/living/simple_animal/hostile/hitby(atom/movable/AM as mob|obj,var/speed = TH
 	if(get_dist(src, E) < get_dist(src, current))
 		return TRUE
 	else
-		return FALSE
+		return FALSE
@@ -133,7 +133,7 @@
 /mob/living/simple_animal/hostile/retaliate/minedrone/proc/FindOre()
 	if(!enemies.len)
 		setClickCooldown(attack_delay)
-		if(!target_ore in ListTargets(10))
+		if(!(target_ore in ListTargets(10)))
 			target_ore = null
 		for(var/obj/item/ore/O in oview(1,src))
 			O.forceMove(src)
@@ -377,11 +377,11 @@
 					return
 			return

-		if(parrot_interest && parrot_interest in view(src))
+		if(parrot_interest && (parrot_interest in view(src)))
 			parrot_state = PARROT_SWOOP | PARROT_STEAL
 			return

-		if(parrot_perch && parrot_perch in view(src))
+		if(parrot_perch && (parrot_perch in view(src)))
 			parrot_state = PARROT_SWOOP | PARROT_RETURN
 			return

@@ -8,7 +8,6 @@
 		return (!mover.density || !density || lying)
 	else
 		return (!mover.density || !density || lying)
-	return

 /mob/proc/setMoveCooldown(var/timeout)
 	if(client)