From 0895789217e3aaa63785fd400a20edc99f1b42b9 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Mon, 8 Feb 2021 03:06:54 -0700 Subject: [PATCH 01/12] Update vocal_cords.dm --- code/modules/surgery/organs/vocal_cords.dm | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index 47b504c86e..444d0ffb17 100644 --- a/code/modules/surgery/organs/vocal_cords.dm +++ b/code/modules/surgery/organs/vocal_cords.dm @@ -1,4 +1,5 @@ #define COOLDOWN_STUN 1200 +#define COOLDOWN_KNOCKDOWN 600 #define COOLDOWN_DAMAGE 600 #define COOLDOWN_MEME 300 #define COOLDOWN_NONE 100 @@ -264,26 +265,20 @@ cooldown = COOLDOWN_STUN for(var/V in listeners) var/mob/living/L = V - L.Stun(60 * power_multiplier) + L.Stagger(60 * power_multiplier) //KNOCKDOWN else if(findtext(message, knockdown_words)) - cooldown = COOLDOWN_STUN + cooldown = COOLDOWN_KNOCKDOWN for(var/V in listeners) var/mob/living/L = V - L.DefaultCombatKnockdown(60 * power_multiplier) - - //SLEEP - else if((findtext(message, sleep_words))) - cooldown = COOLDOWN_STUN - for(var/mob/living/carbon/C in listeners) - C.Sleeping(40 * power_multiplier) + L.DefaultCombatKnockdown() //VOMIT else if((findtext(message, vomit_words))) - cooldown = COOLDOWN_STUN + cooldown = COOLDOWN_DAMAGE for(var/mob/living/carbon/C in listeners) - C.vomit(10 * power_multiplier, distance = power_multiplier) + C.vomit(10 * power_multiplier, distance = power_multiplier, stun = FALSE) //SILENCE else if((findtext(message, silence_words))) From b1ce9a961899a56bbec87bc27645df75c121cdf9 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Mon, 8 Feb 2021 03:09:19 -0700 Subject: [PATCH 02/12] Update vocal_cords.dm --- code/modules/surgery/organs/vocal_cords.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index 444d0ffb17..064abf1700 100644 --- a/code/modules/surgery/organs/vocal_cords.dm +++ b/code/modules/surgery/organs/vocal_cords.dm @@ -214,7 +214,6 @@ var/static/regex/stun_words = regex("stop|wait|stand still|hold on|halt") var/static/regex/knockdown_words = regex("drop|fall|trip|knockdown") - var/static/regex/sleep_words = regex("sleep|slumber|rest") var/static/regex/vomit_words = regex("vomit|throw up|sick") var/static/regex/silence_words = regex("shut up|silence|be silent|ssh|quiet|hush") var/static/regex/hallucinate_words = regex("see the truth|hallucinate") From 94b507dbf3986ca094015ca4bdf9f4c45468eb68 Mon Sep 17 00:00:00 2001 From: MrJWhit <48370570+MrJWhit@users.noreply.github.com> Date: Tue, 9 Feb 2021 16:31:58 -0500 Subject: [PATCH 03/12] Update BoxStation.dmm --- _maps/map_files/BoxStation/BoxStation.dmm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 82cad53845..f7245ef535 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -58669,8 +58669,11 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/vault, /obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/vault{ + name = "Vault Door"; + req_access_txt = "53" + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) "puh" = ( @@ -61075,7 +61078,6 @@ /area/science/circuit) "uOJ" = ( /obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/door/airlock/vault, /obj/structure/cable{ icon_state = "1-2" }, @@ -61089,6 +61091,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/door/airlock/vault{ + name = "Vault Door"; + req_access_txt = "53" + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) "uQR" = ( From fc88f27c8577f76bcaa4d5a351f95e246a232179 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Tue, 9 Feb 2021 22:40:00 -0600 Subject: [PATCH 04/12] what atvs? --- _maps/RandomZLevels/away_mission/SnowCabin.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_maps/RandomZLevels/away_mission/SnowCabin.dmm b/_maps/RandomZLevels/away_mission/SnowCabin.dmm index fbb83899fd..dda382c4b7 100644 --- a/_maps/RandomZLevels/away_mission/SnowCabin.dmm +++ b/_maps/RandomZLevels/away_mission/SnowCabin.dmm @@ -881,7 +881,7 @@ /turf/open/floor/plating, /area/awaymission/cabin) "cT" = ( -/obj/vehicle/ridden/atv, +/obj/vehicle/ridden/atv/snowmobile, /turf/open/floor/plating{ icon_state = "platingdmg3" }, @@ -893,7 +893,7 @@ /turf/open/floor/plating, /area/awaymission/cabin) "cV" = ( -/obj/vehicle/ridden/atv, +/obj/vehicle/ridden/atv/snowmobile, /turf/open/floor/plating, /area/awaymission/cabin) "cW" = ( From dba9fd7134b3669a5d0a09d1dd9407ec815e72fd Mon Sep 17 00:00:00 2001 From: MrJWhit <48370570+MrJWhit@users.noreply.github.com> Date: Wed, 10 Feb 2021 00:04:44 -0500 Subject: [PATCH 05/12] Update DeltaStation2.dmm --- _maps/map_files/Deltastation/DeltaStation2.dmm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 368b85938c..4e2b009c79 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -47138,13 +47138,9 @@ /turf/open/floor/plasteel, /area/engine/gravity_generator) "bEx" = ( -/obj/structure/closet/radiation, /obj/machinery/light/small{ dir = 1 }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 26 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -48383,7 +48379,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/light/small, +/obj/structure/extinguisher_cabinet{ + pixel_x = 26 + }, +/obj/structure/closet/radiation, /turf/open/floor/plasteel, /area/engine/gravity_generator) "bGg" = ( @@ -49543,6 +49542,9 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, +/obj/machinery/light/small{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/gravity_generator) "bHV" = ( From e5562f6cb66d0f4226a8702753fbf0cc1ecce4dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Feb 2021 09:12:51 +0000 Subject: [PATCH 06/12] Bump marked from 1.1.1 to 2.0.0 in /tgui Bumps [marked](https://github.com/markedjs/marked) from 1.1.1 to 2.0.0. - [Release notes](https://github.com/markedjs/marked/releases) - [Changelog](https://github.com/markedjs/marked/blob/master/release.config.js) - [Commits](https://github.com/markedjs/marked/compare/v1.1.1...v2.0.0) Signed-off-by: dependabot[bot] --- tgui/packages/tgui/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgui/packages/tgui/package.json b/tgui/packages/tgui/package.json index 15e2974f9b..3b0e881bed 100644 --- a/tgui/packages/tgui/package.json +++ b/tgui/packages/tgui/package.json @@ -7,7 +7,7 @@ "dompurify": "^2.0.12", "inferno": "^7.4.2", "inferno-vnode-flags": "^7.4.2", - "marked": "^1.1.0", + "marked": "^2.0.0", "tgui-dev-server": "workspace:*", "tgui-polyfill": "workspace:*" } From cabcc9496987c72cf110e1b9b00ebf28d190eb2b Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 11 Feb 2021 00:14:09 +0000 Subject: [PATCH 07/12] Automatic changelog compile [ci skip] --- html/changelog.html | 33 ++++++++++++++++++++++ html/changelogs/.all_changelog.yml | 21 ++++++++++++++ html/changelogs/AutoChangeLog-pr-14202.yml | 4 --- html/changelogs/AutoChangeLog-pr-14203.yml | 4 --- html/changelogs/AutoChangeLog-pr-14204.yml | 4 --- html/changelogs/AutoChangeLog-pr-14205.yml | 4 --- html/changelogs/AutoChangeLog-pr-14208.yml | 4 --- html/changelogs/AutoChangeLog-pr-14211.yml | 4 --- html/changelogs/AutoChangeLog-pr-14214.yml | 5 ---- html/changelogs/AutoChangeLog-pr-14215.yml | 4 --- html/changelogs/AutoChangeLog-pr-14216.yml | 4 --- 11 files changed, 54 insertions(+), 37 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-14202.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14203.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14204.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14205.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14208.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14211.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14214.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14215.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14216.yml diff --git a/html/changelog.html b/html/changelog.html index b08f77d3f8..c9f6457fd5 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,39 @@ -->
+

11 February 2021

+

Adelphon updated:

+
    +
  • Charismatic Suit
    • +
  • Urban Jacket
    • +
+

DeltaFire15 updated:

+
    +
  • Added nanogel to the robodrobe.
    • +
+

Putnam3145 updated:

+
    +
  • Config to keep unreadied players from mode voting
    • +
+

dzahlus updated:

+
    +
  • fixes grenadelaunch.ogg being used where it shouldn't and makes mech weapons use correct sound
    • +
+

keronshb updated:

+
    +
  • 10 > 30 second for Warp Implant cooldown
    • +
  • Comments out power sink objective.
    • +
+

timothyteakettle updated:

+
    +
  • persistent blood should stop being invisible and alt clicking it shouldn't return the entire spritesheet
    • +
  • pickpocketing is now logged using log_combat
    • +
+

zeroisthebiggay updated:

+
    +
  • the aesthetic sterile mask no longer hides faces so you can cosplay egirls and keep flavortexts
    • +
+

09 February 2021

Chiirno updated: