From 849dbc7fb3bb4082d04ab1a3db49312e3eedaf4e Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sat, 18 Sep 2021 19:37:24 -0700 Subject: [PATCH 01/34] sigh --- code/__DEFINES/configuration.dm | 8 ++++++++ code/modules/jobs/job_types/prisoner.dm | 11 ++++++++++- .../hostile/mining_mobs/elites/elite.dm | 18 ++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/configuration.dm b/code/__DEFINES/configuration.dm index 9915563cab..8c9b270f43 100644 --- a/code/__DEFINES/configuration.dm +++ b/code/__DEFINES/configuration.dm @@ -24,3 +24,11 @@ #define POLICYCONFIG_ON_PYROCLASTIC_SENTIENT "PYROCLASTIC_SLIME" /// Displayed to pAIs on spawn #define POLICYCONFIG_PAI "PAI_SPAWN" +/// displayed to lavaland elites on spawn, overriding the default if set +#define POLICYCONFIG_ELITE_SPAWN "ELITE_FAUNA_SPAWN" +/// displayed to lavaland elites on sentience potion, overriding the default if set +#define POLICYCONFIG_ELITE_SENTIENCE "ELITE_FAUNA_SENTIENCE" +/// displayed to lavaland elites on winning the fight, overriding the default if set +#define POLICYCONFIG_ELITE_WIN "ELITE_FAUNA_WIN" +/// displayed to prisoners on spawn, overriding the default if set +#define POLICYCONFIG_JOB_PRISONER "JOB_PRISONER" diff --git a/code/modules/jobs/job_types/prisoner.dm b/code/modules/jobs/job_types/prisoner.dm index 13c18c21ca..277f53b0db 100644 --- a/code/modules/jobs/job_types/prisoner.dm +++ b/code/modules/jobs/job_types/prisoner.dm @@ -1,4 +1,4 @@ -datum/job/prisoner +/datum/job/prisoner title = "Prisoner" flag = PRISONER department_head = list("The Security Team") @@ -13,6 +13,15 @@ datum/job/prisoner display_order = JOB_DISPLAY_ORDER_PRISONER +/datum/job/prisoner/after_spawn(mob/living/carbon/human/H, mob/M) + var/list/policies = CONFIG_GET(keyed_list/policy) + var/policy = policies[POLICYCONFIG_JOB_PRISONER] + if(policy) + var/mob/found = (M?.client && M) || (H?.client && H) + to_chat(found, "
!!READ THIS!!
The following is server-specific policy configuration and overrides anything said above if conflicting.") + to_chat(found, "

") + to_chat(found, "[policy]") + /datum/outfit/job/prisoner name = "Prisoner" jobtype = /datum/job/prisoner diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm index d677f59440..de6b858f79 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm @@ -176,6 +176,12 @@ While using this makes the system rely on OnFire, it still gives options for tim elitemind = pick(candidates) elitemind.playsound_local(get_turf(elitemind), 'sound/effects/magic.ogg', 40, 0) to_chat(elitemind, "You have been chosen to play as a Lavaland Elite.\nIn a few seconds, you will be summoned on Lavaland as a monster to fight your activator, in a fight to the death.\nYour attacks can be switched using the buttons on the top left of the HUD, and used by clicking on targets or tiles similar to a gun.\nWhile the opponent might have an upper hand with powerful mining equipment and tools, you have great power normally limited by AI mobs.\nIf you want to win, you'll have to use your powers in creative ways to ensure the kill. It's suggested you try using them all as soon as possible.\nShould you win, you'll receive extra information regarding what to do after. Good luck!") + var/list/policies = CONFIG_GET(keyed_list/policy) + var/policy = policies[POLICYCONFIG_ELITE_SPAWN] + if(policy) + to_chat(elitemind, "
!!READ THIS!!
The following is server-specific policy configuration and overrides anything said above if conflicting.") + to_chat(elitemind, "

") + to_chat(elitemind, "[policy]") addtimer(CALLBACK(src, .proc/spawn_elite, elitemind), 100) else visible_message("The stirring stops, and nothing emerges. Perhaps try again later.") @@ -304,6 +310,12 @@ While using this makes the system rely on OnFire, it still gives options for tim to_chat(mychild, "As the life in the activator's eyes fade, the forcefield around you dies out and you feel your power subside.\nDespite this inferno being your home, you feel as if you aren't welcome here anymore.\nWithout any guidance, your purpose is now for you to decide.") to_chat(mychild, "Your max health has been halved, but can now heal by standing on your tumor. Note, it's your only way to heal.\nBear in mind, if anyone interacts with your tumor, you'll be resummoned here to carry out another fight. In such a case, you will regain your full max health.\nAlso, be weary of your fellow inhabitants, they likely won't be happy to see you!") to_chat(mychild, "Note that you are a lavaland monster, and thus not allied to the station. You should not cooperate or act friendly with any station crew unless under extreme circumstances!") + var/list/policies = CONFIG_GET(keyed_list/policy) + var/policy = policies[POLICYCONFIG_ELITE_WIN] + if(policy) + to_chat(mychild, "
!!READ THIS!!
The following is server-specific policy configuration and overrides anything said above if conflicting.") + to_chat(mychild, "

") + to_chat(mychild, "[policy]") /obj/item/tumor_shard name = "tumor shard" @@ -332,6 +344,12 @@ While using this makes the system rely on OnFire, it still gives options for tim E.playsound_local(get_turf(E), 'sound/effects/magic.ogg', 40, 0) to_chat(E, "You have been revived by [user]. While you can't speak to them, you owe [user] a great debt. Assist [user.p_them()] in achieving [user.p_their()] goals, regardless of risk.Note that you now share the loyalties of [user]. You are expected not to intentionally sabotage their faction unless commanded to!") + var/list/policies = CONFIG_GET(keyed_list/policy) + var/policy = policies[POLICYCONFIG_ELITE_SENTIENCE] + if(policy) + to_chat(E, "
!!READ THIS!!
The following is server-specific policy configuration and overrides anything said above if conflicting.") + to_chat(E, "

