From 203a1e52ee77eaa7d4efcee8bc504b0c69c8857b Mon Sep 17 00:00:00 2001 From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Date: Wed, 16 Nov 2022 03:37:46 +0100 Subject: [PATCH 01/18] Update mecha.dm (#16555) --- code/game/mecha/mecha.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 9207897e7f44..6df2da56e8d1 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -747,6 +747,9 @@ //Allows the Malf to scan a mech's status and loadout, helping it to decide if it is a worthy chariot. if(user.can_dominate_mechs) examine(user) //Get diagnostic information! + if(user.nuking) + to_chat(user, span_warning("Unable to assume control of mech while attempting to self-destruct the station.")) + return for(var/obj/item/mecha_parts/mecha_tracking/B in trackers) to_chat(user, span_danger("Warning: Tracking Beacon detected. Enter at your own risk. Beacon Data:")) to_chat(user, "[B.get_mecha_info()]") From eb778049b26fe71b38b49dba9ae5a0259d2f9f8e Mon Sep 17 00:00:00 2001 From: Yogbot-13 Date: Tue, 15 Nov 2022 21:37:47 -0500 Subject: [PATCH 02/18] Automatic changelog generation #16555 [ci skip] --- html/changelogs/AutoChangelog-pr-16555.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangelog-pr-16555.yml diff --git a/html/changelogs/AutoChangelog-pr-16555.yml b/html/changelogs/AutoChangelog-pr-16555.yml new file mode 100644 index 000000000000..f6a0fe5f0a10 --- /dev/null +++ b/html/changelogs/AutoChangelog-pr-16555.yml @@ -0,0 +1,4 @@ +author: "TheGamerdk" +delete-after: true +changes: + - rscdel: "Malf AI is no longer able to dominate mechs while doomsdaying" From 943054104923f1151259893c86b7499cfd5b3c2c Mon Sep 17 00:00:00 2001 From: Changelogs Date: Wed, 16 Nov 2022 06:12:45 +0000 Subject: [PATCH 03/18] Automatic changelog compile [ci skip] --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/AutoChangelog-pr-16555.yml | 4 ---- 3 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangelog-pr-16555.yml diff --git a/html/changelog.html b/html/changelog.html index 02e433a6d6c1..bc54886a6c2c 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -57,6 +57,12 @@ -->
+

16 November 2022

+

TheGamerdk updated:

+
    +
  • Malf AI is no longer able to dominate mechs while doomsdaying
    • +
+

15 November 2022

Moltijoe updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 794a6b973c7b..39a4a95da531 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -35442,3 +35442,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2022-11-15: Moltijoe: - bugfix: COMSIG_ITEM_PREDROPPED is only called if there is an item to drop +2022-11-16: + TheGamerdk: + - rscdel: Malf AI is no longer able to dominate mechs while doomsdaying diff --git a/html/changelogs/AutoChangelog-pr-16555.yml b/html/changelogs/AutoChangelog-pr-16555.yml deleted file mode 100644 index f6a0fe5f0a10..000000000000 --- a/html/changelogs/AutoChangelog-pr-16555.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "TheGamerdk" -delete-after: true -changes: - - rscdel: "Malf AI is no longer able to dominate mechs while doomsdaying" From 12ed7f845a7641db5ea1ff9359afa28bfbc27291 Mon Sep 17 00:00:00 2001 From: Mqiib <43766432+Mqiib@users.noreply.github.com> Date: Wed, 16 Nov 2022 06:46:06 -0500 Subject: [PATCH 04/18] Revert "Increases throw force & knockdown of most shuttles (#16375)" (#16503) This reverts commit 30164f36ae484696ef6ee4b16a2a502e35e92aec. --- code/datums/shuttles.dm | 6 +++--- code/modules/shuttle/arrivals.dm | 2 +- code/modules/shuttle/emergency.dm | 2 +- code/modules/shuttle/shuttle.dm | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index b899d52b1ca4..9a19818a3cab 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -241,7 +241,7 @@ description = "A hollowed out asteroid with engines strapped to it, the hollowing procedure makes it very difficult to hijack but is very expensive. Due to its size and difficulty in steering it, this shuttle may damage the docking area." admin_notes = "This shuttle will likely crush escape, killing anyone there." credit_cost = 15000 - movement_force = list("KNOCKDOWN" = 6, "THROW" = 10) + movement_force = list("KNOCKDOWN" = 3, "THROW" = 2) emag_buy = TRUE /datum/map_template/shuttle/emergency/luxury @@ -327,7 +327,7 @@ credit_cost = -1000 description = "Due to a lack of functional emergency shuttles, we bought this second hand from a scrapyard and pressed it into service. Please do not lean too heavily on the exterior windows, they are fragile." admin_notes = "An abomination with no functional medbay, sections missing, and some very fragile windows. Surprisingly airtight." - movement_force = list("KNOCKDOWN" = 6, "THROW" = 20) + movement_force = list("KNOCKDOWN" = 3, "THROW" = 2) emag_buy = TRUE /datum/map_template/shuttle/emergency/narnar @@ -375,7 +375,7 @@ admin_notes = "Tiny, with a single airlock and wooden walls. What could go wrong?" credit_cost = 7500 emag_buy = TRUE - movement_force = list("KNOCKDOWN" = 6, "THROW" = 20) + movement_force = list("KNOCKDOWN" = 3, "THROW" = 2) /datum/map_template/shuttle/emergency/goon suffix = "goon" diff --git a/code/modules/shuttle/arrivals.dm b/code/modules/shuttle/arrivals.dm index 1c0722a694d4..ab5fa6e699cd 100644 --- a/code/modules/shuttle/arrivals.dm +++ b/code/modules/shuttle/arrivals.dm @@ -11,7 +11,7 @@ callTime = INFINITY ignitionTime = 50 - movement_force = list("KNOCKDOWN" = 6, "THROW" = 10) + movement_force = list("KNOCKDOWN" = 3, "THROW" = 0) var/sound_played var/damaged //too damaged to undock? diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index dc936bfcb7ce..f6f670d66f74 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -167,7 +167,7 @@ log_game("[key_name(user)] has emagged the emergency shuttle in [COORD(src)] [time] seconds before launch.") ENABLE_BITFIELD(obj_flags, EMAGGED) - SSshuttle.emergency.movement_force = list("KNOCKDOWN" = 60, "THROW" = 40)//YOUR PUNY SEATBELTS can SAVE YOU NOW, MORTAL + SSshuttle.emergency.movement_force = list("KNOCKDOWN" = 60, "THROW" = 20)//YOUR PUNY SEATBELTS can SAVE YOU NOW, MORTAL var/datum/species/S = new for(var/i in 1 to 10) // the shuttle system doesn't know who these people are, but they diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index c5cc708ac568..16b23fd70cc4 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -283,7 +283,7 @@ var/launch_status = NOLAUNCH ///Whether or not you want your ship to knock people down, and also whether it will throw them several tiles upon launching. - var/list/movement_force = list("KNOCKDOWN" = 6, "THROW" = 10) + var/list/movement_force = list("KNOCKDOWN" = 3, "THROW" = 0) var/list/ripples = list() var/engine_coeff = 1 From 72f9d9cca0c6690d56422f46bf04eff807af1263 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 17 Nov 2022 06:12:05 +0000 Subject: [PATCH 05/18] Automatic changelog compile [ci skip] --- html/changelog.html | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/html/changelog.html b/html/changelog.html index bc54886a6c2c..d85bb4446e25 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -2521,28 +2521,6 @@
    • Radiation works again
    - -

    18 August 2022

    -

    Identification updated:

    -
      -
    • Fixes shark hoodie object sprite.
      • -
    -

    SuperSlayer updated:

    -
      -
    • Converted some swarmer messages to balloon alerts
      • -
    -

    TheRyeGuyWhoWillNowDie updated:

    -
      -
    • unique shark "hoodie" (jumpsuit accessory) for donator alvcyktor
      • -
    -

    Xantam-13 updated:

    -
      -
    • Expands Interrogation by 1 more tile into space to give it a little more space back
      • -
    -

    adamsong updated:

    -
      -
    • fixed donor verbs not being granted to donors on login
      • -
GoonStation 13 Development Team From 46b0edcfaa95acf187345380ca228fc93b828645 Mon Sep 17 00:00:00 2001 From: Theos Date: Thu, 17 Nov 2022 05:30:50 -0500 Subject: [PATCH 06/18] Update gun.dm (#16511) --- code/modules/projectiles/gun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 54ea42fa6430..495cb4e38830 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -228,7 +228,7 @@ return if(target == user && user.zone_selected != BODY_ZONE_PRECISE_MOUTH) //so we can't shoot ourselves (unless mouth selected) return - if(ismob(target) && user.a_intent == INTENT_GRAB && !user.mind.martial_art)//remove gunpoint from ipc martial art, it's slow + if(ismob(target) && user.a_intent == INTENT_GRAB && !istype(user.mind.martial_art, /datum/martial_art/ultra_violence))//remove gunpoint from ipc martial art, it's slow for(var/datum/component/gunpoint/G in user.GetComponents(/datum/component/gunpoint)) if(G && G.weapon == src) //spam check return From e7f71bd081e9f52d51513c7e3082cc4750ae74a8 Mon Sep 17 00:00:00 2001 From: Yogbot-13 Date: Thu, 17 Nov 2022 05:30:53 -0500 Subject: [PATCH 07/18] Automatic changelog generation #16511 [ci skip] --- html/changelogs/AutoChangelog-pr-16511.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangelog-pr-16511.yml diff --git a/html/changelogs/AutoChangelog-pr-16511.yml b/html/changelogs/AutoChangelog-pr-16511.yml new file mode 100644 index 000000000000..13f636db3b6f --- /dev/null +++ b/html/changelogs/AutoChangelog-pr-16511.yml @@ -0,0 +1,4 @@ +author: "SomeguyManperson" +delete-after: true +changes: + - bugfix: "spacemen have remembered how to point guns at people without shooting them. They are still quite unlikely to point guns at people without shooting them." From 88588dc5a885b3d3c1e44282fe3921a381a719ee Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 17 Nov 2022 14:09:21 +0000 Subject: [PATCH 08/18] Automatic changelog compile [ci skip] --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 5 +++++ html/changelogs/AutoChangelog-pr-16511.yml | 4 ---- 3 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangelog-pr-16511.yml diff --git a/html/changelog.html b/html/changelog.html index d85bb4446e25..5c3cafc79d48 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -57,6 +57,12 @@ -->
+

17 November 2022

+

SomeguyManperson updated:

+
    +
  • spacemen have remembered how to point guns at people without shooting them. They are still quite unlikely to point guns at people without shooting them.
    • +
+

16 November 2022

TheGamerdk updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 39a4a95da531..d1d3f5bedc2c 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -35445,3 +35445,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2022-11-16: TheGamerdk: - rscdel: Malf AI is no longer able to dominate mechs while doomsdaying +2022-11-17: + SomeguyManperson: + - bugfix: spacemen have remembered how to point guns at people without shooting + them. They are still quite unlikely to point guns at people without shooting + them. diff --git a/html/changelogs/AutoChangelog-pr-16511.yml b/html/changelogs/AutoChangelog-pr-16511.yml deleted file mode 100644 index 13f636db3b6f..000000000000 --- a/html/changelogs/AutoChangelog-pr-16511.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SomeguyManperson" -delete-after: true -changes: - - bugfix: "spacemen have remembered how to point guns at people without shooting them. They are still quite unlikely to point guns at people without shooting them." From 8ffff556f3f8db780c4c45e9c203879a69f578cf Mon Sep 17 00:00:00 2001 From: N3D6 <71906740+N3D6@users.noreply.github.com> Date: Thu, 17 Nov 2022 23:13:09 -0500 Subject: [PATCH 09/18] who did this (#16589) --- _maps/map_files/Yogsmeta/Yogsmeta.dmm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/_maps/map_files/Yogsmeta/Yogsmeta.dmm b/_maps/map_files/Yogsmeta/Yogsmeta.dmm index ec0d534de654..22073eab083e 100644 --- a/_maps/map_files/Yogsmeta/Yogsmeta.dmm +++ b/_maps/map_files/Yogsmeta/Yogsmeta.dmm @@ -22738,11 +22738,6 @@ /obj/effect/spawner/structure/window/reinforced/shutter, /turf/open/floor/plating, /area/hallway/primary/central) -"bcv" = ( -/obj/structure/chair/office/light, -/obj/effect/landmark/start/scientist, -/turf/open/floor/plasteel/dark, -/area/science/server) "bcz" = ( /obj/machinery/camera{ c_tag = "Arrivals - Station Entrance"; @@ -64955,6 +64950,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/hallway/secondary/entry) +"ngA" = ( +/obj/structure/chair/office/light, +/turf/open/floor/plasteel/dark, +/area/science/server) "ngF" = ( /obj/structure/cable{ icon_state = "2-4" @@ -113531,7 +113530,7 @@ cEr cEr cIg cIb -bcv +ngA cJS cIg bGP From 99e2c0d2d85cc6e86b49c8d45cfa76bbc3063750 Mon Sep 17 00:00:00 2001 From: Yogbot-13 Date: Thu, 17 Nov 2022 23:13:11 -0500 Subject: [PATCH 10/18] Automatic changelog generation #16589 [ci skip] --- html/changelogs/AutoChangelog-pr-16589.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangelog-pr-16589.yml diff --git a/html/changelogs/AutoChangelog-pr-16589.yml b/html/changelogs/AutoChangelog-pr-16589.yml new file mode 100644 index 000000000000..8d6ac46f4799 --- /dev/null +++ b/html/changelogs/AutoChangelog-pr-16589.yml @@ -0,0 +1,4 @@ +author: "N3D6" +delete-after: true +changes: + - mapping: "removes a scientist spawn in meta server room" From 43515243dfc0fd2e619bba30b49cc16505b4507d Mon Sep 17 00:00:00 2001 From: N3D6 <71906740+N3D6@users.noreply.github.com> Date: Thu, 17 Nov 2022 23:14:02 -0500 Subject: [PATCH 11/18] [Meta] Adds a third pump and a space injector to toxins (#16558) * does your mother * adds that too * oops --- _maps/map_files/Yogsmeta/Yogsmeta.dmm | 222 +++++++++++++++----------- 1 file changed, 127 insertions(+), 95 deletions(-) diff --git a/_maps/map_files/Yogsmeta/Yogsmeta.dmm b/_maps/map_files/Yogsmeta/Yogsmeta.dmm index 22073eab083e..a763e5957a0e 100644 --- a/_maps/map_files/Yogsmeta/Yogsmeta.dmm +++ b/_maps/map_files/Yogsmeta/Yogsmeta.dmm @@ -2773,6 +2773,10 @@ "ahc" = ( /turf/open/floor/plasteel, /area/security/range) +"ahf" = ( +/obj/machinery/atmospherics/pipe/simple/general/visible, +/turf/closed/wall/r_wall, +/area/science/mixing/chamber) "ahg" = ( /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) @@ -42577,17 +42581,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"cum" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel, -/area/science/robotics/lab) "cun" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -42610,18 +42603,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"cuB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/turf/open/floor/plasteel, -/area/science/robotics/lab) "cuD" = ( /obj/structure/reagent_dispensers/watertank, /obj/item/storage/box/lights/mixed, @@ -43951,16 +43932,6 @@ }, /turf/open/floor/plasteel, /area/science/mixing) -"cyD" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/science/mixing) "cyE" = ( /obj/machinery/camera{ c_tag = "Toxins - Lab"; @@ -43991,19 +43962,6 @@ /obj/machinery/meter, /turf/open/floor/plasteel, /area/science/mixing) -"cyH" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/science/mixing) "cyI" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -44530,14 +44488,6 @@ icon_state = "panelscorched" }, /area/maintenance/port/aft) -"cAG" = ( -/obj/structure/window/reinforced, -/obj/machinery/portable_atmospherics/scrubber, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/plasteel, -/area/science/mixing) "cAH" = ( /obj/structure/sign/warning/biohazard, /turf/closed/wall/r_wall, @@ -44799,35 +44749,6 @@ "cCs" = ( /turf/template_noop, /area/template_noop) -"cCt" = ( -/obj/structure/closet/bombcloset, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/science/mixing) -"cCu" = ( -/obj/item/assembly/signaler{ - pixel_y = 8 - }, -/obj/item/assembly/signaler{ - pixel_x = -8; - pixel_y = 5 - }, -/obj/item/assembly/signaler{ - pixel_x = 6; - pixel_y = 5 - }, -/obj/item/assembly/signaler{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/science/mixing) "cCv" = ( /obj/item/transfer_valve{ pixel_x = -5 @@ -54082,6 +54003,18 @@ /obj/machinery/atmospherics/pipe/simple/yellow/visible, /turf/open/floor/plasteel/dark, /area/engine/atmos_distro) +"fTc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/science/robotics/lab) "fTh" = ( /obj/structure/lattice, /obj/structure/window/reinforced, @@ -55419,6 +55352,12 @@ /obj/effect/turf_decal/trimline/red/filled/corner, /turf/open/floor/plasteel, /area/engine/foyer) +"gNB" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/science/mixing) "gOO" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -57130,6 +57069,14 @@ }, /turf/open/floor/plasteel/white, /area/medical/storage) +"hZS" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input{ + dir = 1; + name = "toxins space injector" + }, +/turf/open/space, +/area/science/mixing/chamber) "ibb" = ( /obj/effect/spawner/lootdrop/maintenance{ lootcount = 3; @@ -57389,6 +57336,13 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) +"ike" = ( +/obj/effect/turf_decal/stripes{ + dir = 10 + }, +/obj/machinery/atmospherics/components/binary/pump/on, +/turf/open/floor/plasteel/white, +/area/science/mixing) "ikT" = ( /obj/machinery/dna_scannernew, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -59813,6 +59767,11 @@ }, /turf/open/floor/plasteel/white, /area/medical/virology) +"jPA" = ( +/obj/structure/closet/bombcloset, +/obj/effect/turf_decal/stripes, +/turf/open/floor/plasteel/white, +/area/science/mixing) "jPG" = ( /obj/structure/closet/radiation, /turf/open/floor/plasteel/dark, @@ -61504,6 +61463,15 @@ }, /turf/open/floor/plasteel/dark, /area/aisat) +"kTi" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 6 + }, +/turf/open/floor/plasteel/white, +/area/science/mixing) "kTm" = ( /obj/structure/window/reinforced{ dir = 1 @@ -62032,6 +62000,19 @@ dir = 1 }, /area/crew_quarters/kitchen) +"lhm" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/plasteel, +/area/science/mixing) "lij" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -68284,6 +68265,28 @@ /obj/machinery/chem_heater, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"psi" = ( +/obj/item/assembly/signaler{ + pixel_y = 8 + }, +/obj/item/assembly/signaler{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/item/assembly/signaler{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/item/assembly/signaler{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/science/mixing) "psG" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 @@ -71803,6 +71806,16 @@ }, /turf/open/floor/plasteel/white, /area/medical/genetics) +"rHC" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/scrubber, +/turf/open/floor/plasteel, +/area/science/mixing) "rHE" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -73306,6 +73319,17 @@ }, /turf/open/floor/plasteel, /area/security/brig) +"sIp" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plasteel, +/area/science/robotics/lab) "sJK" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -78920,6 +78944,14 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) +"wuv" = ( +/obj/structure/window/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/portable_atmospherics/pump, +/turf/open/floor/plasteel, +/area/science/mixing) "wuF" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/orange/visible, @@ -111472,8 +111504,8 @@ nHk bPe bPF cta -cum -cuB +sIp +fTc cFh cFh cKH @@ -113265,10 +113297,10 @@ crQ cyz cFr crA -cFr -cCt -wQA -cEq +kTi +ike +ahf +hZS cEq cEq cIg @@ -113522,8 +113554,8 @@ crQ cyA cBs crB -cBs -cCt +gNB +jPA wQA cEr cEr @@ -113780,7 +113812,7 @@ crj fIp crB cBt -cCu +psi wQA cEs cFn @@ -114290,7 +114322,7 @@ cuQ cdJ cwT crQ -cyD +rHC mom crB cBv @@ -115318,7 +115350,7 @@ euk vsa rrV crR -cyH +lhm czx crG cBs @@ -115834,7 +115866,7 @@ cqD crR cyJ czB -cAG +wuv crO cCC cDp From 093467a56bcd299552f9d3a067f4dd1b844f16ab Mon Sep 17 00:00:00 2001 From: Yogbot-13 Date: Thu, 17 Nov 2022 23:14:04 -0500 Subject: [PATCH 12/18] Automatic changelog generation #16558 [ci skip] --- html/changelogs/AutoChangelog-pr-16558.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangelog-pr-16558.yml diff --git a/html/changelogs/AutoChangelog-pr-16558.yml b/html/changelogs/AutoChangelog-pr-16558.yml new file mode 100644 index 000000000000..46600f669049 --- /dev/null +++ b/html/changelogs/AutoChangelog-pr-16558.yml @@ -0,0 +1,5 @@ +author: "N3D6" +delete-after: true +changes: + - mapping: "removes a spare can in toxins in favor of a new air pump" + - mapping: "removes a bomb closet in favor of a space injector" From ce321ddfa844eb32e0fde85556b1d1faf41f94f1 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Fri, 18 Nov 2022 06:12:44 +0000 Subject: [PATCH 13/18] Automatic changelog compile [ci skip] --- html/changelog.html | 14 ++++++++------ html/changelogs/.all_changelog.yml | 5 +++++ html/changelogs/AutoChangelog-pr-16558.yml | 5 ----- html/changelogs/AutoChangelog-pr-16589.yml | 4 ---- 4 files changed, 13 insertions(+), 15 deletions(-) delete mode 100644 html/changelogs/AutoChangelog-pr-16558.yml delete mode 100644 html/changelogs/AutoChangelog-pr-16589.yml diff --git a/html/changelog.html b/html/changelog.html index 5c3cafc79d48..d69c624b9b05 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -57,6 +57,14 @@ -->
    +

    18 November 2022

    +

    N3D6 updated:

    +
      +
    • removes a scientist spawn in meta server room
      • +
    • removes a spare can in toxins in favor of a new air pump
      • +
    • removes a bomb closet in favor of a space injector
      • +
    +

    17 November 2022

    SomeguyManperson updated:

      @@ -2521,12 +2529,6 @@
    • significantly lowered secway integrity
    • catslugs can now wield spears
    - -

    19 August 2022

    -

    redmoogle updated:

    -
      -
    • Radiation works again
      • -
    GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index d1d3f5bedc2c..0219646d9333 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -35450,3 +35450,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - bugfix: spacemen have remembered how to point guns at people without shooting them. They are still quite unlikely to point guns at people without shooting them. +2022-11-18: + N3D6: + - mapping: removes a scientist spawn in meta server room + - mapping: removes a spare can in toxins in favor of a new air pump + - mapping: removes a bomb closet in favor of a space injector diff --git a/html/changelogs/AutoChangelog-pr-16558.yml b/html/changelogs/AutoChangelog-pr-16558.yml deleted file mode 100644 index 46600f669049..000000000000 --- a/html/changelogs/AutoChangelog-pr-16558.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "N3D6" -delete-after: true -changes: - - mapping: "removes a spare can in toxins in favor of a new air pump" - - mapping: "removes a bomb closet in favor of a space injector" diff --git a/html/changelogs/AutoChangelog-pr-16589.yml b/html/changelogs/AutoChangelog-pr-16589.yml deleted file mode 100644 index 8d6ac46f4799..000000000000 --- a/html/changelogs/AutoChangelog-pr-16589.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "N3D6" -delete-after: true -changes: - - mapping: "removes a scientist spawn in meta server room" From 1850aafb133538caa17ff8cf76f7b98669c3ef19 Mon Sep 17 00:00:00 2001 From: ynot01 Date: Fri, 18 Nov 2022 20:46:53 -0500 Subject: [PATCH 14/18] Update effects_smoke.dm (#16479) --- code/game/objects/effects/effect_system/effects_smoke.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm index e83f4da302a0..29b4a3fd7ff9 100644 --- a/code/game/objects/effects/effect_system/effects_smoke.dm +++ b/code/game/objects/effects/effect_system/effects_smoke.dm @@ -23,11 +23,17 @@ return if(frames == 0) frames = 1 //We will just assume that by 0 frames, the coder meant "during one frame". + var/lighting_updated = FALSE var/step = alpha / frames for(var/i = 0, i < frames, i++) alpha -= step if(alpha < 160) set_opacity(0) //if we were blocking view, we aren't now because we're fading out + if(!lighting_updated) // Only update lights around me once we have sufficiently faded, and only do it once + lighting_updated = TRUE + for(var/atom/L in view(15, src)) // Floodlights reach 15 tiles max, this should be sufficient + L.light?.force_update() + CHECK_TICK stoplag() /obj/effect/particle_effect/smoke/Initialize() From 9c2b41049ddb63c579abab00ccc8ef2e44d7f69b Mon Sep 17 00:00:00 2001 From: Yogbot-13 Date: Fri, 18 Nov 2022 20:46:55 -0500 Subject: [PATCH 15/18] Automatic changelog generation #16479 [ci skip] --- html/changelogs/AutoChangelog-pr-16479.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangelog-pr-16479.yml diff --git a/html/changelogs/AutoChangelog-pr-16479.yml b/html/changelogs/AutoChangelog-pr-16479.yml new file mode 100644 index 000000000000..de5ed4a098c2 --- /dev/null +++ b/html/changelogs/AutoChangelog-pr-16479.yml @@ -0,0 +1,4 @@ +author: "ynot01" +delete-after: true +changes: + - bugfix: "fixed smoke grenades breaking lights" From e0cedc8678ce4ca100126d814abb2e7b4f252c22 Mon Sep 17 00:00:00 2001 From: N3D6 <71906740+N3D6@users.noreply.github.com> Date: Fri, 18 Nov 2022 20:47:14 -0500 Subject: [PATCH 16/18] let there be light (#16603) --- .../MetaStation/meta_singulo_tesla.dmm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/_maps/RandomRuins/StationRuins/MetaStation/meta_singulo_tesla.dmm b/_maps/RandomRuins/StationRuins/MetaStation/meta_singulo_tesla.dmm index 29da6099f26e..4c787e5b7091 100644 --- a/_maps/RandomRuins/StationRuins/MetaStation/meta_singulo_tesla.dmm +++ b/_maps/RandomRuins/StationRuins/MetaStation/meta_singulo_tesla.dmm @@ -521,12 +521,6 @@ /obj/machinery/power/rad_collector, /turf/open/floor/plating/airless, /area/engine/engineering) -"zF" = ( -/obj/effect/turf_decal/stripes{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "zG" = ( /obj/structure/cable{ icon_state = "2-8" @@ -747,6 +741,15 @@ /obj/machinery/power/rad_collector, /turf/open/floor/plating, /area/engine/engineering) +"MJ" = ( +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engine/engineering) "MO" = ( /obj/structure/cable/orange{ icon_state = "1-8" @@ -1147,7 +1150,7 @@ SN (7,1,1) = {" iM sm -zF +MJ PS Xa nq @@ -1161,7 +1164,7 @@ vP DK Xa dU -zF +MJ di SN SN From 88bb81664a97887d7639b50b73f9e96c1745bfb8 Mon Sep 17 00:00:00 2001 From: Yogbot-13 Date: Fri, 18 Nov 2022 20:47:16 -0500 Subject: [PATCH 17/18] Automatic changelog generation #16603 [ci skip] --- html/changelogs/AutoChangelog-pr-16603.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangelog-pr-16603.yml diff --git a/html/changelogs/AutoChangelog-pr-16603.yml b/html/changelogs/AutoChangelog-pr-16603.yml new file mode 100644 index 000000000000..c23be9e2e4ed --- /dev/null +++ b/html/changelogs/AutoChangelog-pr-16603.yml @@ -0,0 +1,4 @@ +author: "N3D6" +delete-after: true +changes: + - mapping: "meta tesla now has a bit more light" From 49f5996110a35c54bd5911518391626ccbbc846e Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sat, 19 Nov 2022 06:11:42 +0000 Subject: [PATCH 18/18] Automatic changelog compile [ci skip] --- html/changelog.html | 146 ++------------------- html/changelogs/.all_changelog.yml | 5 + html/changelogs/AutoChangelog-pr-16479.yml | 4 - html/changelogs/AutoChangelog-pr-16603.yml | 4 - 4 files changed, 15 insertions(+), 144 deletions(-) delete mode 100644 html/changelogs/AutoChangelog-pr-16479.yml delete mode 100644 html/changelogs/AutoChangelog-pr-16603.yml diff --git a/html/changelog.html b/html/changelog.html index d69c624b9b05..68def186ce43 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -57,6 +57,16 @@ -->
    +

    19 November 2022

    +

    N3D6 updated:

    +
      +
    • meta tesla now has a bit more light
      • +
    +

    ynot01 updated:

    +
      +
    • fixed smoke grenades breaking lights
      • +
    +

    18 November 2022

    N3D6 updated:

      @@ -2393,142 +2403,6 @@
      • Observers can see buttons of people they're spying on again
      - -

      20 August 2022

      -

      Altoids updated:

      -
        -
      • Plasmamen and other bloodless races are no longer able to be bloodsuckers.
        • -
      -

      [LemonInTheDark](https://github.com/LemonInTheDark) ported by warface1234455 updated:

      -
        -
      • added item pickup drop animations
        • -
      -

      [jacklecroy](https://github.com/jacklecroy), [Kierany9](https://github.com/Kierany9) ported by warface1234455 updated:

      -
        -
      • Added new stamina hud indicator
        • -
      -

      GraveHat updated:

      -
        -
      • Removes a duplicate chest in the Ashwalker Meteorite
        • -
      • Vampire race is now Inaccessible to the crew
        • -
      • Halved the reagents found inside Meatpockets
        • -
      -

      Lovebird-Frungy updated:

      -
        -
      • Added a minimum population requirement (25) to the bloodsucker's dynamic rule-sets.
        • -
      -

      Mqiib updated:

      -
        -
      • Polysmorphs now have 10 wound armor naturally
        • -
      • Metallic hydrogen production now requires 10x as many mols to start
        • -
      • Metallic hydrogen production BZ consumption multiplied by 100
        • -
      • Metallic hydrogen production hydrogen consumption multiplied by ~160
        • -
      • Metallic hydrogen production bar generation rate quartered
        • -
      • Heat scaling changed to be logarithmic instead of linear
        • -
      -

      Skrem7 updated:

      -
        -
      • Spray paints the weird funky 9mm magazines for the funky NT SMG
        • -
      -

      SomeguyManperson updated:

      -
        -
      • gutlunch udders now die when they are killed
        • -
      -

      SuperSlayer updated:

      -
        -
      • Added IAA to dynamic
        • -
      • Removes some silicon related code from IAA
        • -
      • Renamed IAA gamemode files from double agents to internal affairs
        • -
      -

      TheGamerdk updated:

      -
        -
      • The singularity now has more of a tendency to chase fat people
        • -
      • You can now hit the tesla with a golf club to move it 2 tiles
        • -
      • Turnstiles now do not allow atmos
        • -
      -

      TheRyeGuyWhoWillNowDie updated:

      -
        -
      • bloodsucker trespass now removes restraints, like it's theoretically supposed to
        • -
      • the donksoft vendor will no longer mention "Valid hunters"
        • -
      • Guerrilla tape
        • -
      • Getting cloned no longer removes mood. There is no escape.
        • -
      • metallic hydrogen can no longer produce golem shells
        • -
      -

      VaelophisNyx updated:

      -
        -
      • hugboxed the mining base infirmary (I moved 2 lights and added 2 new ones)
        • -
      -

      adamsong updated:

      -
        -
      • TEG can no longer produce negative many power
        • -
      • sentient Ian becomes sentient Nars-Ian
        • -
      • fixed donor chat being read only for donators
        • -
      -

      isotope436 updated:

      -
        -
      • changed cost of GORLEX mantis blade in the uplink to 7Tc
        • -
      • GORLEX mantis blade kit replaced with a single mantis blade
        • -
      • GORLEX mantis blade uplink description altered to reflect giving you only a single blade.
        • -
      -

      redmoogle updated:

      -
        -
      • I'm giving all she's got captain takes 5% more effort
        • -
      • You now have 30 minutes to buy the BYOS
        • -
      • Refactors ghost buttons code to prevent ghost button separation
        • -
      • AI has more holopad icons
        • -
      • Deconstructing blast doors now use welder fuel
        • -
      • Welding blastdoors no longer gives you near infinite plasteel
        • -
      • Railings are no longer an unstoppable force
        • -
      • Added mini plasma cutter
        • -
      • Mining voucher now has mini plasma cutter kit
        • -
      • Fixes rad storm double rescinding
        • -
      • Rad collectors can make money now
        • -
      • Rad collectors make a descent amount of science now
        • -
      • Fixes resetting the position of buttons you dont own
        • -
      • Space Lube makes IPC go fast
        • -
      • You now start with a random amount of money
        • -
      • You can now change your face hair color and hair color at the mirror
        • -
      • Character select has a background now and is cycleable
        • -
      • Common Mineral Prospecting now needs 20 sheets
        • -
      • Plasma Extraction needs 20 sheets
        • -
      • Strange Material Prospecting needs 5 BS crystals now
        • -
      • Machines can no longer stack on top of each other
        • -
      -

      warface1234455 updated:

      -
        -
      • added a new disco ball that is printable from autolathe based on ethereal disco ball.
        • -
      • Added new sprite for portable disco ball
        • -
      • Bluespace harvester now generate more points faster
        • -
      • Product price will not increase when producing
        • -
      • no more weird rng
        • -
      • buffed blankbody melee attack and movement speed
        • -
      • converted multitool wire scan text box to examine block
        • -
      • converted geiger scan text box to examine block
        • -
      -

      ynot01 updated:

      -
        -
      • Security alert level now has a 10 second cooldown
        • -
      • Added several more shadow names
        • -
      • fixed a runtime that occured when trying to repair a mecha with no capacitor
        • -
      • added clarification that you cannot repair no-capacitor mechas
        • -
      • Added HypoMed to Box, Gax, and Meta stations, a hypospray vendor filled with hyposprays, upgrades, vials, and kits
        • -
      • Reduced the prices of some hypospray kits and removed the hypospray from them
        • -
      • Added hypospray quickload upgrade, purchasable from HypoMed
        • -
      • Added hypospray piercing upgrade, printable alongside piercing syringes once Advanced Biotechnology is researched
        • -
      • Removed hypospray equipment from NanoMed Plus
        • -
      • Removed styptic powder and silver sulfadiazine sprays from NanoMed Plus and NanoMed
        • -
      • Chemical dispenser energy display is now floored
        • -
      • fixed syndie lavaland chem dispensers not being emagged
        • -
      • Darkspawn/veils cuffing someone in darkspawn sleep will wake them up
        • -
      • fixed runes not being cleaned when they should be
        • -
      • Clarified golem antag convert text
        • -
      • Trespass will be heard at shorter distances as it is made quieter by leveling
        • -
      • you can now repair a secway with a welder
        • -
      • Akimbo mechanics have been reworked, rewarding precise clicking and punishing spam
        • -
      • fixed product ads not showing on vendors
        • -
      • significantly lowered secway integrity
        • -
      • catslugs can now wield spears
        • -
    GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 0219646d9333..994006032263 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -35455,3 +35455,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - mapping: removes a scientist spawn in meta server room - mapping: removes a spare can in toxins in favor of a new air pump - mapping: removes a bomb closet in favor of a space injector +2022-11-19: + N3D6: + - mapping: meta tesla now has a bit more light + ynot01: + - bugfix: fixed smoke grenades breaking lights diff --git a/html/changelogs/AutoChangelog-pr-16479.yml b/html/changelogs/AutoChangelog-pr-16479.yml deleted file mode 100644 index de5ed4a098c2..000000000000 --- a/html/changelogs/AutoChangelog-pr-16479.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "ynot01" -delete-after: true -changes: - - bugfix: "fixed smoke grenades breaking lights" diff --git a/html/changelogs/AutoChangelog-pr-16603.yml b/html/changelogs/AutoChangelog-pr-16603.yml deleted file mode 100644 index c23be9e2e4ed..000000000000 --- a/html/changelogs/AutoChangelog-pr-16603.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "N3D6" -delete-after: true -changes: - - mapping: "meta tesla now has a bit more light"