From 5a905b2f029532aea203fc14b1d219523dc98903 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Tue, 12 May 2020 18:15:17 -0700 Subject: [PATCH 1/4] Fixes boxstation (#12236) * revert * ok --- _maps/map_files/BoxStation/BoxStation.dmm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 9e45f23424..c8f2c151b5 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -27777,7 +27777,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = -24 + pixel_x = -26 }, /turf/open/floor/plasteel/white, /area/medical/chemistry) @@ -39447,6 +39447,14 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/plasteel, /area/engine/atmos) +"bPh" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 + }, +/turf/open/floor/plating, +/area/engine/atmos) "bPi" = ( /obj/machinery/light{ dir = 4 From fd30edca9c26f007403841b4ae2136fd1227037a Mon Sep 17 00:00:00 2001 From: Lin Date: Wed, 13 May 2020 01:18:25 +0000 Subject: [PATCH 2/4] infinixeno (#12234) --- .../mob/living/carbon/alien/humanoid/alien_powers.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm index 42b2c4433b..be81e850b7 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm @@ -21,10 +21,10 @@ Doesn't work on other aliens/AI.*/ . = ..() action = new(src) -/obj/effect/proc_holder/alien/Trigger(mob/living/carbon/user, skip_cost_check) - if(!istype(user)) +/obj/effect/proc_holder/alien/Trigger(mob/living/carbon/user, skip_cost_check = FALSE) + if(!skip_cost_check || !istype(user)) return TRUE - if(!skip_cost_check || cost_check(check_turf,user)) + if(cost_check(check_turf,user)) if(fire(user) && user) // Second check to prevent runtimes when evolving user.adjustPlasma(-plasma_cost) return TRUE From 4aca1e8f62017003beea9253f5feaaa52c472ce5 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Tue, 12 May 2020 19:20:05 -0700 Subject: [PATCH 3/4] Update medicine_reagents.dm (#12233) --- .../chemistry/reagents/medicine_reagents.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 416cc0b2bd..7913b24218 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -1218,15 +1218,15 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M) value = REAGENT_VALUE_VERY_RARE /datum/reagent/medicine/lesser_syndicate_nanites/on_mob_life(mob/living/carbon/M) - M.adjustBruteLoss(-3*REM, FALSE) // hidden gold shh - M.adjustFireLoss(-3*REM, FALSE) - M.adjustOxyLoss(-15, FALSE) - M.adjustToxLoss(-3*REM, FALSE) - M.adjustOrganLoss(ORGAN_SLOT_BRAIN, -15*REM) - M.adjustCloneLoss(-3*REM, FALSE) - M.adjustStaminaLoss(-20*REM,FALSE) + M.adjustBruteLoss(-2*REM, FALSE) + M.adjustFireLoss(-2*REM, FALSE) + M.adjustOxyLoss(-5*REM, FALSE) + M.adjustToxLoss(-2*REM, FALSE) + M.adjustOrganLoss(ORGAN_SLOT_BRAIN, -5*REM) + M.adjustCloneLoss(-1.25*REM, FALSE) + M.adjustStaminaLoss(-4*REM,FALSE) if(M.blood_volume < (BLOOD_VOLUME_NORMAL*M.blood_ratio)) - M.blood_volume += 20 // blood fall out man bad + M.blood_volume += 3 ..() . = 1 From 871361936c07cd17301e0be66456291f4514a392 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 12 May 2020 23:35:01 -0400 Subject: [PATCH 4/4] Replaces mosins in russian crates with 10mm surplus rifles (#12176) * Update security.dm * Update armory.dm * desc Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/modules/cargo/packs/armory.dm | 5 ++--- code/modules/cargo/packs/security.dm | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/code/modules/cargo/packs/armory.dm b/code/modules/cargo/packs/armory.dm index 501b1426ae..87dfe243b3 100644 --- a/code/modules/cargo/packs/armory.dm +++ b/code/modules/cargo/packs/armory.dm @@ -170,8 +170,7 @@ cost = 7500 contraband = TRUE contains = list(/obj/item/reagent_containers/food/snacks/rationpack, - /obj/item/ammo_box/a762, - /obj/item/storage/toolbox/ammo, + /obj/item/ammo_box/magazine/m10mm/rifle, /obj/item/clothing/suit/armor/vest/russian, /obj/item/clothing/head/helmet/rus_helmet, /obj/item/clothing/shoes/russian, @@ -181,7 +180,7 @@ /obj/item/clothing/mask/russian_balaclava, /obj/item/clothing/head/helmet/rus_ushanka, /obj/item/clothing/suit/armor/vest/russian_coat, - /obj/item/gun/ballistic/shotgun/boltaction) + /obj/item/gun/ballistic/automatic/surplus) crate_name = "surplus military crate" /datum/supply_pack/security/armory/russian/fill(obj/structure/closet/crate/C) diff --git a/code/modules/cargo/packs/security.dm b/code/modules/cargo/packs/security.dm index ee750b8df7..d134d7bab8 100644 --- a/code/modules/cargo/packs/security.dm +++ b/code/modules/cargo/packs/security.dm @@ -99,11 +99,11 @@ crate_type = /obj/structure/closet/crate/internals /datum/supply_pack/security/russianmosin - name = "Russian Minutemen Gear" - desc = "An old russian Minutemen crate, comes with a full russian outfit, a mosin and a stripper clip." + name = "Russian Partisan Gear" + desc = "An old russian partisan equipment crate, comes with a full russian outfit, a loaded surplus rifle and a second magazine." contraband = TRUE access = FALSE - cost = 6500 // + cost = 6500 contains = list(/obj/item/clothing/suit/armor/navyblue/russian, /obj/item/clothing/shoes/combat, /obj/item/clothing/head/ushanka, @@ -111,8 +111,8 @@ /obj/item/clothing/head/helmet/alt, /obj/item/clothing/gloves/tackler/combat/insulated, /obj/item/clothing/mask/gas, - /obj/item/gun/ballistic/shotgun/boltaction, - /obj/item/ammo_box/a762) + /obj/item/ammo_box/magazine/m10mm/rifle, + /obj/item/gun/ballistic/automatic/surplus) crate_name = "surplus russian gear" crate_type = /obj/structure/closet/crate/internals