cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 12:35:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Ready] Syndie air alarm/APC subtypes, cleaning up syndie lavaland piping (#37602)

Browse Source 
* syndicate subtypes for air alarms and APCs

* syndie lavabase layer3 piping subtypes

* adds missing lava syndie stock parts

* syndicate access

* Replaces loose stock parts/upgrades chem dispensers/adds kitchen boards

* removes redundant typepath
This commit is contained in:
81Denton
2018-05-16 19:17:41 +02:00
committed by ShizCalev
parent e4fa4d5155
commit 1235c3ff19
6 changed files with 400 additions and 989 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+332 -949
View File
File diff suppressed because it is too large Load Diff
_maps/RandomRuins/SpaceRuins/listeningstation.dmm
+12 -24
View File
@@ -12,10 +12,8 @@
/obj/machinery/computer/message_monitor{
dir = 2
},
/obj/machinery/airalarm{
pixel_y = 24;
req_access = null;
req_access_txt = "150"
/obj/machinery/airalarm/syndicate{
pixel_y = 24
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -210,11 +208,9 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm{
/obj/machinery/airalarm/syndicate{
dir = 4;
pixel_x = -24;
req_access = null;
req_access_txt = "150"
pixel_x = -24
},
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/listeningstation)
@@ -517,10 +513,8 @@
},
/area/ruin/space/has_grav/listeningstation)
"aU" = (
/obj/machinery/airalarm{
pixel_y = 24;
req_access = null;
req_access_txt = "150"
/obj/machinery/airalarm/syndicate{
pixel_y = 24
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -640,11 +634,9 @@
/obj/machinery/light/small{
dir = 4
},
/obj/machinery/airalarm{
/obj/machinery/airalarm/syndicate{
dir = 8;
pixel_x = 24;
req_access = null;
req_access_txt = "150"
pixel_x = 24
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -811,12 +803,10 @@
icon_state = "0-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/power/apc{
/obj/machinery/power/apc/syndicate{
dir = 4;
name = "Syndicate Listening Post APC";
pixel_x = 24;
req_access = null;
req_access_txt = "150"
pixel_x = 24
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
@@ -948,11 +938,9 @@
},
/obj/machinery/iv_drip,
/obj/machinery/light/small,
/obj/machinery/airalarm{
/obj/machinery/airalarm/syndicate{
dir = 1;
pixel_y = -24;
req_access = null;
req_access_txt = "150"
pixel_y = -24
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
_maps/shuttles/ruin_syndicate_dropship.dmm
+8 -16
View File
@@ -1,10 +1,8 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"al" = (
/obj/machinery/airalarm{
/obj/machinery/airalarm/syndicate{
dir = 4;
pixel_x = -24;
req_access = null;
req_access_txt = "150"
pixel_x = -24
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
@@ -97,12 +95,10 @@
/obj/structure/cable/yellow{
icon_state = "0-2"
},
/obj/machinery/power/apc{
/obj/machinery/power/apc/syndicate{
dir = 8;
name = "Syndicate Drop Ship APC";
pixel_x = -24;
req_access = null;
req_access_txt = "150"
pixel_x = -24
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/pod/dark,
@@ -283,10 +279,8 @@
/area/shuttle/caravan/syndicate3)
"EO" = (
/obj/structure/chair,
/obj/machinery/airalarm{
pixel_y = 24;
req_access = null;
req_access_txt = "150"
/obj/machinery/airalarm/syndicate{
pixel_y = 24
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/pod/dark,
@@ -302,11 +296,9 @@
/turf/open/floor/mineral/plastitanium,
/area/shuttle/caravan/syndicate3)
"Gx" = (
/obj/machinery/airalarm{
/obj/machinery/airalarm/syndicate{
dir = 4;
pixel_x = -24;
req_access = null;
req_access_txt = "150"
pixel_x = -24
},
/turf/open/floor/plasteel/dark,
/area/shuttle/caravan/syndicate3)
code/game/objects/items/storage/boxes.dm
+42
View File
@@ -966,3 +966,45 @@ obj/item/storage/box/clown
/obj/item/storage/box/holy_grenades/PopulateContents()
for(var/i in 1 to 7)
new/obj/item/grenade/chem_grenade/holy(src)
/obj/item/storage/box/stockparts/basic //for ruins where it's a bad idea to give access to an autolathe/protolathe, but still want to make stock parts accessible
name = "box of stock parts"
desc = "Contains a variety of basic stock parts."
/obj/item/storage/box/stockparts/basic/PopulateContents()
new /obj/item/stock_parts/capacitor(src)
new /obj/item/stock_parts/capacitor(src)
new /obj/item/stock_parts/capacitor(src)
new /obj/item/stock_parts/scanning_module(src)
new /obj/item/stock_parts/scanning_module(src)
new /obj/item/stock_parts/scanning_module(src)
new /obj/item/stock_parts/manipulator(src)
new /obj/item/stock_parts/manipulator(src)
new /obj/item/stock_parts/manipulator(src)
new /obj/item/stock_parts/micro_laser(src)
new /obj/item/stock_parts/micro_laser(src)
new /obj/item/stock_parts/micro_laser(src)
new /obj/item/stock_parts/matter_bin(src)
new /obj/item/stock_parts/matter_bin(src)
new /obj/item/stock_parts/matter_bin(src)
/obj/item/storage/box/stockparts/deluxe
name = "box of deluxe stock parts"
desc = "Contains a variety of deluxe stock parts."
/obj/item/storage/box/stockparts/deluxe/PopulateContents()
new /obj/item/stock_parts/capacitor/quadratic(src)
new /obj/item/stock_parts/capacitor/quadratic(src)
new /obj/item/stock_parts/capacitor/quadratic(src)
new /obj/item/stock_parts/scanning_module/triphasic(src)
new /obj/item/stock_parts/scanning_module/triphasic(src)
new /obj/item/stock_parts/scanning_module/triphasic(src)
new /obj/item/stock_parts/manipulator/femto(src)
new /obj/item/stock_parts/manipulator/femto(src)
new /obj/item/stock_parts/manipulator/femto(src)
new /obj/item/stock_parts/micro_laser/quadultra(src)
new /obj/item/stock_parts/micro_laser/quadultra(src)
new /obj/item/stock_parts/micro_laser/quadultra(src)
new /obj/item/stock_parts/matter_bin/bluespace(src)
new /obj/item/stock_parts/matter_bin/bluespace(src)
new /obj/item/stock_parts/matter_bin/bluespace(src)
code/modules/atmospherics/machinery/airalarm.dm
+3
View File
@@ -153,6 +153,9 @@
req_access = null
req_one_access = null
/obj/machinery/airalarm/syndicate //general syndicate access
req_access = list(ACCESS_SYNDICATE)
//all air alarms in area are connected via magic
/area
var/list/air_vent_names = list()
code/modules/power/apc.dm
+3
View File
@@ -105,6 +105,9 @@
/obj/machinery/power/apc/unlocked
locked = FALSE
/obj/machinery/power/apc/syndicate //general syndicate access
req_access = list(ACCESS_SYNDICATE)
/obj/machinery/power/apc/highcap/five_k
cell_type = /obj/item/stock_parts/cell/upgraded/plus