From c7020972ae3ec5e0958551df5ab624fc09bfb475 Mon Sep 17 00:00:00 2001 From: raspy-on-osu Date: Tue, 28 Sep 2021 21:09:34 -0400 Subject: [PATCH 1/8] init --- code/game/objects/items/apc_frame.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index 3640db2d8a..7e9bea2c5d 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -95,7 +95,7 @@ /obj/item/wallframe/apc/try_build(turf/on_wall, user) if(!..()) return - var/turf/T = get_turf(on_wall) //the user is not where it needs to be. + var/turf/T = get_turf(user) var/area/A = get_area(T) if(A.get_apc()) to_chat(user, "This area already has an APC!") From 47cf0c153ab051576122e61ac1489c40ab47b205 Mon Sep 17 00:00:00 2001 From: MrJWhit <48370570+MrJWhit@users.noreply.github.com> Date: Wed, 17 Nov 2021 18:36:49 -0500 Subject: [PATCH 2/8] Update loot_pile.dm --- code/game/objects/structures/loot_pile.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/structures/loot_pile.dm b/code/game/objects/structures/loot_pile.dm index b6249ec1e4..dc3971fdd2 100644 --- a/code/game/objects/structures/loot_pile.dm +++ b/code/game/objects/structures/loot_pile.dm @@ -9,6 +9,7 @@ icon_state = "randompile" density = FALSE anchored = TRUE + max_integrity = 100 var/loot_amount = 5 var/delete_on_depletion = FALSE var/can_use_hands = TRUE From 9d3857c94e45224c0fa7dfbe737aa4c0631ee2e5 Mon Sep 17 00:00:00 2001 From: SandPoot Date: Thu, 18 Nov 2021 14:57:19 -0300 Subject: [PATCH 3/8] Upload files --- code/datums/components/_component.dm | 14 +++++++++----- code/datums/components/acid.dm | 6 ++++-- code/game/atoms.dm | 8 ++++++-- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm index 9e4e16f813..6b99cf8318 100644 --- a/code/datums/components/_component.dm +++ b/code/datums/components/_component.dm @@ -52,12 +52,16 @@ return /** - * Properly removes the component from `parent` and cleans up references - * Setting `force` makes it not check for and remove the component from the parent - * Setting `silent` deletes the component without sending a `COMSIG_COMPONENT_REMOVING` signal - */ + * Properly removes the component from `parent` and cleans up references + * + * Arguments: + * * force - makes it not check for and remove the component from the parent + * * silent - deletes the component without sending a [COMSIG_COMPONENT_REMOVING] signal + */ /datum/component/Destroy(force=FALSE, silent=FALSE) - if(!force && parent) + if(!parent) + return ..() + if(!force) _RemoveFromParent() if(!silent) SEND_SIGNAL(parent, COMSIG_COMPONENT_REMOVING, src) diff --git a/code/datums/components/acid.dm b/code/datums/components/acid.dm index 2e3784dc97..39e9b2cb63 100644 --- a/code/datums/components/acid.dm +++ b/code/datums/components/acid.dm @@ -38,9 +38,11 @@ /datum/component/acid/Destroy() STOP_PROCESSING(SSprocessing, src) - var/obj/O = parent level = 0 - O.update_overlays() + if(parent) // So, this is how you get runtimes fellas. + UnregisterSignal(parent, list(COMSIG_ATOM_UPDATE_OVERLAYS, COMSIG_ATOM_ATTACK_HAND)) // Don't worry about isitem checks, we don't need them. + var/atom/O = parent + O.update_icon(UPDATE_OVERLAYS) return ..() /datum/component/acid/process() diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 48213279f1..f8c17134ba 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -596,9 +596,13 @@ //SHOULD_CALL_PARENT(TRUE) return SEND_SIGNAL(src, COMSIG_ATOM_UPDATE_ICON_STATE) -/// Updates the overlays of the atom +/** + * Builds a list of overlays for the atom, this will not apply them. + * If you need to update overlays, use [update_icon(UPDATE_OVERLAYS)], + * This proc is intended to be overridden. + */ /atom/proc/update_overlays() - //SHOULD_CALL_PARENT(TRUE) + SHOULD_CALL_PARENT(TRUE) . = list() SEND_SIGNAL(src, COMSIG_ATOM_UPDATE_OVERLAYS, .) From 856caa4d26adf333cd3af89037a93b0deee48cd6 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Fri, 19 Nov 2021 00:27:25 +0000 Subject: [PATCH 4/8] Automatic changelog compile [ci skip] --- html/changelog.html | 15 +++++++++------ html/changelogs/.all_changelog.yml | 11 +++++++++++ html/changelogs/AutoChangeLog-pr-15320.yml | 9 --------- 3 files changed, 20 insertions(+), 15 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15320.yml diff --git a/html/changelog.html b/html/changelog.html index f5cbc6d6d9..3000c5caa5 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,15 @@ -->
+

