From bc4b689d564d5986d1b6742792368e98abcf93d1 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Fri, 8 Dec 2017 12:23:03 -0500 Subject: [PATCH] Update medical.dm --- .../structures/crates_lockers/closets/secure/medical.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index dfd9ac8153..5402abdfee 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -73,11 +73,7 @@ new /obj/item/device/autosurgeon/cmo(src) new /obj/item/door_remote/chief_medical_officer(src) new /obj/item/clothing/neck/petcollar(src) -<<<<<<< HEAD -======= new /obj/item/pet_carrier(src) - new /obj/item/circuitboard/machine/protolathe/department/medical(src) ->>>>>>> 6e8401e... Adds pet carriers (#33231) /obj/structure/closet/secure_closet/animal name = "animal control"