Merge pull request #11818 from spookydonut/patch-1

Update spacemandmm to 1.4
2020-04-11 23:59:31 +02:00
parent 848c1996e4 a6f6a27c87
commit 1babc75a69
43 changed files with 60 additions and 98 deletions
@@ -430,7 +430,6 @@
 		else
 			dropItemToGround(I)
 			return
-		return TRUE

 /mob/living/carbon/get_standard_pixel_y_offset(lying = 0)
 	if(lying)
@@ -893,7 +893,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 					accessory_overlay.icon_state = "m_ears_none_[layertext]"
 				if(bodypart == "tail")
 					accessory_overlay.icon_state = "m_tail_husk_[layertext]"
-				if(MATRIXED)
+				if(S.color_src == MATRIXED)
 					var/list/husklist = list()
 					husklist += ReadRGB("#a3a3a3")
 					husklist += ReadRGB("#a3a3a3")
@@ -695,7 +695,7 @@
 							holo_icon = client.prefs.get_filtered_holoform(HOLOFORM_FILTER_AI)
 						else
 							holo_icon = getHologramIcon(icon('icons/mob/ai.dmi', "female"))
-					else if("xeno queen")
+					if("xeno queen")
 						holo_icon = getHologramIcon(icon(icon_list[input],"alienq"))
 					else
 						holo_icon = getHologramIcon(icon(icon_list[input], input))
@@ -445,7 +445,6 @@ Pass the desired type path itself, declaring a temporary var beforehand is not r
 		return scan_result
 	else
 		return FALSE //The current element failed assessment, move on to the next.
-	return

 /mob/living/simple_animal/bot/proc/check_bot(targ)
 	var/turf/T = get_turf(targ)
@@ -523,9 +523,6 @@
 		soft_reset()
 		return

-	reagent_id = null
-	return
-
 /mob/living/simple_animal/bot/medbot/proc/check_overdose(mob/living/carbon/patient,reagent_id,injection_amount)
 	var/datum/reagent/R  = GLOB.chemical_reagents_list[reagent_id]
 	if(!R.overdose_threshold) //Some chems do not have an OD threshold
@@ -92,8 +92,8 @@
 		return
 	if(hack)
 		if(hacked)
-			return
 			Stun(40)
+			return
 		if(clockwork)
 			to_chat(src, "<span class='large_brass'><b>ERROR: LAW OVERRIDE DETECTED</b></span>")
 			to_chat(src, "<span class='heavy_brass'>From now on, these are your laws:</span>")