Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Citadel-Station-13-master

2021-02-11 23:41:28 +01:00
parent 53ea83ba45 456219003c
commit ccab5583a5
13 changed files with 125 additions and 29 deletions
--- 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" = (
--- 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" = (
--- 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" = (
--- 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
@@ -213,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")
@@ -264,26 +264,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)))
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -74,6 +74,39 @@
 				<li class="rscdel">Comments out power sink objective.</li>
 			</ul>
 			<h3 class="author">timothyteakettle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">persistent blood should stop being invisible and alt clicking it shouldn't return the entire spritesheet</li>
+				<li class="admin">pickpocketing is now logged using log_combat</li>
+			</ul>
+			<h3 class="author">zeroisthebiggay updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">the aesthetic sterile mask no longer hides faces so you can cosplay egirls and keep flavortexts</li>
+			</ul>
+
+			<h2 class="date">09 February 2021</h2>
+			<h3 class="author">Chiirno updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Charismatic Suit</li>
+				<li class="rscadd">Urban Jacket</li>
+			</ul>
+			<h3 class="author">DeltaFire15 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Added nanogel to the robodrobe.</li>
+			</ul>
+			<h3 class="author">Putnam3145 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Config to keep unreadied players from mode voting</li>
+			</ul>
+			<h3 class="author">dzahlus updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">fixes grenadelaunch.ogg being used where it shouldn't and makes mech weapons use correct sound</li>
+			</ul>
+			<h3 class="author">keronshb updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="balance">10 > 30 second for Warp Implant cooldown</li>
+				<li class="rscdel">Comments out power sink objective.</li>
+			</ul>
+			<h3 class="author">timothyteakettle updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="admin">pickpocketing is now logged using log_combat</li>
 				<li class="bugfix">persistent blood should stop being invisible and alt clicking it shouldn't return the entire spritesheet</li>
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -28368,6 +28368,51 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2021-02-03:
  Hatterhat:
  - bugfix: The green energy sabre's sprite now respects proper handedness.
+2021-02-05:
+  SmArtKar:
+  - rscadd: The orbit menu now has an Auto-Observe button! No more sifting through
+      the lame observe menu to snoop in people's backpacks! Also, orbit menu now refreshes.
+  - bugfix: KAs are no longer getting broken when fired by a circuit
+  keronshb:
+  - balance: Force and damage > 15 from 18/25
+  - balance: Knockdown put down to 5 from 30
+  - balance: Armor pen down to 10 from 100.
+  - balance: Makes cell chargers, charge faster.
+  raspy-on-osu:
+  - bugfix: alien royals can no longer ventcrawl
+  shellspeed1:
+  - balance: There actually needs to be people for zombies to happen now.
+  timothyteakettle:
+  - rscadd: dwarf facial hair is no longer randomised
+2021-02-07:
+  Thalpy:
+  - refactor: 'Dispenser: Adds the ability to store a small amount of reagents in
+      the machine itself for dispensing. Reacting recipies cannot be stored. Size
+      of storage increases with bin size.'
+  - refactor: 'Dispenser: Allows reagents to be color coded by pH'
+  - refactor: 'Dispenser: Each reagent displays it''s pH on hover'
+  - refactor: 'Dispenser: Allows the user to toggle between buttons and a radial dial'
+  - refactor: 'Dispenser: When the dispencer is upgraded it can dispense 5/3/2/1 volumes
+      based on rating refactor: Dispenser: as it was before. This does not break recorded
+      recipes.'
+  - tweak: Adds a round function to some numbers so they're not huge
+  - tweak: The Chem master can now get purity for all reagents when analysed
+  - bugfix: Synthissue fixes
+  - tweak: buffers now have a strong and weak variant. Weak can be dispensed, and
+      strong can be created. Strong buffers are 6x more effective.
+  - bugfix: Some buffer pH edge calculation fixes
+  TyrianTyrell:
+  - rscadd: added a signed language, that can't be used over the radio but can be
+      used if you're mute. also added the multilingual trait.
+  - imageadd: hopefully added an icon for the signed language.
+  - code_imp: changed how some traits function slightly.
+  dzahlus:
+  - tweak: tweaked a few sounds
+  - soundadd: added a new weapon sounds
+  - sounddel: removed old weapon sounds
+  - code_imp: changed some sound related code
+  silicons:
+  - rscadd: syndicate ablative armwraps have been added.
 2021-02-09:
  Chiirno:
  - rscadd: Adds clown waddle to clown shoes. Enhanced Clown Waddle Dampeners can
@@ -28394,9 +28439,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
  - balance: 10 > 30 second for Warp Implant cooldown
  - rscdel: Comments out power sink objective.
  timothyteakettle:
-  - admin: pickpocketing is now logged using log_combat
  - bugfix: persistent blood should stop being invisible and alt clicking it shouldn't
      return the entire spritesheet
+  - admin: pickpocketing is now logged using log_combat
  zeroisthebiggay:
  - tweak: the aesthetic sterile mask no longer hides faces so you can cosplay egirls
      and keep flavortexts
--- a/html/changelogs/AutoChangeLog-pr-14206.yml
+++ b/html/changelogs/AutoChangeLog-pr-14206.yml
@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes: 
+  - balance: "Voice of God - sleep removed, stun staggers instead, knockdown is faster but does not do stamina damage, vomit is faster but doesn't stun"
--- a/html/changelogs/AutoChangeLog-pr-14218.yml
+++ b/html/changelogs/AutoChangeLog-pr-14218.yml
@@ -0,0 +1,4 @@
+author: "MrJWhit"
+delete-after: True
+changes: 
+  - tweak: "Gives boxstation vault door actual vault door access"
--- a/html/changelogs/AutoChangeLog-pr-14220.yml
+++ b/html/changelogs/AutoChangeLog-pr-14220.yml
@@ -0,0 +1,4 @@
+author: "Hatterhat"
+delete-after: True
+changes: 
+  - balance: "The ATVs on SnowCabin.dmm have been replaced with snowmobiles."
--- a/html/changelogs/AutoChangeLog-pr-14221.yml
+++ b/html/changelogs/AutoChangeLog-pr-14221.yml
@@ -0,0 +1,4 @@
+author: "MrJWhit"
+delete-after: True
+changes: 
+  - tweak: "Random deltastation fixes."
--- 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:*"
  }
--- a/tgui/public/tgui-common.chunk.js
+++ b/tgui/public/tgui-common.chunk.js
--- a/tgui/yarn.lock
+++ b/tgui/yarn.lock
@@ -5281,12 +5281,12 @@ fsevents@~2.1.2:
  languageName: node
  linkType: hard

-"marked@npm:^1.1.0":
-  version: 1.1.1
-  resolution: "marked@npm:1.1.1"
+"marked@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "marked@npm:2.0.0"
  bin:
    marked: bin/marked
-  checksum: 4fb077a99ca6a6a4f389bbe2f27620509a332da6fac019560fc25e0e9636226cc86420ddbcfc6e8956920cbca68d64cd11d03954d22123a95ffc63c2e6c4e0ae
+  checksum: 5b3b13b9b68beb126284d04fedeacee37c847618c091cf575eaa32746cf0af2d65b1ed25b2cc9269b0cdffa2e8dc5aa2daacff81ead68c59a7a6a1656f1d28ed
  languageName: node
  linkType: hard

@@ -8145,7 +8145,7 @@ fsevents@~2.1.2:
    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:*"
  languageName: unknown