19 November 2021

+

shellspeed1 updated:

+
    +
  • An experimental smart dart repeater rifle has been added by NT. It accepts both a large and small hypovials and uses it to fill the smart darts it synthesizes. It can hold 6 smart darts and makes a new one every 20 seconds. To research it, grab the medical weaponry node. tweak: Reagent gun renamed to reagent repeater
    • +
  • reagent repeater now holds 6 syringes.
    • +
  • Reagent repeater and smart dart repeater rifle start with 4 syringes instead of a full clip.
    • +
  • reagent repeater synthesizes a new syringe every 20 seconds. tweak: smart dart guns now use the syringe gun as an inhands sprite.
    • +
+

18 November 2021

DeltaFire15 updated:

    @@ -440,12 +449,6 @@
    • blacklisted morphine and haloperidol from dart guns
    - -

    17 September 2021

    -

    DeltaFire15 updated:

    -
      -
    • Techweb hidden nodes should now show less weird behavior.
      • -
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 9a13d16804..dbc59ca3f6 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -30272,3 +30272,14 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - rscadd: Spookystation Map - rscadd: Tree chopping/Grass cutting - rscadd: Vectorcars +2021-11-19: + shellspeed1: + - rscadd: 'An experimental smart dart repeater rifle has been added by NT. It accepts + both a large and small hypovials and uses it to fill the smart darts it synthesizes. + It can hold 6 smart darts and makes a new one every 20 seconds. To research + it, grab the medical weaponry node. tweak: Reagent gun renamed to reagent repeater' + - balance: reagent repeater now holds 6 syringes. + - balance: Reagent repeater and smart dart repeater rifle start with 4 syringes + instead of a full clip. + - balance: 'reagent repeater synthesizes a new syringe every 20 seconds. tweak: + smart dart guns now use the syringe gun as an inhands sprite.' diff --git a/html/changelogs/AutoChangeLog-pr-15320.yml b/html/changelogs/AutoChangeLog-pr-15320.yml deleted file mode 100644 index 5c0888aa00..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15320.yml +++ /dev/null @@ -1,9 +0,0 @@ -author: "shellspeed1" -delete-after: True -changes: - - rscadd: "An experimental smart dart repeater rifle has been added by NT. It accepts both a large and small hypovials and uses it to fill the smart darts it synthesizes. It can hold 6 smart darts and makes a new one every 20 seconds. To research it, grab the medical weaponry node. -tweak: Reagent gun renamed to reagent repeater" - - balance: "reagent repeater now holds 6 syringes." - - balance: "Reagent repeater and smart dart repeater rifle start with 4 syringes instead of a full clip." - - balance: "reagent repeater synthesizes a new syringe every 20 seconds. -tweak: smart dart guns now use the syringe gun as an inhands sprite." From 612087f7e563b3766e30d88812b264c9e4b5a3d1 Mon Sep 17 00:00:00 2001 From: buffyuwu <42501819+buffyuwu@users.noreply.github.com> Date: Thu, 18 Nov 2021 20:44:01 -0500 Subject: [PATCH 5/8] Update crayons.dm --- code/game/objects/items/crayons.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index aa48930d6c..03e029f1d0 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -738,6 +738,8 @@ if(isobj(target)) if(actually_paints) + if(istype(target, /obj/item/canvas)) //dont color our canvas neon green when im trying to paint please + return var/list/hsl = rgb2hsl(hex2num(copytext(paint_color,2,4)),hex2num(copytext(paint_color,4,6)),hex2num(copytext(paint_color,6,8))) var/static/whitelisted = typecacheof(list(/obj/structure/window, /obj/effect/decal/cleanable/crayon, From 438d965180495cfd992d26a48335db54a6993826 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 19 Nov 2021 17:02:52 -0600 Subject: [PATCH 6/8] Automatic changelog generation for PR #15384 [ci skip] --- html/changelogs/AutoChangeLog-pr-15384.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15384.yml diff --git a/html/changelogs/AutoChangeLog-pr-15384.yml b/html/changelogs/AutoChangeLog-pr-15384.yml new file mode 100644 index 0000000000..86427afdb1 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15384.yml @@ -0,0 +1,5 @@ +author: "SandPoot" +delete-after: True +changes: + - bugfix: "Acid will disappear when not existant." + - code_imp: "Updates component Destroy code, might result in less component related runtimes." From 07567dba891aac805bac474f464aafa057ed584a Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sat, 20 Nov 2021 00:26:56 +0000 Subject: [PATCH 7/8] Automatic changelog compile [ci skip] --- html/changelog.html | 13 +++++++------ html/changelogs/.all_changelog.yml | 5 +++++ html/changelogs/AutoChangeLog-pr-15384.yml | 5 ----- 3 files changed, 12 insertions(+), 11 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15384.yml diff --git a/html/changelog.html b/html/changelog.html index 3000c5caa5..4bd9beeab3 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,13 @@ -->
+

