Merge branch 'ss220club:master' into accessory_cloaks

README.md

@@ -1,4 +1,5 @@
-# Paradise
+# Paradise WyccStation SS220
+
 [![CI](https://github.com/ParadiseSS13/Paradise/workflows/CI/badge.svg)](https://github.com/ParadiseSS13/Paradise/actions?query=workflow%3ACI)
 [![Render Nanomaps](https://github.com/ParadiseSS13/Paradise/workflows/Render%20Nanomaps/badge.svg)](https://github.com/ParadiseSS13/Paradise/actions?query=workflow%3A%22Render+Nanomaps%22)
 [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/paradisess13/paradise.svg)](http://isitmaintained.com/project/paradisess13/paradise "Average time to resolve an issue")
@@ -8,13 +9,13 @@
 [![forthebadge](http://forthebadge.com/images/badges/contains-technical-debt.svg)](http://forthebadge.com)
 [![forthebadge](http://forthebadge.com/images/badges/fuck-it-ship-it.svg)](http://forthebadge.com)
 
-# Useful Links
+# Полезные ссылки
 
-- [Discord](https://discordapp.com/invite/YJDsXFE)
-- [Documentation](https://codedocs.paradisestation.org)
-- [Website](https://www.paradisestation.org/)
+- [Discord](https://discord.com/invite/ss220)
+- [Wiki](https://wiki.ss220.club/)
+- [Documentation](https://ss220club.github.io/Paradise-SS220/)
 
-# Useful Documents
+# Полезные материалы
 
 - [Autodocumentation Guide](.github/AUTODOC_GUIDE.md)
 - [Code of Conduct](./CODE_OF_CONDUCT.md)
@@ -23,7 +24,6 @@
 
 ---
 
-
 ### LICENSE
 
 Paradise is licensed under the GNU Affero General Public License version 3.
@@ -44,8 +44,8 @@ Any files located in the
 `Paradise/sound/goonstation`
 directories, or any subdirectories of mentioned directories are licensed under the
 Creative Commons 3.0 BY-NC-SA license
-(https://creativecommons.org/licenses/by-nc-sa/3.0)
+(<https://creativecommons.org/licenses/by-nc-sa/3.0>)
 
 All other assets including icons and sound files are licensed under the
-Creative Commons 3.0 BY-SA license (https://creativecommons.org/licenses/by-sa/3.0/),
+Creative Commons 3.0 BY-SA license (<https://creativecommons.org/licenses/by-sa/3.0/>),
 unless otherwise indicated.

_maps/map_files220/MetaStation/MetaStation.dmm

@@ -51774,7 +51774,6 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
 /obj/machinery/door/airlock/engineering/glass{
 	heat_proof = 1;
 	name = "Supermatter Chamber"
@@ -70741,7 +70740,6 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/xenobio_south)
 "peF" = (
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
 /obj/machinery/door/airlock/engineering/glass{
 	heat_proof = 1;
 	name = "Supermatter Chamber"
@@ -85945,8 +85943,7 @@
 /area/station/maintenance/fore)
 "wzW" = (
 /obj/structure/holohoop{
-	dir = 8;
-	pixel_x = -13
+	dir = 8
 	},
 /obj/effect/turf_decal/stripes/white/line{
 	dir = 4

_maps/map_files220/cyberiad/cyberiad.dmm

@@ -13411,7 +13411,16 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/fpmaint)
 "aXI" = (
+/obj/machinery/light/small/directional/west,
 /obj/structure/table/glass,
+/obj/item/reagent_containers/spray/pestspray{
+	pixel_x = -6;
+	pixel_y = 9
+	},
+/obj/item/reagent_containers/spray/plantbgone{
+	pixel_y = 4;
+	pixel_x = 4
+	},
 /turf/simulated/floor/plasteel,
 /area/station/hallway/secondary/garden)
 "aXL" = (
@@ -13888,9 +13897,9 @@
 	},
 /area/station/command/vault)
 "aZj" = (
-/obj/machinery/light/small/directional/west,
 /obj/structure/table/glass,
 /obj/item/cultivator,
+/obj/item/shovel/spade,
 /obj/item/hatchet,
 /obj/item/crowbar,
 /obj/item/plant_analyzer,
@@ -15022,10 +15031,12 @@
 /area/station/hallway/primary/central/north)
 "bdx" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/spray/plantbgone,
-/obj/item/reagent_containers/spray/pestspray,
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
-/obj/item/reagent_containers/glass/bottle/nutrient/rh,
+/obj/item/reagent_containers/glass/bottle/nutrient/ez{
+	pixel_x = 4
+	},
+/obj/item/reagent_containers/glass/bottle/nutrient/rh{
+	pixel_x = -4
+	},
 /obj/machinery/light/directional/east,
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -15903,8 +15914,9 @@
 /area/station/service/expedition)
 "bgM" = (
 /obj/structure/table/glass,
-/obj/item/hatchet,
 /obj/item/cultivator,
+/obj/item/shovel/spade,
+/obj/item/hatchet,
 /obj/item/crowbar,
 /obj/item/plant_analyzer,
 /obj/item/reagent_containers/glass/bucket,
@@ -77073,7 +77085,8 @@
 	dir = 8
 	},
 /obj/structure/holohoop{
-	dir = 4
+	dir = 4;
+	pixel_x = -6
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{