Merge pull request #877 from CeladonSS13/beta-dev

#15 Перенос обновлений с Beta на Alpha сервер
CeladonSS13 · Aug 3, 2024 · cdb7dfd · cdb7dfd
2 parents 671e3f9 + 1a54f44
commit cdb7dfd
Show file tree

Hide file tree

Showing 64 changed files with 11,684 additions and 345 deletions.
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm b/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm
diff --git a/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm b/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
diff --git a/_maps/_mod_celadon/RandomRuins/SpaceRuins/corporate_mining.dmm b/_maps/_mod_celadon/RandomRuins/SpaceRuins/corporate_mining.dmm
@@ -606,7 +606,7 @@
 /obj/item/clothing/suit/hazardvest/donk/qm,
 /obj/item/reagent_containers/food/snacks/donkpocket,
 /obj/item/gun/ballistic/automatic/pistol/syndicate,
-/obj/item/suppressor,
+/obj/item/attachment/silencer,
 /turf/open/floor/wood,
 /area/ruin/space/has_grav/corporatemine/crewquarters)
 "nW" = (

diff --git a/_maps/_mod_celadon/shuttles/independent/independent_byo.dmm b/_maps/_mod_celadon/shuttles/independent/independent_byo.dmm
@@ -115,6 +115,7 @@
 /area/ship/construction)
 "jj" = (
 /obj/structure/closet/crate/solarpanel_small,
+/obj/item/circuitboard/computer/cargo,
 /turf/open/floor/plating/airless,
 /area/ship/construction)
 "ke" = (
@@ -330,7 +331,6 @@
 	},
 /obj/item/wallframe/intercom/wideband,
 /obj/item/circuitboard/machine/holopad,
-/obj/item/circuitboard/computer/cargo/express,
 /obj/item/spacecash/bundle/loadsamoney,
 /obj/item/spacecash/bundle/loadsamoney,
 /obj/item/spacecash/bundle/loadsamoney,

diff --git a/_maps/_mod_celadon/shuttles/independent/independent_junker.dmm b/_maps/_mod_celadon/shuttles/independent/independent_junker.dmm
@@ -94,7 +94,6 @@
 	},
 /obj/effect/decal/cleanable/glass,
 /obj/structure/safe/floor,
-/obj/item/circuitboard/computer/cargo/express,
 /turf/open/floor/pod/dark,
 /area/ship/crew/office)
 "bJ" = (
@@ -667,6 +666,7 @@
 /obj/machinery/atmospherics/pipe/simple/purple/hidden{
 	dir = 9
 	},
+/obj/item/circuitboard/computer/cargo,
 /turf/open/floor/pod/dark,
 /area/ship/crew/office)
 "lU" = (