Merge remote-tracking branch 'upstream/master'

_maps/map_files/PubbyStation/PubbyStation.dmm

@@ -54548,8 +54548,8 @@
 	id = "xenoigniter";
 	luminosity = 2
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 8
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 4
 	},
 /turf/open/floor/engine,
 /area/science/xenobiology)
@@ -55484,7 +55484,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
 /turf/open/floor/plasteel/dark,
 /area/science/xenobiology)
 "hVx" = (
@@ -55906,6 +55906,7 @@
 	id = "xenoigniter";
 	luminosity = 2
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/engine,
 /area/science/xenobiology)
 "iPz" = (
@@ -59460,6 +59461,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/engine,
 /area/science/xenobiology)
 "qAx" = (
@@ -60664,6 +60666,7 @@
 /area/maintenance/department/science)
 "tfP" = (
 /obj/item/beacon,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/engine,
 /area/science/xenobiology)
 "tfZ" = (
@@ -114714,13 +114717,13 @@ abI
 aby
 aaa
 xKc
-blX
+lCN
 qAk
 iPj
 tfP
 geN
 qAk
-blX
+uzB
 xKc
 aaa
 aby

code/modules/mob/living/simple_animal/gremlin/gremlin.dm

@@ -147,6 +147,7 @@ GLOBAL_LIST(bad_gremlin_items)
 
 /mob/living/simple_animal/hostile/gremlin/death(gibbed)
 	walk(src,0)
+	QDEL_NULL(access_card)
 	return ..()
 
 /mob/living/simple_animal/hostile/gremlin/Life()

html/changelog.html

@@ -50,6 +50,20 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">07 September 2021</h2>
+			<h3 class="author">bunny232 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">fixed some jank in pubby's xenobiological secure pen</li>
+			</ul>
+			<h3 class="author">keronshb updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Gremlins no longer have AA when dead</li>
+			</ul>
+			<h3 class="author">zeroisthebiggay updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="spellcheck">you can just about</li>
+			</ul>
+
 			<h2 class="date">05 September 2021</h2>
 			<h3 class="author">DeltaFire15 updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -29904,3 +29904,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   DeltaFire15:
   - bugfix: Unreadied player gamemode votes now actually get ignored (if the config
       for this is enabled).
+2021-09-07:
+  bunny232:
+  - bugfix: fixed some jank in pubby's xenobiological secure pen
+  keronshb:
+  - bugfix: Gremlins no longer have AA when dead
+  zeroisthebiggay:
+  - spellcheck: you can just about

strings/tips.txt

@@ -136,7 +136,7 @@ As a Security Officer, your security HUDglasses can not only see crewmates' job
 As a Security Officer, mindshield implants can only prevent someone from being turned into a cultist: unlike revolutionaries, it will not de-cult them if they have already been converted.
 As a Security Officer, examining someone while wearing your security HUDglasses can allow you to swiftly edit their records and criminal status. Be sure to set someone to WANTED if you can't catch up to them, as it'll alert other officers of who's the bad guy, and cause the little security droids to chase after them for you.
 As a Security Officer, you can take out the power cell on your baton to replace it with a better or fully charged one. Just use a screwdriver on your baton to remove the old cell.
-As a Security Officer, you can just about any firearm on your vest, this even works with other non-standard armor-substitutes like security winter coats!
+As a Security Officer, you can place just about any firearm on your vest slot, and this even works with other non-standard armor-substitutes like security winter coats!
 As the Detective, people leave fingerprints everywhere and on everything. With the exception of white latex, gloves will hide them. All is not lost, however, as gloves leave fibers specific to their kind such as black or nitrile, pointing to a general department.
 As the Detective, you can use your forensics scanner from a distance. Use this to scan boxes or other storage containers.
 As the Detective, your revolver can be loaded with .357 ammunition. Use a screwdriver to permanently modify your revolver into using this type of ammunition, be warned however, firing it has a decent chance to cause the revolver to misfire and shoot you in the foot.