Merge pull request #52 from ParadiseSS13/master

Update from Paradise №12

code/datums/datumvars.dm

@@ -384,16 +384,9 @@ body
 				html += "</ol>"
 			else
 				html += "<ul>"
-				// First loop to check for associativity
-				var/associative = FALSE
-				for(var/entry in L)
-					if(!(isnum(entry) || isnull(L[entry])))
-						associative = TRUE
-						break
-				// then we do it again! Except now with knowledge of associativity
 				var/index = 1
 				for(var/entry in L)
-					if(associative)
+					if(istext(entry))
 						html += debug_variable(entry, L[entry], level + 1)
 					else
 						html += debug_variable(index, L[index], level + 1)

code/datums/supplypacks.dm

@@ -1198,10 +1198,8 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater,
 					/obj/item/weapon/storage/bible/booze,
 					/obj/item/weapon/storage/bible/booze,
-					/obj/item/clothing/suit/chaplain_hoodie,
-					/obj/item/clothing/head/chaplain_hood,
-					/obj/item/clothing/suit/chaplain_hoodie,
-					/obj/item/clothing/head/chaplain_hood)
+					/obj/item/clothing/suit/hooded/chaplain_hoodie,
+					/obj/item/clothing/suit/hooded/chaplain_hoodie)
 	cost = 40
 	containername = "religious supplies crate"
 

code/game/objects/items/weapons/storage/uplink_kits.dm

@@ -77,8 +77,7 @@
 				new /obj/item/weapon/melee/energy/sword/saber(src)
 				new /obj/item/weapon/melee/energy/sword/saber(src)
 				new /obj/item/weapon/dnainjector/telemut/darkbundle(src)
-				new /obj/item/clothing/head/chaplain_hood(src)
-				new /obj/item/clothing/suit/chaplain_hoodie(src)
+				new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
 				new /obj/item/weapon/card/id/syndicate(src)
 				return
 

code/modules/admin/verbs/debug.dm

@@ -783,11 +783,10 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(M), slot_shoes)
 			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), slot_gloves)
 			M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(M), slot_wear_mask)
-			M.equip_to_slot_or_del(new /obj/item/clothing/head/chaplain_hood(M), slot_head)
 			M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full/multitool(M), slot_belt)
 			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/monocle(M), slot_glasses)
-			M.equip_to_slot_or_del(new /obj/item/clothing/suit/chaplain_hoodie(M), slot_wear_suit)
+			M.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/chaplain_hoodie(M), slot_wear_suit)
 			M.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/food/snacks/grown/banana(M), slot_l_store)
 			M.equip_to_slot_or_del(new /obj/item/weapon/bikehorn(M), slot_r_store)
 			equip_special_id(M,list(access_clown, access_theatre, access_maint_tunnels), "Tunnel Clown", /obj/item/weapon/card/id)
@@ -916,11 +915,9 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_to_slot_or_del(new /obj/item/device/flashlight(M), slot_in_backpack)
 			M.equip_to_slot_or_del(new /obj/item/device/radio/headset/syndicate(M), slot_l_ear)
 			M.equip_to_slot_or_del(new /obj/item/weapon/twohanded/dualsaber/red(M), slot_l_hand)
-			var/obj/item/clothing/head/chaplain_hood/hood = new(M)
-			hood.name = "dark lord hood"
-			M.equip_to_slot_or_del(hood, slot_head)
-			var/obj/item/clothing/suit/chaplain_hoodie/robe = new(M)
+			var/obj/item/clothing/suit/hooded/chaplain_hoodie/robe = new /obj/item/clothing/suit/hooded/chaplain_hoodie(M)
 			robe.name = "dark lord robes"
+			robe.hood.name = "dark lord hood"
 			M.equip_to_slot_or_del(robe, slot_wear_suit)
 			equip_special_id(M,get_all_accesses(), "Dark Lord", /obj/item/weapon/card/id/syndicate, "syndie")
 

code/modules/assembly/infrared.dm

@@ -174,7 +174,7 @@
 		return
 
 	dir = turn(dir, 90)
-	
+
 	if(usr.machine == src)
 		interact(usr)
 
@@ -246,7 +246,9 @@
 	hit()
 
 /obj/effect/beam/i_beam/Crossed(atom/movable/AM as mob|obj)
-	if(istype(AM, /obj/effect/beam) || !AM.density)
+	if(!isobj(AM) && !isliving(AM))
+		return
+	if(istype(AM, /obj/effect))
 		return
 	hit()
 
@@ -259,4 +261,4 @@
 	if(previous)
 		previous.next = null
 		master.last = previous
-	return ..()
+	return ..()

code/modules/assembly/proximity.dm

@@ -42,7 +42,9 @@
 
 
 	HasProximity(atom/movable/AM as mob|obj)
-		if(istype(AM, /obj/effect/beam))	return
+		if(!isobj(AM) && !isliving(AM))
+			return
+		if(istype(AM, /obj/effect))	return
 		if(AM.move_speed < 12)	sense()
 		return
 

html/changelogs/AutoChangeLog-pr-5444.yml

@@ -0,0 +1,6 @@
+author: TullyBurnalot
+delete-after: True
+changes: 
+  - bugfix: "Ghosts can no longer trip Proximity Sensors"
+  - bugfix: "Ghosts can no longer trip Infrared Sensors"
+  - bugfix: "Effects (like hallucinations) can no longer trip Proximity and Infrared Sensors"