From aedadb30a5cf6def4ce499aabd8c530936cf27aa Mon Sep 17 00:00:00 2001 From: Amatsu Darkfyre Date: Sun, 10 Mar 2019 23:54:45 -0400 Subject: [PATCH 01/19] Fixes a difference between /tg/ and Citadel that made extracts uninjectable. --- code/modules/research/xenobiology/crossbreeding/chilling.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/research/xenobiology/crossbreeding/chilling.dm b/code/modules/research/xenobiology/crossbreeding/chilling.dm index f09cc7b9e0..25dbaa461f 100644 --- a/code/modules/research/xenobiology/crossbreeding/chilling.dm +++ b/code/modules/research/xenobiology/crossbreeding/chilling.dm @@ -7,11 +7,12 @@ Chilling extracts: name = "chilling extract" desc = "It's cold to the touch, as if frozen solid." effect = "chilling" + container_type = INJECTABLE | DRAWABLE icon_state = "chilling" /obj/item/slimecross/chilling/Initialize() . = ..() - create_reagents(10, INJECTABLE | DRAWABLE) + create_reagents(10) /obj/item/slimecross/chilling/attack_self(mob/user) if(!reagents.has_reagent("plasma",10)) From 0e8f356610e2ae6064616fff6cd981970765121f Mon Sep 17 00:00:00 2001 From: Ghommie Date: Mon, 11 Mar 2019 11:54:40 +0100 Subject: [PATCH 02/19] Milk. --- _maps/shuttles/pirate_default.dmm | 68 ++++++++++++++++--------------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm index 91305d2990..445c29241c 100644 --- a/_maps/shuttles/pirate_default.dmm +++ b/_maps/shuttles/pirate_default.dmm @@ -91,6 +91,40 @@ "aj" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/pirate) +"ak" = ( +/obj/machinery/airalarm/all_access{ + dir = 4; + pixel_x = -24 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/closet/secure_closet/freezer{ + locked = 0; + name = "fridge" + }, +/obj/item/storage/box/donkpockets{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/storage/box/donkpockets, +/obj/item/storage/fancy/donut_box, +/obj/item/reagent_containers/food/snacks/cookie, +/obj/item/reagent_containers/food/snacks/cookie{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/reagent_containers/food/snacks/chocolatebar, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, +/turf/open/floor/plasteel, +/area/shuttle/pirate) "al" = ( /obj/machinery/loot_locator, /obj/effect/decal/cleanable/dirt, @@ -622,38 +656,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/shuttle/pirate) -"bw" = ( -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = -24 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/closet/secure_closet/freezer{ - locked = 0; - name = "fridge" - }, -/obj/item/storage/box/donkpockets{ - pixel_x = 2; - pixel_y = 3 - }, -/obj/item/storage/box/donkpockets, -/obj/item/storage/fancy/donut_box, -/obj/item/reagent_containers/food/snacks/cookie, -/obj/item/reagent_containers/food/snacks/cookie{ - pixel_x = -6; - pixel_y = -6 - }, -/obj/item/reagent_containers/food/snacks/chocolatebar, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/shuttle/pirate) "bx" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -1207,7 +1209,7 @@ eA aa ap aw -bw +ak bF aj aj From fddbbce94e8fb51f2ade9d88cce4deb8e2c62365 Mon Sep 17 00:00:00 2001 From: Ragolution Date: Wed, 13 Mar 2019 22:26:38 -0400 Subject: [PATCH 03/19] Update firstaid.dm Amends erroneous icon_states and adds functionality to medkits to pick one of the random striped/color patterns. Hope it doesn't break anything. --- code/game/objects/items/storage/firstaid.dm | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index c795726421..5470cb4dda 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -55,7 +55,7 @@ /obj/item/storage/firstaid/fire name = "burn treatment kit" desc = "A specialized medical kit for when the toxins lab -spontaneously- burns down." - icon_state = "ointment" + icon_state = "burn" item_state = "firstaid-ointment" /obj/item/storage/firstaid/fire/suicide_act(mob/living/carbon/user) @@ -64,7 +64,7 @@ /obj/item/storage/firstaid/fire/Initialize(mapload) . = ..() - icon_state = pick("ointment","firefirstaid") + icon_state = pick("burn","burn2", "burn3", "burn4") /obj/item/storage/firstaid/fire/PopulateContents() if(empty) @@ -79,7 +79,7 @@ /obj/item/storage/firstaid/toxin name = "toxin treatment kit" desc = "Used to treat toxic blood content and radiation poisoning." - icon_state = "antitoxin" + icon_state = "toxin" item_state = "firstaid-toxin" /obj/item/storage/firstaid/toxin/suicide_act(mob/living/carbon/user) @@ -88,7 +88,7 @@ /obj/item/storage/firstaid/toxin/Initialize(mapload) . = ..() - icon_state = pick("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3") + icon_state = pick("toxin","toxin2","toxin3","toxin4") /obj/item/storage/firstaid/toxin/PopulateContents() if(empty) @@ -102,7 +102,7 @@ /obj/item/storage/firstaid/radbgone name = "radiation treatment kit" desc = "Used to treat minor toxic blood content and major radiation poisoning." - icon_state = "antitoxin" + icon_state = "toxin" item_state = "firstaid-toxin" /obj/item/storage/firstaid/radbgone/suicide_act(mob/living/carbon/user) @@ -122,13 +122,17 @@ /obj/item/storage/firstaid/o2 name = "oxygen deprivation treatment kit" desc = "A box full of oxygen goodies." - icon_state = "o2" + icon_state = "oxy" item_state = "firstaid-o2" /obj/item/storage/firstaid/o2/suicide_act(mob/living/carbon/user) user.visible_message("[user] begins hitting [user.p_their()] neck with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") return OXYLOSS +/obj/item/storage/firstaid/o2/Initialize(mapload) + . = ..() + icon_state = pick("oxy","oxy2","oxy3","oxy4") + /obj/item/storage/firstaid/o2/PopulateContents() if(empty) return @@ -148,6 +152,10 @@ user.visible_message("[user] begins beating [user.p_them()]self over the head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") return BRUTELOSS +/obj/item/storage/firstaid/brute/Initialize(mapload) + . = ..() + icon_state = pick("brute","brute2","brute3","brute4") + /obj/item/storage/firstaid/brute/PopulateContents() if(empty) return From 1fea681ea44f482747f3efce7a154ccc4ce28d40 Mon Sep 17 00:00:00 2001 From: Ragolution Date: Wed, 13 Mar 2019 23:54:44 -0400 Subject: [PATCH 04/19] Revert "Update firstaid.dm" This reverts commit fddbbce94e8fb51f2ade9d88cce4deb8e2c62365. --- code/game/objects/items/storage/firstaid.dm | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 5470cb4dda..c795726421 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -55,7 +55,7 @@ /obj/item/storage/firstaid/fire name = "burn treatment kit" desc = "A specialized medical kit for when the toxins lab -spontaneously- burns down." - icon_state = "burn" + icon_state = "ointment" item_state = "firstaid-ointment" /obj/item/storage/firstaid/fire/suicide_act(mob/living/carbon/user) @@ -64,7 +64,7 @@ /obj/item/storage/firstaid/fire/Initialize(mapload) . = ..() - icon_state = pick("burn","burn2", "burn3", "burn4") + icon_state = pick("ointment","firefirstaid") /obj/item/storage/firstaid/fire/PopulateContents() if(empty) @@ -79,7 +79,7 @@ /obj/item/storage/firstaid/toxin name = "toxin treatment kit" desc = "Used to treat toxic blood content and radiation poisoning." - icon_state = "toxin" + icon_state = "antitoxin" item_state = "firstaid-toxin" /obj/item/storage/firstaid/toxin/suicide_act(mob/living/carbon/user) @@ -88,7 +88,7 @@ /obj/item/storage/firstaid/toxin/Initialize(mapload) . = ..() - icon_state = pick("toxin","toxin2","toxin3","toxin4") + icon_state = pick("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3") /obj/item/storage/firstaid/toxin/PopulateContents() if(empty) @@ -102,7 +102,7 @@ /obj/item/storage/firstaid/radbgone name = "radiation treatment kit" desc = "Used to treat minor toxic blood content and major radiation poisoning." - icon_state = "toxin" + icon_state = "antitoxin" item_state = "firstaid-toxin" /obj/item/storage/firstaid/radbgone/suicide_act(mob/living/carbon/user) @@ -122,17 +122,13 @@ /obj/item/storage/firstaid/o2 name = "oxygen deprivation treatment kit" desc = "A box full of oxygen goodies." - icon_state = "oxy" + icon_state = "o2" item_state = "firstaid-o2" /obj/item/storage/firstaid/o2/suicide_act(mob/living/carbon/user) user.visible_message("[user] begins hitting [user.p_their()] neck with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") return OXYLOSS -/obj/item/storage/firstaid/o2/Initialize(mapload) - . = ..() - icon_state = pick("oxy","oxy2","oxy3","oxy4") - /obj/item/storage/firstaid/o2/PopulateContents() if(empty) return @@ -152,10 +148,6 @@ user.visible_message("[user] begins beating [user.p_them()]self over the head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") return BRUTELOSS -/obj/item/storage/firstaid/brute/Initialize(mapload) - . = ..() - icon_state = pick("brute","brute2","brute3","brute4") - /obj/item/storage/firstaid/brute/PopulateContents() if(empty) return From 8cc589b069fde7ff145d8c0108cc96d004525df2 Mon Sep 17 00:00:00 2001 From: Ragolution Date: Thu, 14 Mar 2019 00:03:37 -0400 Subject: [PATCH 05/19] Actually fixes the thing. Turns out this was 100% easier to fix than I thought. --- modular_citadel/code/game/objects/items/storage/firstaid.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modular_citadel/code/game/objects/items/storage/firstaid.dm b/modular_citadel/code/game/objects/items/storage/firstaid.dm index 82d7df4a00..ec4a721e05 100755 --- a/modular_citadel/code/game/objects/items/storage/firstaid.dm +++ b/modular_citadel/code/game/objects/items/storage/firstaid.dm @@ -23,7 +23,10 @@ /obj/item/storage/firstaid/o2 icon_state = "oxy" - + +/obj/item/storage/firstaid/radbgone + icon_state = "rad" + /obj/item/storage/firstaid/tactical icon_state = "tactical" From 890a23df52f223f3ee1bf0f2c0bfc405d8ea9812 Mon Sep 17 00:00:00 2001 From: Ragolution Date: Thu, 14 Mar 2019 00:16:11 -0400 Subject: [PATCH 06/19] Github client is shit. Ooga --- modular_citadel/code/game/objects/items/storage/firstaid.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modular_citadel/code/game/objects/items/storage/firstaid.dm b/modular_citadel/code/game/objects/items/storage/firstaid.dm index ec4a721e05..6ddf3963dd 100755 --- a/modular_citadel/code/game/objects/items/storage/firstaid.dm +++ b/modular_citadel/code/game/objects/items/storage/firstaid.dm @@ -27,6 +27,10 @@ /obj/item/storage/firstaid/radbgone icon_state = "rad" +/obj/item/storage/firstaid/radbgone/Initialize(mapload) + . = ..() + icon_state = pick("[initial(icon_state)]","[initial(icon_state)]2","[initial(icon_state)]3","[initial(icon_state)]4") + /obj/item/storage/firstaid/tactical icon_state = "tactical" From 12db99dc013b8ffbd9356a86eebc3ee3145af4ea Mon Sep 17 00:00:00 2001 From: Ragolution Date: Thu, 14 Mar 2019 13:21:04 -0400 Subject: [PATCH 07/19] Update revival.dm Adds Abductor Science Tool to acceptable implements to revive a dead body. --- code/modules/surgery/advanced/revival.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/surgery/advanced/revival.dm b/code/modules/surgery/advanced/revival.dm index 085253e4c9..6f9b04b35d 100644 --- a/code/modules/surgery/advanced/revival.dm +++ b/code/modules/surgery/advanced/revival.dm @@ -27,7 +27,7 @@ /datum/surgery_step/revive name = "repair body" - implements = list(/obj/item/twohanded/shockpaddles = 100, /obj/item/melee/baton = 75, /obj/item/gun/energy = 60) + implements = list(/obj/item/twohanded/shockpaddles = 100, /obj/item/abductor/gizmo = 100, /obj/item/melee/baton = 75, /obj/item/gun/energy = 60) time = 120 /datum/surgery_step/revive/tool_check(mob/user, obj/item/tool) From 8bf81919c8051a6ece90ddf792faadab815dc114 Mon Sep 17 00:00:00 2001 From: izzy Date: Thu, 14 Mar 2019 16:46:30 -0500 Subject: [PATCH 08/19] reduce minimal player age for command jobs --- modular_citadel/code/modules/jobs/job_types/captain.dm | 4 ++-- modular_citadel/code/modules/jobs/job_types/engineering.dm | 2 +- modular_citadel/code/modules/jobs/job_types/medical.dm | 2 +- modular_citadel/code/modules/jobs/job_types/science.dm | 2 +- modular_citadel/code/modules/jobs/job_types/security.dm | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modular_citadel/code/modules/jobs/job_types/captain.dm b/modular_citadel/code/modules/jobs/job_types/captain.dm index 7d8d1ac5ca..674cd9d09e 100644 --- a/modular_citadel/code/modules/jobs/job_types/captain.dm +++ b/modular_citadel/code/modules/jobs/job_types/captain.dm @@ -1,9 +1,9 @@ /datum/job/captain - minimal_player_age = 60 + minimal_player_age = 20 exp_type = EXP_TYPE_COMMAND /datum/job/hop - minimal_player_age = 60 + minimal_player_age = 20 head_announce = list("Service") exp_type_department = EXP_TYPE_SERVICE diff --git a/modular_citadel/code/modules/jobs/job_types/engineering.dm b/modular_citadel/code/modules/jobs/job_types/engineering.dm index f199bbefea..4d6aa4119d 100644 --- a/modular_citadel/code/modules/jobs/job_types/engineering.dm +++ b/modular_citadel/code/modules/jobs/job_types/engineering.dm @@ -1,5 +1,5 @@ /datum/job/chief_engineer - minimal_player_age = 30 + minimal_player_age = 10 /datum/job/engineer access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, diff --git a/modular_citadel/code/modules/jobs/job_types/medical.dm b/modular_citadel/code/modules/jobs/job_types/medical.dm index 31c8b7d3c4..15841ad9d5 100644 --- a/modular_citadel/code/modules/jobs/job_types/medical.dm +++ b/modular_citadel/code/modules/jobs/job_types/medical.dm @@ -1,5 +1,5 @@ /datum/job/cmo - minimal_player_age = 30 + minimal_player_age = 10 /datum/outfit/job/doctor backpack_contents = list(/obj/item/storage/hypospraykit/regular) diff --git a/modular_citadel/code/modules/jobs/job_types/science.dm b/modular_citadel/code/modules/jobs/job_types/science.dm index 4542e7d099..94272d24a6 100644 --- a/modular_citadel/code/modules/jobs/job_types/science.dm +++ b/modular_citadel/code/modules/jobs/job_types/science.dm @@ -1,2 +1,2 @@ /datum/job/rd - minimal_player_age = 30 \ No newline at end of file + minimal_player_age = 10 diff --git a/modular_citadel/code/modules/jobs/job_types/security.dm b/modular_citadel/code/modules/jobs/job_types/security.dm index 9e59d98d00..de00f2d948 100644 --- a/modular_citadel/code/modules/jobs/job_types/security.dm +++ b/modular_citadel/code/modules/jobs/job_types/security.dm @@ -1,5 +1,5 @@ /datum/job/hos - minimal_player_age = 30 + minimal_player_age = 10 /datum/outfit/job/warden - suit_store = /obj/item/gun/energy/pumpaction/defender \ No newline at end of file + suit_store = /obj/item/gun/energy/pumpaction/defender From 67f25f2721442d90fcd852edf83e650968d8cc53 Mon Sep 17 00:00:00 2001 From: Ragolution Date: Thu, 14 Mar 2019 18:02:29 -0400 Subject: [PATCH 09/19] Additional methods. Requested by nicc --- code/modules/surgery/advanced/revival.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/surgery/advanced/revival.dm b/code/modules/surgery/advanced/revival.dm index 6f9b04b35d..8a791c850b 100644 --- a/code/modules/surgery/advanced/revival.dm +++ b/code/modules/surgery/advanced/revival.dm @@ -27,7 +27,7 @@ /datum/surgery_step/revive name = "repair body" - implements = list(/obj/item/twohanded/shockpaddles = 100, /obj/item/abductor/gizmo = 100, /obj/item/melee/baton = 75, /obj/item/gun/energy = 60) + implements = list(/obj/item/twohanded/shockpaddles = 100, /obj/item/abductor/gizmo = 100, /obj/item/melee/baton = 75, /obj/item/organ/cyberimp/arm/baton = 75, /obj/item/organ/cyberimp/arm/gun/taser = 60, /obj/item/gun/energy/e_gun/advtaser = 60, /obj/item/gun/energy/taser = 60) time = 120 /datum/surgery_step/revive/tool_check(mob/user, obj/item/tool) From ccca2ac8a8c954a26ddd9fa482df9ea71daa3940 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 14 Mar 2019 17:10:40 -0500 Subject: [PATCH 10/19] Automatic changelog generation for PR #8114 [ci skip] --- html/changelogs/AutoChangeLog-pr-8114.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-8114.yml diff --git a/html/changelogs/AutoChangeLog-pr-8114.yml b/html/changelogs/AutoChangeLog-pr-8114.yml new file mode 100644 index 0000000000..96e6914e6b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-8114.yml @@ -0,0 +1,4 @@ +author: "izzyinbox" +delete-after: True +changes: + - tweak: "lowered the player age for command jobs to 1/3 of their previous setting" From 36119e007df21be8f48badf3a4ea5a80e3915d07 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Fri, 15 Mar 2019 16:49:10 -0400 Subject: [PATCH 11/19] Properly fixes igniters by increasing the max hotspot expose temperature of sparks to 700 --- code/game/objects/effects/effect_system/effects_sparks.dm | 6 +++--- code/game/objects/items/RPD.dm | 6 ++++-- code/modules/power/singularity/emitter.dm | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/code/game/objects/effects/effect_system/effects_sparks.dm b/code/game/objects/effects/effect_system/effects_sparks.dm index 44aab00852..0656d9b3ca 100644 --- a/code/game/objects/effects/effect_system/effects_sparks.dm +++ b/code/game/objects/effects/effect_system/effects_sparks.dm @@ -30,20 +30,20 @@ playsound(src, "sparks", 100, TRUE) var/turf/T = loc if(isturf(T)) - T.hotspot_expose(300,5) + T.hotspot_expose(700,5) QDEL_IN(src, 20) /obj/effect/particle_effect/sparks/Destroy() var/turf/T = loc if(isturf(T)) - T.hotspot_expose(300,1) + T.hotspot_expose(700,1) return ..() /obj/effect/particle_effect/sparks/Move() ..() var/turf/T = loc if(isturf(T)) - T.hotspot_expose(300,1) + T.hotspot_expose(700,1) /datum/effect_system/spark_spread effect_type = /obj/effect/particle_effect/sparks diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm index 1c6cc9cfcb..41ddc22106 100644 --- a/code/game/objects/items/RPD.dm +++ b/code/game/objects/items/RPD.dm @@ -187,6 +187,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) resistance_flags = FIRE_PROOF var/datum/effect_system/spark_spread/spark_system + var/effectcooldown var/working = 0 var/p_dir = NORTH var/p_flipped = FALSE @@ -207,7 +208,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( /obj/item/pipe_dispenser/New() . = ..() spark_system = new /datum/effect_system/spark_spread - spark_system.set_up(5, 0, src) + spark_system.set_up(1, 0, src) spark_system.attach(src) if(!first_atmos) first_atmos = GLOB.atmos_pipe_recipes[GLOB.atmos_pipe_recipes[1]][1] @@ -313,8 +314,9 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( else mode |= n - if(playeffect) + if(playeffect && world.time >= effectcooldown) spark_system.start() + effectcooldown = world.time + 100 playsound(get_turf(src), 'sound/effects/pop.ogg', 50, 0) /obj/item/pipe_dispenser/pre_attack(atom/A, mob/user) diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 9d2ad4c12a..a04ed08611 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -66,7 +66,7 @@ sparks = new sparks.attach(src) - sparks.set_up(5, TRUE, src) + sparks.set_up(1, TRUE, src) /obj/machinery/power/emitter/ComponentInitialize() . = ..() From 4bc0833982f5c625144bcf4bf6c3a65a2e3fcdf6 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Fri, 15 Mar 2019 19:43:24 -0400 Subject: [PATCH 12/19] Makes conversions mute victims that are deciding their fate, fixes conversions requiring three cultists to sacrifice a refusing victim --- code/modules/antagonists/cult/runes.dm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index 274273fdcf..adbdc699ae 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -250,14 +250,18 @@ structure_check() searches for nearby cultist structures required for the invoca currentconversionman = convertee conversiontimeout = world.time + (10 SECONDS) convertee.Stun(100) + convertee.add_trait(TRAIT_MUTE, "conversionrune") conversionresult = FALSE while(world.time < conversiontimeout && convertee && !conversionresult) stoplag(1) currentconversionman = null - if(convertee && get_turf(convertee) != get_turf(src)) + if(!convertee) return FALSE - if(!conversionresult && convertee) - do_sacrifice(convertee, invokers) + convertee.remove_trait(TRAIT_MUTE, "conversionrune") + if(get_turf(convertee) != get_turf(src)) + return FALSE + if(!conversionresult) + do_sacrifice(convertee, invokers, TRUE) return FALSE var/brutedamage = convertee.getBruteLoss() var/burndamage = convertee.getFireLoss() @@ -279,7 +283,7 @@ structure_check() searches for nearby cultist structures required for the invoca H.cultslurring = 0 return 1 -/obj/effect/rune/convert/proc/do_sacrifice(mob/living/sacrificial, list/invokers) +/obj/effect/rune/convert/proc/do_sacrifice(mob/living/sacrificial, list/invokers, force_a_sac) var/mob/living/first_invoker = invokers[1] if(!first_invoker) return FALSE From 78472039cf6d105feeab0652eec9a4d791849ad6 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Fri, 15 Mar 2019 19:47:02 -0400 Subject: [PATCH 13/19] i hit ctrl s god fucking damnit --- code/modules/antagonists/cult/runes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index adbdc699ae..f3975851ca 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -293,7 +293,7 @@ structure_check() searches for nearby cultist structures required for the invoca var/big_sac = FALSE - if((((ishuman(sacrificial) || iscyborg(sacrificial)) && sacrificial.stat != DEAD) || C.cult_team.is_sacrifice_target(sacrificial.mind)) && invokers.len < 3) + if(!force_a_sac && (((ishuman(sacrificial) || iscyborg(sacrificial)) && sacrificial.stat != DEAD) || C.cult_team.is_sacrifice_target(sacrificial.mind)) && invokers.len < 3) for(var/M in invokers) to_chat(M, "[sacrificial] is too greatly linked to the world! You need three acolytes!") log_game("Offer rune failed - not enough acolytes and target is living or sac target") From 9d711370d41198381f05d52ee57679999cb5e6f9 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Fri, 15 Mar 2019 20:09:34 -0400 Subject: [PATCH 14/19] Fixes staminaloss not redirecting to the chest when attempting to apply to the head --- code/modules/mob/living/carbon/human/species.dm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 0e5eef2ffb..e1935a9b5d 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1653,13 +1653,19 @@ GLOBAL_LIST_EMPTY(roundstart_races) var/obj/item/bodypart/BP = null if(isbodypart(def_zone)) - BP = def_zone + if(damagetype == STAMINA && istype(def_zone, /obj/item/bodypart/head)) + BP = H.get_bodypart(check_zone(BODY_ZONE_CHEST)) + else + BP = def_zone else if(!def_zone) def_zone = ran_zone(def_zone) + if(damagetype == STAMINA && def_zone == BODY_ZONE_HEAD) + def_zone = BODY_ZONE_CHEST BP = H.get_bodypart(check_zone(def_zone)) - if(!BP) - BP = H.bodyparts[1] + + if(!BP) + BP = H.bodyparts[1] switch(damagetype) if(BRUTE) From 5be54a8897a6e2787057fe33c631447b96fe6cf9 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 16 Mar 2019 17:53:10 -0500 Subject: [PATCH 15/19] Automatic changelog generation for PR #8121 [ci skip] --- html/changelogs/AutoChangeLog-pr-8121.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-8121.yml diff --git a/html/changelogs/AutoChangeLog-pr-8121.yml b/html/changelogs/AutoChangeLog-pr-8121.yml new file mode 100644 index 0000000000..27ce1ee0a1 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-8121.yml @@ -0,0 +1,5 @@ +author: "deathride58" +delete-after: True +changes: + - tweak: "Conversion runes will now mute the victim temporarily while they're deciding whether to convert or be sacrificed." + - bugfix: "Conversion runes no longer require a third cultist to sacrifice if the victim refuses conversion" From 5528a45125b3770e688e5f5fa2d15caea7cfd8c6 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 16 Mar 2019 17:53:22 -0500 Subject: [PATCH 16/19] Automatic changelog generation for PR #8119 [ci skip] --- html/changelogs/AutoChangeLog-pr-8119.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-8119.yml diff --git a/html/changelogs/AutoChangeLog-pr-8119.yml b/html/changelogs/AutoChangeLog-pr-8119.yml new file mode 100644 index 0000000000..6e282e2a8d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-8119.yml @@ -0,0 +1,5 @@ +author: "deathride58" +delete-after: True +changes: + - bugfix: "Sparks and igniters will now actually heat areas rather than cooling them, as was intended." + - tweak: "To alleviate some potential complaints, RPDs now have a cooldown before they can create sparks, and both RPDs and emitters produce less sparks." From f70966f8e2877a60435d1bfcf94af5ebf54a7c26 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 16 Mar 2019 17:54:01 -0500 Subject: [PATCH 17/19] Automatic changelog generation for PR #8108 [ci skip] --- html/changelogs/AutoChangeLog-pr-8108.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-8108.yml diff --git a/html/changelogs/AutoChangeLog-pr-8108.yml b/html/changelogs/AutoChangeLog-pr-8108.yml new file mode 100644 index 0000000000..fea83213be --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-8108.yml @@ -0,0 +1,4 @@ +author: "Ghommie" +delete-after: True +changes: + - rscadd: "Adds two cartons of space milk to the space skellie pirates cutter's fridge." From 1791a8526e6a0ebb3a08e98e3788f8c3c7975fa1 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 17 Mar 2019 17:31:13 -0500 Subject: [PATCH 18/19] donator beret --- modular_citadel/code/modules/client/loadout/__donator.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index 66245fbb8a..c0a4df2243 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -367,4 +367,10 @@ datum/gear/darksabresheath name = "Soul Necklace" category = SLOT_NECK path = /obj/item/clothing/neck/undertale - ckeywhitelist = list("twilightic") \ No newline at end of file + ckeywhitelist = list("twilightic") + +/datum/gear/frenchberet + name = "French Beret" + category = SLOT_HEAD + path = /obj/item/clothing/head/frenchberet + ckeywhitelist = list("notazoltan") \ No newline at end of file From ea37b1a17292dcceab411bad41fc507b4f574e3a Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 18 Mar 2019 00:30:38 -0500 Subject: [PATCH 19/19] Automatic changelog generation for PR #8122 [ci skip] --- html/changelogs/AutoChangeLog-pr-8122.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-8122.yml diff --git a/html/changelogs/AutoChangeLog-pr-8122.yml b/html/changelogs/AutoChangeLog-pr-8122.yml new file mode 100644 index 0000000000..2b9d091601 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-8122.yml @@ -0,0 +1,4 @@ +author: "deathride58" +delete-after: True +changes: + - bugfix: "Staminaloss targeted at the head now properly redirects to the chest."