From cb57a3061b8ff07d87e522436d40f17e4d65ba35 Mon Sep 17 00:00:00 2001 From: Chompstation Bot Date: Sun, 8 Nov 2020 17:29:36 +0000 Subject: [PATCH 1/2] Couple little borgo belly tweaks. --- .../living/silicon/robot/dogborg/dog_sleeper_vr.dm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 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 a1faec4ea1..c7f2c7a010 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 @@ -39,6 +39,7 @@ var/datum/matter_synth/water = null var/digest_brute = 2 var/digest_burn = 3 + var/digest_multiplier = 1 var/recycles = FALSE var/medsensor = TRUE //Does belly sprite come with patient ok/dead light? @@ -541,8 +542,8 @@ else var/old_brute = T.getBruteLoss() var/old_burn = T.getFireLoss() - T.adjustBruteLoss(digest_brute) - T.adjustFireLoss(digest_burn) + T.adjustBruteLoss(digest_brute * digest_multiplier) + T.adjustFireLoss(digest_burn * digest_multiplier) var/actual_brute = T.getBruteLoss() - old_brute var/actual_burn = T.getFireLoss() - old_burn var/damage_gain = actual_brute + actual_burn @@ -716,6 +717,7 @@ 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" @@ -725,5 +727,10 @@ 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 \ No newline at end of file +#undef SLEEPER_INJECT_COST From 4545f66e7c21927ae34e82049b97a13eeb00a8fb Mon Sep 17 00:00:00 2001 From: Razgriz Date: Wed, 11 Nov 2020 19:12:11 -0700 Subject: [PATCH 2/2] 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