") + to_chat(E, "[policy]") E.maxHealth = E.maxHealth * 0.5 E.health = E.maxHealth E.desc = "[E.desc] However, this one appears appears less wild in nature, and calmer around people." From 147903f654fafe0ae249feb13ba4cebecff25cd7 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 19 Sep 2021 10:57:58 -0700 Subject: [PATCH 02/34] sigh --- code/_globalvars/lists/typecache.dm | 13 +++++++++++++ code/game/objects/items/dice.dm | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/code/_globalvars/lists/typecache.dm b/code/_globalvars/lists/typecache.dm index 1ec3de0bc5..d380816bbf 100644 --- a/code/_globalvars/lists/typecache.dm +++ b/code/_globalvars/lists/typecache.dm @@ -12,3 +12,16 @@ GLOBAL_LIST_INIT(typecache_stack, typecacheof(/obj/item/stack)) GLOBAL_LIST_INIT(typecache_machine_or_structure, typecacheof(list(/obj/machinery, /obj/structure))) GLOBAL_LIST_INIT(freezing_objects, typecacheof(list(/obj/structure/closet/crate/freezer, /obj/structure/closet/secure_closet/freezer, /obj/structure/bodycontainer, /obj/item/autosurgeon, /obj/machinery/smartfridge/organ))) //list of all cold objects, that freeze organs when inside + +GLOBAL_LIST_EMPTY(typecaches) + +/** + * Makes a typecache of a single typecache + * + * Obviously in BYOND we don't have the efficiency around here to have proper enforcement so + * If you use this you better know what you're doing. The list you get back is globally cached and if it's modified, you might break multiple things. + */ +/proc/single_path_typecache_immutable(path) + if(!GLOB.typecaches[path]) + GLOB.typecaches[path] = typecacheof(path) + return GLOB.typecaches[path] diff --git a/code/game/objects/items/dice.dm b/code/game/objects/items/dice.dm index bbc493672f..53b0860def 100644 --- a/code/game/objects/items/dice.dm +++ b/code/game/objects/items/dice.dm @@ -17,6 +17,11 @@ /obj/item/dice/d100 ) +/obj/item/storage/dice/ComponentInitialize() + . = ..() + var/datum/component/storage/STR = GetComponent(/datum/component/storage) + STR.can_hold = single_path_typecache_immutable(/obj/item/dice) + /obj/item/storage/dice/PopulateContents() new /obj/item/dice/d4(src) new /obj/item/dice/d6(src) From c9662f76ed5fe064dff94919f5a56fa863cd9eba Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 19 Sep 2021 11:35:52 -0700 Subject: [PATCH 03/34] Update parts.dm --- code/modules/surgery/bodyparts/parts.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm index 3a08a764d3..39e81ea3bc 100644 --- a/code/modules/surgery/bodyparts/parts.dm +++ b/code/modules/surgery/bodyparts/parts.dm @@ -65,7 +65,7 @@ body_zone = BODY_ZONE_L_ARM body_part = ARM_LEFT aux_icons = list(BODY_ZONE_PRECISE_L_HAND = HANDS_PART_LAYER, "l_hand_behind" = BODY_BEHIND_LAYER) - body_damage_coeff = 0.25 + body_damage_coeff = 0.5 held_index = 1 px_x = -6 px_y = 0 @@ -126,7 +126,7 @@ body_zone = BODY_ZONE_R_ARM body_part = ARM_RIGHT aux_icons = list(BODY_ZONE_PRECISE_R_HAND = HANDS_PART_LAYER, "r_hand_behind" = BODY_BEHIND_LAYER) - body_damage_coeff = 0.25 + body_damage_coeff = 0.5 held_index = 2 px_x = 6 px_y = 0 @@ -188,7 +188,7 @@ disable_threshold = 75 body_zone = BODY_ZONE_L_LEG body_part = LEG_LEFT - body_damage_coeff = 0.25 + body_damage_coeff = 0.5 px_x = -2 px_y = 12 stam_heal_tick = STAM_RECOVERY_LIMB @@ -247,7 +247,7 @@ disable_threshold = 75 body_zone = BODY_ZONE_R_LEG body_part = LEG_RIGHT - body_damage_coeff = 0.25 + body_damage_coeff = 0.5 px_x = 2 px_y = 12 max_stamina_damage = 50 From b752cb0af27fb5b2498c7c02a217590f348b5428 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 19 Sep 2021 11:38:12 -0700 Subject: [PATCH 04/34] Update parts.dm --- code/modules/surgery/bodyparts/parts.dm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm index 39e81ea3bc..e66f14da93 100644 --- a/code/modules/surgery/bodyparts/parts.dm +++ b/code/modules/surgery/bodyparts/parts.dm @@ -59,13 +59,13 @@ one though." icon_state = "default_human_l_arm" attack_verb = list("slapped", "punched") - max_damage = 150 + max_damage = 50 disable_threshold = 75 max_stamina_damage = 50 body_zone = BODY_ZONE_L_ARM body_part = ARM_LEFT aux_icons = list(BODY_ZONE_PRECISE_L_HAND = HANDS_PART_LAYER, "l_hand_behind" = BODY_BEHIND_LAYER) - body_damage_coeff = 0.5 + body_damage_coeff = 0.75 held_index = 1 px_x = -6 px_y = 0 @@ -121,12 +121,12 @@ among humans missing their right arm." icon_state = "default_human_r_arm" attack_verb = list("slapped", "punched") - max_damage = 150 + max_damage = 50 disable_threshold = 75 body_zone = BODY_ZONE_R_ARM body_part = ARM_RIGHT aux_icons = list(BODY_ZONE_PRECISE_R_HAND = HANDS_PART_LAYER, "r_hand_behind" = BODY_BEHIND_LAYER) - body_damage_coeff = 0.5 + body_damage_coeff = 0.75 held_index = 2 px_x = 6 px_y = 0 @@ -184,11 +184,11 @@ luck. In this instance, it probably would not have helped." icon_state = "default_human_l_leg" attack_verb = list("kicked", "stomped") - max_damage = 150 + max_damage = 50 disable_threshold = 75 body_zone = BODY_ZONE_L_LEG body_part = LEG_LEFT - body_damage_coeff = 0.5 + body_damage_coeff = 0.75 px_x = -2 px_y = 12 stam_heal_tick = STAM_RECOVERY_LIMB @@ -243,11 +243,10 @@ // alternative spellings of 'pokey' are availible icon_state = "default_human_r_leg" attack_verb = list("kicked", "stomped") - max_damage = 150 - disable_threshold = 75 + max_damage = 50 body_zone = BODY_ZONE_R_LEG body_part = LEG_RIGHT - body_damage_coeff = 0.5 + body_damage_coeff = 0.75 px_x = 2 px_y = 12 max_stamina_damage = 50 From 17cd5c5d849e796c5b8ba946c9de4e5e8f4d1f44 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 19 Sep 2021 13:46:08 -0700 Subject: [PATCH 05/34] Update mobs.dm --- code/modules/movespeed/modifiers/mobs.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/movespeed/modifiers/mobs.dm b/code/modules/movespeed/modifiers/mobs.dm index 7e857a4e0d..153d7dd973 100644 --- a/code/modules/movespeed/modifiers/mobs.dm +++ b/code/modules/movespeed/modifiers/mobs.dm @@ -113,6 +113,7 @@ multiplicative_slowdown = CRAWLING_ADD_SLOWDOWN movetypes = CRAWLING flags = IGNORE_NOSLOW + priority = 20000 /datum/movespeed_modifier/mob_config_speedmod variable = TRUE From 84a26eeabdc7e813fa4851314ea749cb0a27d329 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 19 Sep 2021 14:45:24 -0700 Subject: [PATCH 06/34] Update obj_defense.dm --- code/game/objects/obj_defense.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index 78a5c9ece9..d9111d6c3b 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -22,7 +22,7 @@ //returns the damage value of the attack after processing the obj's various armor protections /obj/proc/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir, armour_penetration = 0) - if(damage_flag == MELEE && damage_amount < damage_deflection) + if(damage_flag == "melee" && damage_amount < damage_deflection) return 0 switch(damage_type) if(BRUTE) From 6d99bca184f0ec5cf525ad2334a2942cf7de6d9a Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 19 Sep 2021 14:46:09 -0700 Subject: [PATCH 07/34] Update obj_defense.dm --- code/game/objects/obj_defense.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index d9111d6c3b..15fd102878 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -22,7 +22,7 @@ //returns the damage value of the attack after processing the obj's various armor protections /obj/proc/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir, armour_penetration = 0) - if(damage_flag == "melee" && damage_amount < damage_deflection) + if(damage_flag == "melee" && damage_amount < damage_deflection) // TODO: Refactor armor datums and types entirely jfc return 0 switch(damage_type) if(BRUTE) From 605aa0aa1146d76ede5e94654d483b68798b1801 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 20 Sep 2021 00:29:38 +0000 Subject: [PATCH 08/34] Automatic changelog compile [ci skip] --- html/changelog.html | 102 +++++++++++++-------- html/changelogs/.all_changelog.yml | 55 +++++++++++ html/changelogs/AutoChangeLog-pr-14219.yml | 4 - html/changelogs/AutoChangeLog-pr-15074.yml | 4 - html/changelogs/AutoChangeLog-pr-15084.yml | 10 -- html/changelogs/AutoChangeLog-pr-15094.yml | 4 - html/changelogs/AutoChangeLog-pr-15119.yml | 8 -- html/changelogs/AutoChangeLog-pr-15133.yml | 5 - html/changelogs/AutoChangeLog-pr-15134.yml | 4 - html/changelogs/AutoChangeLog-pr-15137.yml | 4 - html/changelogs/AutoChangeLog-pr-15139.yml | 4 - html/changelogs/AutoChangeLog-pr-15143.yml | 4 - html/changelogs/AutoChangeLog-pr-15144.yml | 4 - html/changelogs/AutoChangeLog-pr-15147.yml | 4 - html/changelogs/AutoChangeLog-pr-15154.yml | 4 - html/changelogs/AutoChangeLog-pr-15156.yml | 4 - html/changelogs/AutoChangeLog-pr-15157.yml | 4 - html/changelogs/AutoChangeLog-pr-15160.yml | 4 - html/changelogs/AutoChangeLog-pr-15162.yml | 4 - html/changelogs/AutoChangeLog-pr-15163.yml | 4 - html/changelogs/AutoChangeLog-pr-15167.yml | 4 - html/changelogs/AutoChangeLog-pr-15168.yml | 4 - html/changelogs/AutoChangeLog-pr-15169.yml | 4 - html/changelogs/AutoChangeLog-pr-15171.yml | 4 - html/changelogs/AutoChangeLog-pr-15174.yml | 4 - html/changelogs/AutoChangeLog-pr-15176.yml | 4 - html/changelogs/AutoChangeLog-pr-15178.yml | 4 - 27 files changed, 119 insertions(+), 149 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-14219.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15074.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15084.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15094.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15119.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15133.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15134.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15137.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15139.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15143.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15144.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15147.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15154.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15156.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15157.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15160.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15162.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15163.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15167.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15168.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15169.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15171.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15174.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15176.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15178.yml diff --git a/html/changelog.html b/html/changelog.html index dabd4e7704..6cf78fb190 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,70 @@ -->
+

