Update corpse.dm

2018-02-17 09:58:42 -06:00
parent a918a06478
commit 06dd2e2aa5
1 changed files with 0 additions and 4 deletions
@@ -181,15 +181,11 @@
 			var/obj/item/device/pda/PDA = locate(/obj/item/device/pda) in H
 			if(PDA)
 				PDA.toff = TRUE
-<<<<<<< HEAD
-=======
 		if(disable_sensors)
 			// Using crew monitors to find corpses while creative makes finding certain ruins too easy.
 			var/obj/item/clothing/under/C = H.wear_suit
 			if(C)
 				C.sensor_mode = NO_SENSORS
-
->>>>>>> b8b5084... Swaps locate for direct assignment
 	var/obj/item/card/id/W = H.wear_id
 	if(W)
 		if(id_access)