From 4545f66e7c21927ae34e82049b97a13eeb00a8fb Mon Sep 17 00:00:00 2001 From: Razgriz Date: Wed, 11 Nov 2020 19:12:11 -0700 Subject: [PATCH] Update dog_sleeper_vr.dm --- .../mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm index c7f2c7a010..7901cbe7ea 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm @@ -717,8 +717,8 @@ desc = "A mounted survival unit with fuel processor." icon_state = "sleeperc" injection_chems = list("glucose","inaprovaline","tricordrazine") -<<<<<<< HEAD max_item_count = 1 + /obj/item/device/dogborg/sleeper/command //Command borg belly // CH addition name = "Bluespace Filing Belly" desc = "A mounted bluespace storage unit for carrying paperwork" @@ -727,10 +727,5 @@ compactor = TRUE recycles = FALSE max_item_count = 25 -||||||| parent of 7c94823ae9... Merge pull request #9293 from VOREStation/Verkister-patch-6 - max_item_count = 1 -======= - max_item_count = 10 ->>>>>>> 7c94823ae9... Merge pull request #9293 from VOREStation/Verkister-patch-6 #undef SLEEPER_INJECT_COST