Merge remote-tracking branch 'upstream/master' into hirka_away

README.md

@@ -23,7 +23,7 @@
 			<img width="15%" alt="Discord" hspace="3%" src=".github/assets/discord-dark.png">
 		</picture>
 	</a>
-	<a href="https://ss220club.github.io/Paradise-SS220">
+	<a href="https://devdocs.paradisestation.org">
 		<picture>
 			<source media="(prefers-color-scheme: dark)" srcset=".github/assets/book-light.png">
 			<source media="(prefers-color-scheme: light)" srcset=".github/assets/book-dark.png">
@@ -50,15 +50,15 @@
 
 Этот справочный сайт от создателей BYOND содержит подробную информацию о языке DM, используемом синтаксисе, функциональности нативных процедур (proc) и многом другом. Это всегда полезно иметь под рукой, когда вы вносите свой вклад.
 
-- ### [Autodocumentation Guide](./docs/references/autodoc.md)
+- ### [Autodocumentation Guide](https://devdocs.paradisestation.org/references/autodoc/)
 
 Это руководство покажет вам, как оставлять комментарии к коду, соответствующие "автодокументации" - системе, призванной облегчить всем жизнь при чтении и ревью кода!
 
-- ### [Code of Conduct](./docs/CODE_OF_CONDUCT.md)
+- ### [Code of Conduct](https://devdocs.paradisestation.org/code_of_conduct/)
 
 Все участники должны ознакомиться с нашим "Кодексом поведения", прежде чем принимать участие в жизни нашего сообщества.
 
-- ### [Contribution Guide](./docs/CONTRIBUTING.md)
+- ### [Contribution Guide](https://devdocs.paradisestation.org/contributing/)
 
 Не знаете, как принять участие и внести свой вклад? В этом руководстве дается обзор того, как делать комментарии, открывать Pull Requests и Issues.
 

_maps/map_files/generic/centcomm.dmm

@@ -62445,7 +62445,7 @@ ab
 ab
 ab
 ab
-sK
+BZ
 hG
 UO
 iT

_maps/map_files/stations/boxstation.dmm

@@ -87979,7 +87979,7 @@
 /obj/item/reagent_containers/syringe,
 /obj/item/reagent_containers/syringe,
 /obj/item/trash/liquidfood,
-/obj/item/trash/spentcasing,
+/obj/item/trash/spentcasing/shotgun,
 /obj/item/trash/spacetwinkie,
 /obj/item/trash/raisins,
 /obj/item/trash/raisins,

_maps/map_files/stations/cerestation.dmm

@@ -48755,9 +48755,7 @@
 	},
 /area/station/medical/storage/secondary)
 "iIS" = (
-/obj/item/trash/spentcasing{
-	icon_state = "r-casing"
-	},
+/obj/item/trash/spentcasing/bullet,
 /obj/effect/decal/cleanable/blood/splatter,
 /turf/simulated/floor/plating{
 	icon_state = "asteroidplating"
@@ -54973,9 +54971,7 @@
 /area/station/maintenance/asmaint)
 "kpK" = (
 /obj/effect/decal/cleanable/blood/drip,
-/obj/item/trash/spentcasing{
-	icon_state = "r-casing"
-	},
+/obj/item/trash/spentcasing/bullet,
 /turf/simulated/floor/plating{
 	icon_state = "asteroidplating"
 	},
@@ -67874,9 +67870,7 @@
 	},
 /area/station/engineering/control)
 "ohJ" = (
-/obj/item/trash/spentcasing{
-	icon_state = "r-casing"
-	},
+/obj/item/trash/spentcasing/bullet,
 /turf/simulated/floor/plating{
 	icon_state = "asteroidplating"
 	},

_maps/map_files/stations/deltastation.dmm

@@ -52383,6 +52383,9 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/structure/disaster_counter/chemistry{
+	pixel_x = -32
+	},
 /turf/simulated/floor/engine,
 /area/station/medical/chemistry)
 "cVG" = (
@@ -69241,6 +69244,10 @@
 	icon_state = "darkred"
 	},
 /area/station/security/brig)
+"gKj" = (
+/obj/structure/disaster_counter/toxins,
+/turf/simulated/wall/r_wall,
+/area/station/science/toxins/launch)
 "gKs" = (
 /obj/machinery/door/firedoor,
 /obj/effect/turf_decal/delivery,
@@ -77325,7 +77332,7 @@
 /obj/machinery/door/airlock/research/glass{
 	name = "Break Room"
 	},
-/obj/effect/mapping_helpers/airlock/access/any/science,
+/obj/effect/mapping_helpers/airlock/access/any/science/research,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plasteel/white,
@@ -80362,6 +80369,9 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/structure/disaster_counter/scichem{
+	pixel_y = 32
+	},
 /turf/simulated/floor/engine,
 /area/station/science/misc_lab)
 "nmF" = (
@@ -85268,7 +85278,6 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/hologram/holopad,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
@@ -85490,6 +85499,7 @@
 /area/station/medical/virology)
 "qgC" = (
 /obj/machinery/atmospherics/pipe/simple/visible/cyan,
+/obj/structure/disaster_counter/supermatter,
 /turf/simulated/wall/r_wall,
 /area/station/engineering/engine/supermatter)
 "qhG" = (
@@ -92945,7 +92955,6 @@
 "uhI" = (
 /obj/machinery/hologram/holopad,
 /obj/effect/turf_decal/delivery/hollow,
-/obj/machinery/hologram/holopad,
 /obj/effect/turf_decal/delivery/hollow,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -95845,7 +95854,6 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/hologram/holopad,
 /obj/effect/turf_decal/delivery/hollow,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -129128,7 +129136,7 @@ sVv
 gQW
 gQW
 sYB
-gQW
+gKj
 gQW
 gQW
 gQW