20 November 2021

+

SandPoot updated:

+
    +
  • Acid will disappear when not existant.
    • +
  • Updates component Destroy code, might result in less component related runtimes.
    • +
+

19 November 2021

shellspeed1 updated:

    @@ -443,12 +450,6 @@
  • all medipens get inhands
  • some more brainhurt lines
- -

18 September 2021

-

kiwedespars updated:

-
    -
  • blacklisted morphine and haloperidol from dart guns
    • -
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index dbc59ca3f6..7b776548de 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -30283,3 +30283,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. instead of a full clip. - balance: 'reagent repeater synthesizes a new syringe every 20 seconds. tweak: smart dart guns now use the syringe gun as an inhands sprite.' +2021-11-20: + SandPoot: + - bugfix: Acid will disappear when not existant. + - code_imp: Updates component Destroy code, might result in less component related + runtimes. diff --git a/html/changelogs/AutoChangeLog-pr-15384.yml b/html/changelogs/AutoChangeLog-pr-15384.yml deleted file mode 100644 index 86427afdb1..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15384.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "SandPoot" -delete-after: True -changes: - - bugfix: "Acid will disappear when not existant." - - code_imp: "Updates component Destroy code, might result in less component related runtimes." From 76c39bc6a4a359faad7437149e9df21f5aad0dd2 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 19 Nov 2021 21:35:59 -0600 Subject: [PATCH 8/8] Automatic changelog generation for PR #15383 [ci skip] --- html/changelogs/AutoChangeLog-pr-15383.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15383.yml diff --git a/html/changelogs/AutoChangeLog-pr-15383.yml b/html/changelogs/AutoChangeLog-pr-15383.yml new file mode 100644 index 0000000000..946fd3283d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15383.yml @@ -0,0 +1,4 @@ +author: "MrJWhit" +delete-after: True +changes: + - balance: "Reduces the HP from loot piles to 100, from 300."