20 September 2021

+

BlueWildrose updated:

+ +

DeltaFire15 updated:

+ +

Putnam3145 updated:

+ +

buffyuwu updated:

+ +

dapnee updated:

+ +

keronshb updated:

+ +

qweq12yt updated:

+ +

timothyteakettle updated:

+ +

zeroisthebiggay updated:

+ +

18 September 2021

kiwedespars updated:

GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index e4e1fba1c6..46d15762db 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -30003,3 +30003,58 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2021-09-18: kiwedespars: - balance: blacklisted morphine and haloperidol from dart guns +2021-09-20: + BlueWildrose: + - balance: Slime regenerative extracts now require five seconds of wait before they + are used. They add 25 disgust when used. + DeltaFire15: + - bugfix: Catsurgeons should now spawn at more reasonable locations if possible. + - balance: carded AIs can now be converted by conversion sigils (clockcult) + - bugfix: There is now a way to acquire nanite storage protocols (bepis, like the + other protocols), as opposed to them existing with no way to acquire them. + - bugfix: Plastic golems are back to ventcrawler_nude instead of ventcrawler_always + Putnam3145: + - config: monstermos config added, disabled + buffyuwu: + - bugfix: fixed medihound sleeper ui display + - rscadd: Adds 4 redesigned jackets and 2 redesigned shirts to loadout + - bugfix: Holoparasites no long rename and recolor on relog + dapnee: + - bugfix: attaches an air vent that was just there on the AI sat, changes some areas + to what they'd logically be + keronshb: + - bugfix: Plague Rats will no longer spawn thousands of dirt decals + - bugfix: Plague Rats will no longer spawn thousands of corpses + - bugfix: Plague Rats can't spawn or transform off station z anymore + - bugfix: Plague Rats shouldn't explosively grow instantly + - bugfix: Plague Rats won't spawn infinite miasma anymore. + - balance: Plague Rats health is now 100. + - balance: Plague Rats can now ventcrawl through everything to prevent farming. + - bugfix: Slaughter Demons Slam will now wound again on hit. + - balance: Damage for demons back up to 30 + - balance: 'Wound Bonus for demons now at 0. image_add: Adds a sprite for the action + bar' + - refactor: Changed the CTRL+SHIFT Click to an action button. People can see the + cooldown now too. + - rscadd: PAIs can be emagged to reset master + qweq12yt: + - bugfix: Fixed space heaters not being able to be interacted/turned on in non powered + areas + timothyteakettle: + - bugfix: removes passkey from access circuits as its not used anymore + - rscadd: a new mild trauma, **[REDACTED]** + zeroisthebiggay: + - balance: glass has do_after + - bugfix: box perma has power + - bugfix: missing madness mask sprites + - balance: The Spider Clan has recently taken up the Space Ninja project again along + with the Syndicate. Space Ninjas have been drastically changed as a result, + becoming much weaker and more stealth oriented. As a result of cutting costs + per ninja, more ninjas were able to be hired. Expect to see them around more + often. + - bugfix: prisoners cannot latejoin anymore + - bugfix: bone satchel onmob sprites + - rscadd: new tips + - rscdel: old tips + - imageadd: all medipens get inhands + - rscadd: some more brainhurt lines diff --git a/html/changelogs/AutoChangeLog-pr-14219.yml b/html/changelogs/AutoChangeLog-pr-14219.yml deleted file mode 100644 index 1bef269e5a..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14219.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "zeroisthebiggay" -delete-after: True -changes: - - balance: "The Spider Clan has recently taken up the Space Ninja project again along with the Syndicate. Space Ninjas have been drastically changed as a result, becoming much weaker and more stealth oriented. As a result of cutting costs per ninja, more ninjas were able to be hired. Expect to see them around more often." diff --git a/html/changelogs/AutoChangeLog-pr-15074.yml b/html/changelogs/AutoChangeLog-pr-15074.yml deleted file mode 100644 index 5da0c10a10..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15074.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "keronshb" -delete-after: True -changes: - - rscadd: "PAIs can be emagged to reset master" diff --git a/html/changelogs/AutoChangeLog-pr-15084.yml b/html/changelogs/AutoChangeLog-pr-15084.yml deleted file mode 100644 index 6c99cc159d..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15084.yml +++ /dev/null @@ -1,10 +0,0 @@ -author: "keronshb" -delete-after: True -changes: - - bugfix: "Plague Rats will no longer spawn thousands of dirt decals" - - bugfix: "Plague Rats will no longer spawn thousands of corpses" - - bugfix: "Plague Rats can't spawn or transform off station z anymore" - - bugfix: "Plague Rats shouldn't explosively grow instantly" - - bugfix: "Plague Rats won't spawn infinite miasma anymore." - - balance: "Plague Rats health is now 100." - - balance: "Plague Rats can now ventcrawl through everything to prevent farming." diff --git a/html/changelogs/AutoChangeLog-pr-15094.yml b/html/changelogs/AutoChangeLog-pr-15094.yml deleted file mode 100644 index 21dcf75960..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15094.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "zeroisthebiggay" -delete-after: True -changes: - - balance: "glass has do_after" diff --git a/html/changelogs/AutoChangeLog-pr-15119.yml b/html/changelogs/AutoChangeLog-pr-15119.yml deleted file mode 100644 index ee7100fd9b..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15119.yml +++ /dev/null @@ -1,8 +0,0 @@ -author: "keronshb" -delete-after: True -changes: - - bugfix: "Slaughter Demons Slam will now wound again on hit." - - balance: "Damage for demons back up to 30" - - balance: "Wound Bonus for demons now at 0. -image_add: Adds a sprite for the action bar" - - refactor: "Changed the CTRL+SHIFT Click to an action button. People can see the cooldown now too." diff --git a/html/changelogs/AutoChangeLog-pr-15133.yml b/html/changelogs/AutoChangeLog-pr-15133.yml deleted file mode 100644 index 3bc023735f..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15133.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "zeroisthebiggay" -delete-after: True -changes: - - rscadd: "new tips" - - rscdel: "old tips" diff --git a/html/changelogs/AutoChangeLog-pr-15134.yml b/html/changelogs/AutoChangeLog-pr-15134.yml deleted file mode 100644 index 2a71bd9aa0..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15134.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "zeroisthebiggay" -delete-after: True -changes: - - rscadd: "some more brainhurt lines" diff --git a/html/changelogs/AutoChangeLog-pr-15137.yml b/html/changelogs/AutoChangeLog-pr-15137.yml deleted file mode 100644 index eef278a6ea..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15137.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "DeltaFire15" -delete-after: True -changes: - - balance: "carded AIs can now be converted by conversion sigils (clockcult)" diff --git a/html/changelogs/AutoChangeLog-pr-15139.yml b/html/changelogs/AutoChangeLog-pr-15139.yml deleted file mode 100644 index 001897e223..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15139.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "DeltaFire15" -delete-after: True -changes: - - bugfix: "Catsurgeons should now spawn at more reasonable locations if possible." diff --git a/html/changelogs/AutoChangeLog-pr-15143.yml b/html/changelogs/AutoChangeLog-pr-15143.yml deleted file mode 100644 index d4e2141937..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15143.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "zeroisthebiggay" -delete-after: True -changes: - - bugfix: "box perma has power" diff --git a/html/changelogs/AutoChangeLog-pr-15144.yml b/html/changelogs/AutoChangeLog-pr-15144.yml deleted file mode 100644 index 860f1a60cc..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15144.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "zeroisthebiggay" -delete-after: True -changes: - - bugfix: "bone satchel onmob sprites" diff --git a/html/changelogs/AutoChangeLog-pr-15147.yml b/html/changelogs/AutoChangeLog-pr-15147.yml deleted file mode 100644 index 09f98404fd..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15147.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - config: "monstermos config added, disabled" diff --git a/html/changelogs/AutoChangeLog-pr-15154.yml b/html/changelogs/AutoChangeLog-pr-15154.yml deleted file mode 100644 index 756cc2bfb7..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15154.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "qweq12yt" -delete-after: True -changes: - - bugfix: "Fixed space heaters not being able to be interacted/turned on in non powered areas" diff --git a/html/changelogs/AutoChangeLog-pr-15156.yml b/html/changelogs/AutoChangeLog-pr-15156.yml deleted file mode 100644 index 4d74820ca3..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15156.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "zeroisthebiggay" -delete-after: True -changes: - - bugfix: "missing madness mask sprites" diff --git a/html/changelogs/AutoChangeLog-pr-15157.yml b/html/changelogs/AutoChangeLog-pr-15157.yml deleted file mode 100644 index b3f0b8eaba..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15157.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "DeltaFire15" -delete-after: True -changes: - - bugfix: "There is now a way to acquire nanite storage protocols (bepis, like the other protocols), as opposed to them existing with no way to acquire them." diff --git a/html/changelogs/AutoChangeLog-pr-15160.yml b/html/changelogs/AutoChangeLog-pr-15160.yml deleted file mode 100644 index da0d68f52f..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15160.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "timothyteakettle" -delete-after: True -changes: - - bugfix: "removes passkey from access circuits as its not used anymore" diff --git a/html/changelogs/AutoChangeLog-pr-15162.yml b/html/changelogs/AutoChangeLog-pr-15162.yml deleted file mode 100644 index 926f0898d1..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15162.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "zeroisthebiggay" -delete-after: True -changes: - - bugfix: "prisoners cannot latejoin anymore" diff --git a/html/changelogs/AutoChangeLog-pr-15163.yml b/html/changelogs/AutoChangeLog-pr-15163.yml deleted file mode 100644 index 3fe5ba69ee..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15163.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "buffyuwu" -delete-after: True -changes: - - rscadd: "Adds 4 redesigned jackets and 2 redesigned shirts to loadout" diff --git a/html/changelogs/AutoChangeLog-pr-15167.yml b/html/changelogs/AutoChangeLog-pr-15167.yml deleted file mode 100644 index 1c13dfc56f..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15167.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "BlueWildrose" -delete-after: True -changes: - - balance: "Slime regenerative extracts now require five seconds of wait before they are used. They add 25 disgust when used." diff --git a/html/changelogs/AutoChangeLog-pr-15168.yml b/html/changelogs/AutoChangeLog-pr-15168.yml deleted file mode 100644 index 4f040b4580..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15168.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "dapnee" -delete-after: True -changes: - - bugfix: "attaches an air vent that was just there on the AI sat, changes some areas to what they'd logically be" diff --git a/html/changelogs/AutoChangeLog-pr-15169.yml b/html/changelogs/AutoChangeLog-pr-15169.yml deleted file mode 100644 index f3af23ac39..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15169.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "timothyteakettle" -delete-after: True -changes: - - rscadd: "a new mild trauma, **[REDACTED]**" diff --git a/html/changelogs/AutoChangeLog-pr-15171.yml b/html/changelogs/AutoChangeLog-pr-15171.yml deleted file mode 100644 index 958d61e87c..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15171.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "DeltaFire15" -delete-after: True -changes: - - bugfix: "Plastic golems are back to ventcrawler_nude instead of ventcrawler_always" diff --git a/html/changelogs/AutoChangeLog-pr-15174.yml b/html/changelogs/AutoChangeLog-pr-15174.yml deleted file mode 100644 index 79b3b9400f..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15174.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "buffyuwu" -delete-after: True -changes: - - bugfix: "Holoparasites no long rename and recolor on relog" diff --git a/html/changelogs/AutoChangeLog-pr-15176.yml b/html/changelogs/AutoChangeLog-pr-15176.yml deleted file mode 100644 index 3335997a85..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15176.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "buffyuwu" -delete-after: True -changes: - - bugfix: "fixed medihound sleeper ui display" diff --git a/html/changelogs/AutoChangeLog-pr-15178.yml b/html/changelogs/AutoChangeLog-pr-15178.yml deleted file mode 100644 index 3f4debbc45..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15178.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "zeroisthebiggay" -delete-after: True -changes: - - imageadd: "all medipens get inhands" From 11a414d8c874bf32ffff74404f6ea6968ccff62d Mon Sep 17 00:00:00 2001 From: KrabSpider Date: Mon, 20 Sep 2021 16:41:40 -0400 Subject: [PATCH 09/34] blacklists cryogenics from anomaly spawns adds cryogenics to the anomaly blacklist. --- code/modules/events/anomaly.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/events/anomaly.dm b/code/modules/events/anomaly.dm index 438904466c..926ff87c1d 100644 --- a/code/modules/events/anomaly.dm +++ b/code/modules/events/anomaly.dm @@ -24,7 +24,8 @@ /area/holodeck, /area/shuttle, /area/maintenance, - /area/science/test_area) + /area/science/test_area, + /area/commons/cryopod) ) //Subtypes from the above that actually should explode. From ff64050f8ae568ba96fa93e60eccfb0b1bcd940c Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 20 Sep 2021 23:53:29 -0500 Subject: [PATCH 10/34] Automatic changelog generation for PR #15184 [ci skip] --- html/changelogs/AutoChangeLog-pr-15184.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15184.yml diff --git a/html/changelogs/AutoChangeLog-pr-15184.yml b/html/changelogs/AutoChangeLog-pr-15184.yml new file mode 100644 index 0000000000..0e4115ec31 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15184.yml @@ -0,0 +1,4 @@ +author: "silicons" +delete-after: True +changes: + - bugfix: "crawling can't be adrenals'd" From c73455da7a6fa7948bd8cd8226c20c166ede5441 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 20 Sep 2021 23:59:56 -0500 Subject: [PATCH 11/34] Automatic changelog generation for PR #15181 [ci skip] --- html/changelogs/AutoChangeLog-pr-15181.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15181.yml diff --git a/html/changelogs/AutoChangeLog-pr-15181.yml b/html/changelogs/AutoChangeLog-pr-15181.yml new file mode 100644 index 0000000000..9b8e2d63a7 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15181.yml @@ -0,0 +1,4 @@ +author: "silicons" +delete-after: True +changes: + - bugfix: "dice bags can only hold dice" From a81238f50de25553c361fb5990ded01805e6f07f Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 21 Sep 2021 00:00:22 -0500 Subject: [PATCH 12/34] Automatic changelog generation for PR #15182 [ci skip] --- html/changelogs/AutoChangeLog-pr-15182.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15182.yml diff --git a/html/changelogs/AutoChangeLog-pr-15182.yml b/html/changelogs/AutoChangeLog-pr-15182.yml new file mode 100644 index 0000000000..c6e05740b6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15182.yml @@ -0,0 +1,4 @@ +author: "silicons" +delete-after: True +changes: + - rscdel: "limb damage changes reverted" From dbd601412917d262cac9c6c8186f7da82a2e3c78 Mon Sep 17 00:00:00 2001 From: buffyuwu <42501819+buffyuwu@users.noreply.github.com> Date: Tue, 21 Sep 2021 01:16:03 -0400 Subject: [PATCH 13/34] adds art supplies to the fun vendor because some maps don't have the canvas/easel :cl: add: canvas and spraycan are now sold in the fun vendor /:cl: --- code/modules/vending/games.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm index a1d9bc1691..7664a191c8 100644 --- a/code/modules/vending/games.dm +++ b/code/modules/vending/games.dm @@ -10,7 +10,9 @@ /obj/item/toy/cards/deck/unum = 3, /obj/item/cardpack/series_one = 10, /obj/item/dyespray=3, - /obj/item/tcgcard_binder = 5) + /obj/item/tcgcard_binder = 5, + /obj/item/canvas = 3, + /obj/item/toy/crayon/spraycan = 3) contraband = list(/obj/item/dice/fudge = 9) premium = list(/obj/item/melee/skateboard/pro = 3, /obj/item/melee/skateboard/hoverboard = 1) From 989888fb245ed5164592a59b4be5d709952f87ba Mon Sep 17 00:00:00 2001 From: Changelogs Date: Wed, 22 Sep 2021 00:26:18 +0000 Subject: [PATCH 14/34] Automatic changelog compile [ci skip] --- html/changelog.html | 8 ++++++++ html/changelogs/.all_changelog.yml | 5 +++++ html/changelogs/AutoChangeLog-pr-15181.yml | 4 ---- html/changelogs/AutoChangeLog-pr-15182.yml | 4 ---- html/changelogs/AutoChangeLog-pr-15184.yml | 4 ---- 5 files changed, 13 insertions(+), 12 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15181.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15182.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15184.yml diff --git a/html/changelog.html b/html/changelog.html index 6cf78fb190..fd0a53e68c 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,14 @@ -->
+

22 September 2021

+

silicons updated:

+
    +
  • dice bags can only hold dice
    • +
  • limb damage changes reverted
    • +
  • crawling can't be adrenals'd
    • +
+

20 September 2021

BlueWildrose updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 46d15762db..09cb1c8117 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -30058,3 +30058,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - rscdel: old tips - imageadd: all medipens get inhands - rscadd: some more brainhurt lines +2021-09-22: + silicons: + - bugfix: dice bags can only hold dice + - rscdel: limb damage changes reverted + - bugfix: crawling can't be adrenals'd diff --git a/html/changelogs/AutoChangeLog-pr-15181.yml b/html/changelogs/AutoChangeLog-pr-15181.yml deleted file mode 100644 index 9b8e2d63a7..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15181.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "silicons" -delete-after: True -changes: - - bugfix: "dice bags can only hold dice" diff --git a/html/changelogs/AutoChangeLog-pr-15182.yml b/html/changelogs/AutoChangeLog-pr-15182.yml deleted file mode 100644 index c6e05740b6..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15182.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "silicons" -delete-after: True -changes: - - rscdel: "limb damage changes reverted" diff --git a/html/changelogs/AutoChangeLog-pr-15184.yml b/html/changelogs/AutoChangeLog-pr-15184.yml deleted file mode 100644 index 0e4115ec31..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15184.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "silicons" -delete-after: True -changes: - - bugfix: "crawling can't be adrenals'd" From 2522b846671645f21ca48ab9c94a87c3da1ed8be Mon Sep 17 00:00:00 2001 From: buffyuwu <42501819+buffyuwu@users.noreply.github.com> Date: Wed, 22 Sep 2021 01:56:13 -0400 Subject: [PATCH 15/34] ports a downstream fix of accordions while fixing this downstream at fortuna i realized we hadn't fixed this upstream whee --- code/modules/instruments/instrument_data/hardcoded.dm | 8 ++++---- code/modules/instruments/instrument_data/organ.dm | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/instruments/instrument_data/hardcoded.dm b/code/modules/instruments/instrument_data/hardcoded.dm index 757fea08a8..5db7e8b3bb 100644 --- a/code/modules/instruments/instrument_data/hardcoded.dm +++ b/code/modules/instruments/instrument_data/hardcoded.dm @@ -7,11 +7,11 @@ instrument_flags = INSTRUMENT_LEGACY volume_multiplier = 1 //not as loud as synth'd -/datum/instrument/hardcoded/accordian - name = "Accordian" - id = "accordian" +/datum/instrument/hardcoded/accordion + name = "Accordion" + id = "accordion" legacy_instrument_ext = "mid" - legacy_instrument_path = "accordian" + legacy_instrument_path = "accordion" /datum/instrument/hardcoded/bikehorn name = "Bike Horn" diff --git a/code/modules/instruments/instrument_data/organ.dm b/code/modules/instruments/instrument_data/organ.dm index 25da740998..edf9de9485 100644 --- a/code/modules/instruments/instrument_data/organ.dm +++ b/code/modules/instruments/instrument_data/organ.dm @@ -19,8 +19,8 @@ "60"='sound/instruments/synthesis_samples/organ/crisis_hammond/c4.ogg', "72"='sound/instruments/synthesis_samples/organ/crisis_hammond/c5.ogg') -/datum/instrument/organ/crisis_accordian - name = "Crisis Accordian" +/datum/instrument/organ/crisis_accordion + name = "Crisis Accordion" id = "crack" real_samples = list("36"='sound/instruments/synthesis_samples/organ/crisis_accordian/c2.ogg', "48"='sound/instruments/synthesis_samples/organ/crisis_accordian/c3.ogg', @@ -34,8 +34,8 @@ "60"='sound/instruments/synthesis_samples/organ/crisis_harmonica/c4.ogg', "72"='sound/instruments/synthesis_samples/organ/crisis_harmonica/c5.ogg') -/datum/instrument/organ/crisis_tango_accordian - name = "Crisis Tango Accordian" +/datum/instrument/organ/crisis_tango_accordion + name = "Crisis Tango Accordion" id = "crtango" real_samples = list("36"='sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c2.ogg', "48"='sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c3.ogg', From e8617448eff372e7d7bcc7c371495e86592ca71e Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 22 Sep 2021 14:50:00 -0500 Subject: [PATCH 16/34] Automatic changelog generation for PR #15190 [ci skip] --- html/changelogs/AutoChangeLog-pr-15190.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15190.yml diff --git a/html/changelogs/AutoChangeLog-pr-15190.yml b/html/changelogs/AutoChangeLog-pr-15190.yml new file mode 100644 index 0000000000..4cf6d6d9d4 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15190.yml @@ -0,0 +1,4 @@ +author: "buffyuwu" +delete-after: True +changes: + - rscadd: "canvas and spray can are now sold in the fun vendor" From ae4f7076dceb7db60228d090cc7b1a74597f1c45 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 22 Sep 2021 14:50:30 -0500 Subject: [PATCH 17/34] Automatic changelog generation for PR #15187 [ci skip] --- html/changelogs/AutoChangeLog-pr-15187.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15187.yml diff --git a/html/changelogs/AutoChangeLog-pr-15187.yml b/html/changelogs/AutoChangeLog-pr-15187.yml new file mode 100644 index 0000000000..607254a34e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15187.yml @@ -0,0 +1,4 @@ +author: "KrabSpider" +delete-after: True +changes: + - code_imp: "cryogenics ain't a candidate for anomaly spawns anymore." From fc73e2944f3779861b50084eb979a3ffedeb9233 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 23 Sep 2021 00:27:37 +0000 Subject: [PATCH 18/34] Automatic changelog compile [ci skip] --- html/changelog.html | 10 ++++++++++ html/changelogs/.all_changelog.yml | 5 +++++ html/changelogs/AutoChangeLog-pr-15187.yml | 4 ---- html/changelogs/AutoChangeLog-pr-15190.yml | 4 ---- 4 files changed, 15 insertions(+), 8 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15187.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15190.yml diff --git a/html/changelog.html b/html/changelog.html index fd0a53e68c..734ebef9d1 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,16 @@ -->
    +

    23 September 2021

    +

    KrabSpider updated:

    +
      +
    • cryogenics ain't a candidate for anomaly spawns anymore.
      • +
    +

    buffyuwu updated:

    +
      +
    • canvas and spray can are now sold in the fun vendor
      • +
    +

    22 September 2021

    silicons updated:

      diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 09cb1c8117..e2d22e5b59 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -30063,3 +30063,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - bugfix: dice bags can only hold dice - rscdel: limb damage changes reverted - bugfix: crawling can't be adrenals'd +2021-09-23: + KrabSpider: + - code_imp: cryogenics ain't a candidate for anomaly spawns anymore. + buffyuwu: + - rscadd: canvas and spray can are now sold in the fun vendor diff --git a/html/changelogs/AutoChangeLog-pr-15187.yml b/html/changelogs/AutoChangeLog-pr-15187.yml deleted file mode 100644 index 607254a34e..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15187.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "KrabSpider" -delete-after: True -changes: - - code_imp: "cryogenics ain't a candidate for anomaly spawns anymore." diff --git a/html/changelogs/AutoChangeLog-pr-15190.yml b/html/changelogs/AutoChangeLog-pr-15190.yml deleted file mode 100644 index 4cf6d6d9d4..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15190.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "buffyuwu" -delete-after: True -changes: - - rscadd: "canvas and spray can are now sold in the fun vendor" From 7ba7f0d1c16fb59cde6815e2ef1dec9dad5a4f63 Mon Sep 17 00:00:00 2001 From: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com> Date: Thu, 23 Sep 2021 13:20:15 -0400 Subject: [PATCH 19/34] gremlins become shock immune (#15183) * Update gremlin.dm * Update gremlin.dm --- code/modules/mob/living/simple_animal/gremlin/gremlin.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/simple_animal/gremlin/gremlin.dm b/code/modules/mob/living/simple_animal/gremlin/gremlin.dm index 61436cea1c..a6312b9ddf 100644 --- a/code/modules/mob/living/simple_animal/gremlin/gremlin.dm +++ b/code/modules/mob/living/simple_animal/gremlin/gremlin.dm @@ -66,6 +66,7 @@ GLOBAL_LIST(bad_gremlin_items) /mob/living/simple_animal/hostile/gremlin/Initialize() . = ..() AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS) + ADD_TRAIT(src, TRAIT_SHOCKIMMUNE, INNATE_TRAIT) access_card = new /obj/item/card/id(src) var/datum/job/captain/C = new /datum/job/captain access_card.access = C.get_access() From 7623ea95584307f07ee72967e70046a34470d3f1 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 23 Sep 2021 12:20:18 -0500 Subject: [PATCH 20/34] Automatic changelog generation for PR #15183 [ci skip] --- html/changelogs/AutoChangeLog-pr-15183.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15183.yml diff --git a/html/changelogs/AutoChangeLog-pr-15183.yml b/html/changelogs/AutoChangeLog-pr-15183.yml new file mode 100644 index 0000000000..9ceef17df2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15183.yml @@ -0,0 +1,4 @@ +author: "zeroisthebiggay" +delete-after: True +changes: + - balance: "gremlins become shock immune" From 70cdd264dc5dc66ca03be21cd056e7250bffb57b Mon Sep 17 00:00:00 2001 From: Changelogs Date: Fri, 24 Sep 2021 00:26:31 +0000 Subject: [PATCH 21/34] Automatic changelog compile [ci skip] --- html/changelog.html | 12 ++++++------ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/AutoChangeLog-pr-15183.yml | 4 ---- 3 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15183.yml diff --git a/html/changelog.html b/html/changelog.html index 734ebef9d1..a73295461d 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,12 @@ -->
      +

      24 September 2021

      +

      zeroisthebiggay updated:

      +
        +
      • gremlins become shock immune
        • +
      +

      23 September 2021

      KrabSpider updated:

        @@ -548,12 +554,6 @@
        • auxmos bump for dependencies.sh
        - -

        23 July 2021

        -

        silicons updated:

        -
          -
        • Batons are slightly more powerful.
          • -
      GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index e2d22e5b59..5086f469c7 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -30068,3 +30068,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - code_imp: cryogenics ain't a candidate for anomaly spawns anymore. buffyuwu: - rscadd: canvas and spray can are now sold in the fun vendor +2021-09-24: + zeroisthebiggay: + - balance: gremlins become shock immune diff --git a/html/changelogs/AutoChangeLog-pr-15183.yml b/html/changelogs/AutoChangeLog-pr-15183.yml deleted file mode 100644 index 9ceef17df2..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15183.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "zeroisthebiggay" -delete-after: True -changes: - - balance: "gremlins become shock immune" From c633c9591979a093f45d7e74733363c395fa2096 Mon Sep 17 00:00:00 2001 From: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com> Date: Fri, 24 Sep 2021 18:35:49 -0400 Subject: [PATCH 22/34] Update space.dm --- code/datums/ruins/space.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index 64b8692ccd..9caddbc163 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -331,6 +331,12 @@ name = "Space Diner" description = "Come, traveler of the bluespace planes. Sit, enjoy a drink and take one of the fair maidens for a night. The exit is the way you came in, via that teleporter thingy, but do remember to stay safe." +/datum/map_template/ruin/space/suspicious + id = "helterskelter" + suffix = "skelter.dmm" + name = "Helter Skelter" + description = "You're looking mighty suspicious. Why don't you go and take a seat over in that driver?"" + //Space ruins for the station z /datum/map_template/ruin/spacenearstation prefix = "_maps/RandomRuins/SpaceRuinsStation/" From 5366a09c8b1c89dec190a6983cf865c8ee6fbb0b Mon Sep 17 00:00:00 2001 From: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com> Date: Fri, 24 Sep 2021 18:38:58 -0400 Subject: [PATCH 23/34] Update spaceRuinBlacklist.txt --- config/spaceRuinBlacklist.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/config/spaceRuinBlacklist.txt b/config/spaceRuinBlacklist.txt index 969e4135f6..c62408b90c 100644 --- a/config/spaceRuinBlacklist.txt +++ b/config/spaceRuinBlacklist.txt @@ -53,3 +53,4 @@ #_maps/RandomRuins/SpaceRuins/spacehermit.dmm #_maps/RandomRuins/SpaceRuins/advancedlab.dmm #_maps/RandomRuins/SpaceRuins/spacediner.dmm +#_maps/RandomRuins/SpaceRuins/skelter.dmm From 72cb19eb3fa6e614ce55bcb29aefde062d6032aa Mon Sep 17 00:00:00 2001 From: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com> Date: Fri, 24 Sep 2021 19:15:32 -0400 Subject: [PATCH 24/34] Update space.dm --- code/datums/ruins/space.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index 9caddbc163..7a57e50364 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -335,7 +335,7 @@ id = "helterskelter" suffix = "skelter.dmm" name = "Helter Skelter" - description = "You're looking mighty suspicious. Why don't you go and take a seat over in that driver?"" + description = "You're looking mighty suspicious. Why don't you go and take a seat over in that driver?" //Space ruins for the station z /datum/map_template/ruin/spacenearstation From 410bac56858782b614a629d8ebfef610ac2c7357 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 24 Sep 2021 19:14:16 -0500 Subject: [PATCH 25/34] Automatic changelog generation for PR #15192 [ci skip] --- html/changelogs/AutoChangeLog-pr-15192.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15192.yml diff --git a/html/changelogs/AutoChangeLog-pr-15192.yml b/html/changelogs/AutoChangeLog-pr-15192.yml new file mode 100644 index 0000000000..7c1ce611b2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15192.yml @@ -0,0 +1,4 @@ +author: "buffyuwu" +delete-after: True +changes: + - bugfix: "fixes accordions" From 53f75ec0cf06040cc08db0c536b6af288fdfecb2 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sat, 25 Sep 2021 00:26:03 +0000 Subject: [PATCH 26/34] Automatic changelog compile [ci skip] --- html/changelog.html | 25 ++++++---------------- html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/AutoChangeLog-pr-15192.yml | 4 ---- 3 files changed, 9 insertions(+), 23 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15192.yml diff --git a/html/changelog.html b/html/changelog.html index a73295461d..a2fe68aa3c 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,12 @@ -->
      +

      25 September 2021

      +

      buffyuwu updated:

      +
        +
      • fixes accordions
        • +
      +

      24 September 2021

      zeroisthebiggay updated:

        @@ -535,25 +541,6 @@
        • Removes a sneaky transform button on the vore panel.
        - -

        24 July 2021

        -

        MrJWhit updated:

        -
          -
        • Replaces the northwest maint room on box with a sadness room
          • -
        • Replaces bar stripper room with an arcade on boxstation
          • -
        • Squished the west bathrooms a bit and made a room to sell things on boxstation.
          • -
        • Southeast maint hallway on box is now ziggy and zaggier.
          • -
        • Fixed pipes being not connected with the recent map PR for boxstation.
          • -
        -

        Putnam3145 updated:

        -
          -
        • hallucination now bottoms out at 0
          • -
        • supermatter now causes only half the hallucinations
          • -
        -

        cadyn updated:

        -
          -
        • auxmos bump for dependencies.sh
          • -
      GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 5086f469c7..3b5cb2644b 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -30071,3 +30071,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2021-09-24: zeroisthebiggay: - balance: gremlins become shock immune +2021-09-25: + buffyuwu: + - bugfix: fixes accordions diff --git a/html/changelogs/AutoChangeLog-pr-15192.yml b/html/changelogs/AutoChangeLog-pr-15192.yml deleted file mode 100644 index 7c1ce611b2..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15192.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "buffyuwu" -delete-after: True -changes: - - bugfix: "fixes accordions" From 58df5b70bf094c25da4c90e2f3e5f786689bcd54 Mon Sep 17 00:00:00 2001 From: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com> Date: Sat, 25 Sep 2021 19:09:22 -0400 Subject: [PATCH 27/34] Update plaguerat.dm --- code/modules/mob/living/simple_animal/hostile/plaguerat.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/plaguerat.dm b/code/modules/mob/living/simple_animal/hostile/plaguerat.dm index 2b92894317..d6c956ba7b 100644 --- a/code/modules/mob/living/simple_animal/hostile/plaguerat.dm +++ b/code/modules/mob/living/simple_animal/hostile/plaguerat.dm @@ -136,7 +136,6 @@ GLOBAL_LIST_EMPTY(plague_rats) if(LAZYLEN(GLOB.plague_rats) >= cap) visible_message("[src] gnaws into its food, [cap] rats are now on the station!") return - var/mob/living/newmouse = new /mob/living/simple_animal/hostile/plaguerat(loc) visible_message("[src] gnaws into its food, attracting another rat!") /mob/living/simple_animal/hostile/plaguerat/proc/exit_vents() From be82bd310ed131510d32ecba43bbb642e05fc688 Mon Sep 17 00:00:00 2001 From: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com> Date: Sat, 25 Sep 2021 19:17:43 -0400 Subject: [PATCH 28/34] Update plaguerat.dm --- code/modules/mob/living/simple_animal/hostile/plaguerat.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/simple_animal/hostile/plaguerat.dm b/code/modules/mob/living/simple_animal/hostile/plaguerat.dm index d6c956ba7b..497359829e 100644 --- a/code/modules/mob/living/simple_animal/hostile/plaguerat.dm +++ b/code/modules/mob/living/simple_animal/hostile/plaguerat.dm @@ -136,6 +136,7 @@ GLOBAL_LIST_EMPTY(plague_rats) if(LAZYLEN(GLOB.plague_rats) >= cap) visible_message("[src] gnaws into its food, [cap] rats are now on the station!") return + new /mob/living/simple_animal/hostile/plaguerat(loc) visible_message("[src] gnaws into its food, attracting another rat!") /mob/living/simple_animal/hostile/plaguerat/proc/exit_vents() From 6c00bb8dce9cc7b0f8a99f6d2f55722de50434fe Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 26 Sep 2021 06:41:09 -0700 Subject: [PATCH 29/34] Update living_blocking_parrying.dm (#15208) --- code/modules/mob/living/living_blocking_parrying.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/living_blocking_parrying.dm b/code/modules/mob/living/living_blocking_parrying.dm index 0ccc03982a..bdc44ab356 100644 --- a/code/modules/mob/living/living_blocking_parrying.dm +++ b/code/modules/mob/living/living_blocking_parrying.dm @@ -166,7 +166,7 @@ GLOBAL_LIST_EMPTY(block_parry_data) /// Clickdelay duration post-parry if you fail to parry an attack var/parry_failed_clickcd_duration = 0 SECONDS /// Parry cooldown post-parry if failed. This is ADDED to parry_cooldown!!! - var/parry_failed_cooldown_duration = 0 SECONDS + var/parry_failed_cooldown_duration = 3.5 SECONDS // Advanced /// Flags added to return value From 4e2801a0ddae641b52eb507732884076c4100480 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 26 Sep 2021 12:04:29 -0500 Subject: [PATCH 30/34] Automatic changelog generation for PR #15200 [ci skip] --- html/changelogs/AutoChangeLog-pr-15200.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15200.yml diff --git a/html/changelogs/AutoChangeLog-pr-15200.yml b/html/changelogs/AutoChangeLog-pr-15200.yml new file mode 100644 index 0000000000..9d1b65e651 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15200.yml @@ -0,0 +1,4 @@ +author: "zeroisthebiggay" +delete-after: True +changes: + - bugfix: "helter skelter actually spawns" From 11e70bf04433af73c1223b94539d9bd418d4b9e5 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 26 Sep 2021 15:30:43 -0500 Subject: [PATCH 31/34] Automatic changelog generation for PR #15205 [ci skip] --- html/changelogs/AutoChangeLog-pr-15205.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15205.yml diff --git a/html/changelogs/AutoChangeLog-pr-15205.yml b/html/changelogs/AutoChangeLog-pr-15205.yml new file mode 100644 index 0000000000..2c8663f4a3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15205.yml @@ -0,0 +1,4 @@ +author: "zeroisthebiggay" +delete-after: True +changes: + - bugfix: "code\\modules\\mob\\living\\simple_animal\\hostile\\plaguerat.dm:139:warning: newmouse: variable defined but not used" From 1992bf7cfb88a8378eeefee7193359c937cfea99 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 27 Sep 2021 00:26:02 +0000 Subject: [PATCH 32/34] Automatic changelog compile [ci skip] --- html/changelog.html | 13 +++++++------ html/changelogs/.all_changelog.yml | 5 +++++ html/changelogs/AutoChangeLog-pr-15200.yml | 4 ---- html/changelogs/AutoChangeLog-pr-15205.yml | 4 ---- 4 files changed, 12 insertions(+), 14 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15200.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15205.yml diff --git a/html/changelog.html b/html/changelog.html index a2fe68aa3c..189413b690 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,13 @@ -->
      +

      27 September 2021

      +

      zeroisthebiggay updated:

      +
        +
      • helter skelter actually spawns
        • +
      • code\modules\mob\living\simple_animal\hostile\plaguerat.dm:139:warning: newmouse: variable defined but not used
        • +
      +

      25 September 2021

      buffyuwu updated:

        @@ -535,12 +542,6 @@
      • Generic fires work now
      • A knock-on effect of the HE pipe change is that space cooling is ~8.4x as powerful
      - -

      26 July 2021

      -

      SandPoot updated:

      -
        -
      • Removes a sneaky transform button on the vore panel.
        • -
      GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 3b5cb2644b..5f6d3af405 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -30074,3 +30074,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2021-09-25: buffyuwu: - bugfix: fixes accordions +2021-09-27: + zeroisthebiggay: + - bugfix: helter skelter actually spawns + - bugfix: 'code\modules\mob\living\simple_animal\hostile\plaguerat.dm:139:warning: + newmouse: variable defined but not used' diff --git a/html/changelogs/AutoChangeLog-pr-15200.yml b/html/changelogs/AutoChangeLog-pr-15200.yml deleted file mode 100644 index 9d1b65e651..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15200.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "zeroisthebiggay" -delete-after: True -changes: - - bugfix: "helter skelter actually spawns" diff --git a/html/changelogs/AutoChangeLog-pr-15205.yml b/html/changelogs/AutoChangeLog-pr-15205.yml deleted file mode 100644 index 2c8663f4a3..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15205.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "zeroisthebiggay" -delete-after: True -changes: - - bugfix: "code\\modules\\mob\\living\\simple_animal\\hostile\\plaguerat.dm:139:warning: newmouse: variable defined but not used" From 41169d4366376da28171ad7a04d5aec102ec5ef3 Mon Sep 17 00:00:00 2001 From: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com> Date: Mon, 27 Sep 2021 11:49:01 -0400 Subject: [PATCH 33/34] helter skelter fixes so it doesn't break comms and does not come with a fucking uplink (#15210) * . * . --- _maps/RandomRuins/SpaceRuins/skelter.dmm | 330 +++++++++++++---------- 1 file changed, 195 insertions(+), 135 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/skelter.dmm b/_maps/RandomRuins/SpaceRuins/skelter.dmm index 8dd0b3b5e1..694d093eeb 100644 --- a/_maps/RandomRuins/SpaceRuins/skelter.dmm +++ b/_maps/RandomRuins/SpaceRuins/skelter.dmm @@ -875,7 +875,8 @@ /area/service/cafeteria) "cj" = ( /obj/effect/decal/cleanable/blood/old, -/obj/item/clothing/suit/space/syndicate/orange, +/obj/item/clothing/suit/space/syndicate/green/dark, +/obj/item/clothing/head/helmet/space/syndicate/green/dark, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/skelter/sec) "ck" = ( @@ -1366,6 +1367,9 @@ dir = 1; icon_state = "trimline_fill" }, +/mob/living/simple_animal/hostile/syndicate/melee/sword/space{ + name = "Impostrous Commando" + }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/skelter/nav) "ds" = ( @@ -1895,6 +1899,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/item/clothing/head/helmet/space/syndicate/blue, /turf/open/floor/plating, /area/ruin/space/has_grav/skelter/engine/powerstorage) "eC" = ( @@ -2483,6 +2488,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/item/clothing/head/helmet/space/syndicate, /turf/open/floor/plating, /area/ruin/space/has_grav/skelter/engine/powerstorage) "fR" = ( @@ -2581,6 +2587,7 @@ /obj/item/clothing/suit/space/syndicate/orange{ desc = "Wait, don't these normally come with a helmet?" }, +/obj/item/clothing/head/helmet/space/syndicate/orange, /turf/open/floor/plating, /area/ruin/space/has_grav/skelter/forehall) "gg" = ( @@ -2726,6 +2733,7 @@ dir = 1; pixel_y = -24 }, +/obj/item/clothing/head/helmet/space/syndicate/green, /turf/open/floor/carpet, /area/ruin/space/has_grav/skelter/admin) "gx" = ( @@ -2823,6 +2831,10 @@ /area/ruin/space/has_grav/skelter/engine/lower) "gH" = ( /obj/structure/rack, +/obj/item/dnainjector/tonguespike{ + desc = "It's a little suspicious."; + name = "suspicious serum" + }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/skelter/sec) "gI" = ( @@ -2907,18 +2919,18 @@ /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/skelter/shields) "gT" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8; - icon_state = "scrub_map_on-2" - }, /obj/structure/cable/yellow{ icon_state = "0-8" }, /obj/machinery/power/apc{ + cell_type = null; dir = 1; name = "Shield Room APC"; pixel_y = 23 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 8 + }, /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/skelter/shields) "gU" = ( @@ -3136,7 +3148,9 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/turf/open/floor/mineral/titanium/white, +/turf/open/floor/plating/airless{ + icon_state = "platingdmg1" + }, /area/ruin/space/has_grav/skelter/shields) "hp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -3325,7 +3339,9 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, -/turf/open/floor/mineral/titanium/white, +/turf/open/floor/plating/airless{ + icon_state = "platingdmg2" + }, /area/ruin/space/has_grav/skelter/shields) "hO" = ( /obj/machinery/shieldgen, @@ -3523,18 +3539,20 @@ /turf/open/floor/circuit, /area/ruin/space/has_grav/skelter/shields) "il" = ( -/turf/open/floor/mineral/titanium/white, +/obj/structure/lattice, +/turf/open/space/basic, /area/ruin/space/has_grav/skelter/shields) "im" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/obj/machinery/light, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 }, -/turf/open/floor/mineral/titanium/white, +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 1 + }, +/turf/open/floor/plating/airless{ + icon_state = "platingdmg3" + }, /area/ruin/space/has_grav/skelter/shields) "in" = ( /turf/open/floor/plasteel{ @@ -3722,10 +3740,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/item/uplink/old{ - pixel_x = -4; - pixel_y = 8 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4; icon_state = "scrub_map_on-2" @@ -3839,7 +3853,10 @@ /area/ruin/space/has_grav/skelter/comms) "iP" = ( /obj/structure/rack, -/obj/item/gun/ballistic/automatic/pistol, +/obj/item/book/granter/martial/cqc{ + name = "dusty manual"; + used = 1 + }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/skelter/sec) "iQ" = ( @@ -3874,20 +3891,6 @@ }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/skelter/storage) -"iU" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/machinery/telecomms/relay/preset/auto, -/turf/open/floor/plasteel/showroomfloor, -/area/ruin/space/has_grav/skelter/comms) "iV" = ( /obj/structure/chair/comfy/teal, /obj/effect/turf_decal/tile/blue, @@ -3917,6 +3920,7 @@ /obj/item/clothing/suit/space/syndicate/black{ desc = "Wait, don't these normally come with a helmet?" }, +/obj/item/clothing/head/helmet/space/syndicate/black, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/comms) "iX" = ( @@ -4078,7 +4082,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/machinery/telecomms/allinone, +/mob/living/simple_animal/hostile/syndicate/melee/space{ + name = "Impostrous Commando" + }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/comms) "jo" = ( @@ -4146,12 +4152,6 @@ /obj/item/gun/ballistic/automatic/pistol/no_mag, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/comms) -"jw" = ( -/turf/open/space/basic, -/area/space/nearstation) -"jx" = ( -/turf/open/space/basic, -/area/template_noop) "jy" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -4166,6 +4166,66 @@ /obj/item/ammo_casing/c10mm, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/comms) +"sg" = ( +/obj/effect/turf_decal/weather, +/turf/open/floor/plating/airless, +/area/ruin/space/has_grav/skelter/shields) +"vv" = ( +/mob/living/simple_animal/hostile/syndicate/melee/space{ + name = "Impostrous Commando" + }, +/turf/open/floor/plasteel/showroomfloor, +/area/ruin/space/has_grav/skelter/engine/powerstorage) +"vz" = ( +/obj/structure/fluff/broken_flooring{ + icon_state = "singular" + }, +/turf/open/floor/plating/airless{ + icon_state = "platingdmg3" + }, +/area/ruin/space/has_grav/skelter/shields) +"AJ" = ( +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav/skelter/shields) +"AR" = ( +/mob/living/simple_animal/hostile/syndicate/ranged/shotgun/space{ + name = "Impostrous Commando" + }, +/turf/open/floor/plasteel/dark, +/area/ruin/space/has_grav/skelter/sec) +"JR" = ( +/obj/effect/turf_decal/weather, +/turf/open/floor/plating/airless{ + icon_state = "platingdmg2" + }, +/area/ruin/space/has_grav/skelter/shields) +"Li" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/ruin/space/has_grav/skelter/shields) +"OA" = ( +/obj/structure/fluff/broken_flooring{ + icon_state = "singular" + }, +/turf/template_noop, +/area/template_noop) +"WM" = ( +/obj/effect/turf_decal/weather, +/turf/open/floor/plating/airless, +/area/ruin/unpowered/no_grav) +"Zs" = ( +/obj/item/shard{ + icon_state = "medium" + }, +/obj/structure/fluff/broken_flooring{ + dir = 8; + icon_state = "pile" + }, +/turf/template_noop, +/area/template_noop) (1,1,1) = {" ah @@ -4483,7 +4543,7 @@ cF cF ex eW -cF +AR fN gj hJ @@ -4525,7 +4585,7 @@ iI iQ iY ji -jx +ah "} (13,1,1) = {" ah @@ -4549,7 +4609,7 @@ gj iP gl hx -hx +vv is hx eA @@ -4705,7 +4765,7 @@ fV hX jb jj -jw +ah "} (19,1,1) = {" ah @@ -4885,7 +4945,7 @@ gO iT jf jk -jw +ah "} (25,1,1) = {" ay @@ -4942,7 +5002,7 @@ hH ih iG iN -iU +iO ii jl ah @@ -5091,10 +5151,10 @@ hn hM ik iH -gA -bx -ae -ah +gz +bL +bL +ak ah "} (32,1,1) = {" @@ -5118,13 +5178,13 @@ ga gx gR ho -hM +Li +vz il -il -gA -ae -ah -ah +sg +bL +ak +ak ah "} (33,1,1) = {" @@ -5150,12 +5210,12 @@ gS hp hN im -gA -gU -ah -ah -ah -ah +sg +JR +ac +ak +ak +bq "} (34,1,1) = {" ah @@ -5179,13 +5239,13 @@ gz gT hq hO -gA -gU -ah -ah -ah -ah -ah +gz +sg +WM +ac +ak +ak +cl "} (35,1,1) = {" aS @@ -5207,15 +5267,15 @@ dV gd gA gU -gU -gU -gU -ah -ah -ah -ah -ah -ah +gz +AJ +gz +ac +ac +ac +ac +ak +aZ "} (36,1,1) = {" ah @@ -5237,15 +5297,15 @@ fI ge gB gV -jw -ah -ah -ah -ah -ah -ah -ah -ah +aZ +ac +ak +ak +ac +ac +ac +ac +aZ "} (37,1,1) = {" ah @@ -5267,15 +5327,15 @@ cR gf ct cR -ah -ah -ah -ah -ah -ah -ah -ah -ah +aZ +ak +ak +ak +ak +ac +ac +ac +Zs "} (38,1,1) = {" ah @@ -5296,16 +5356,16 @@ bx dV ct ct -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah +aZ +aZ +ac +ak +ak +ak +ak +ak +ac +aZ "} (39,1,1) = {" ah @@ -5326,16 +5386,16 @@ cu cb ae ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah +OA +cl +do +ac +ak +ak +ak +ac +aZ +aS "} (40,1,1) = {" ah @@ -5356,15 +5416,15 @@ fr cc ah ah +do +aS +bq ah +aZ +aZ ah -ah -ah -ah -ah -ah -ah -ah +aZ +aS ah "} (41,1,1) = {" @@ -5387,13 +5447,13 @@ cc ah ah ah +aZ +do ah ah -ah -ah -ah -ah -ah +do +aZ +ba ah ah "} @@ -5419,12 +5479,12 @@ ah ah ah ah +bF ah ah ah ah -ah -ah +aZ ah "} (43,1,1) = {" @@ -5445,15 +5505,15 @@ ce ce ce ah +aZ +cl ah ah ah +aZ +aS ah -ah -ah -ah -ah -ah +cl ah ah "} @@ -5476,7 +5536,7 @@ ah ah ah ah -ah +bq ah ah ah From e8931415739a7af53c834b5f4d2c348ae6b8047f Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 27 Sep 2021 10:49:05 -0500 Subject: [PATCH 34/34] Automatic changelog generation for PR #15210 [ci skip] --- html/changelogs/AutoChangeLog-pr-15210.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15210.yml diff --git a/html/changelogs/AutoChangeLog-pr-15210.yml b/html/changelogs/AutoChangeLog-pr-15210.yml new file mode 100644 index 0000000000..1dae3adf10 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15210.yml @@ -0,0 +1,5 @@ +author: "zeroisthebiggay" +delete-after: True +changes: + - balance: "helter skelter loot insanity" + - bugfix: "helter skelter comms insanity"