cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 22:50:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

adds structure spawners for electrified grilles, adds greps for some fulltile window spawners (#69528)

Browse Source 
* adds structure spawner for electrified grilles

* sdmm key cleanup
This commit is contained in:
ShizCalev
2022-09-01 02:48:15 +02:00
committed by GitHub
parent 63149a3e26
commit d82b6e23d6
15 changed files with 121 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
+45 -57
View File
@@ -982,8 +982,7 @@
/turf/open/floor/plating/snowed/icemoon,
/area/icemoon/underground/explored)
"oi" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner,
/obj/effect/spawner/structure/window/hollow/reinforced/directional,
/obj/effect/decal/cleanable/glass,
/turf/open/floor/plating/icemoon,
/area/ruin/plasma_facility/operations)
@@ -1172,9 +1171,9 @@
/turf/open/floor/plating/icemoon,
/area/ruin/plasma_facility/commons)
"ri" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner/east,
/obj/structure/window/reinforced/spawner/west,
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
dir = 4
},
/obj/structure/curtain/bounty,
/turf/open/floor/plating/icemoon,
/area/ruin/plasma_facility/commons)
@@ -1194,8 +1193,9 @@
/turf/open/lava/plasma/ice_moon,
/area/icemoon/underground/explored)
"rE" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner/west,
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
dir = 8
},
/obj/effect/decal/cleanable/glass,
/obj/structure/window/reinforced/spawner,
/turf/open/floor/plating/icemoon,
@@ -1355,9 +1355,9 @@
/turf/open/lava/plasma/ice_moon,
/area/icemoon/underground/explored)
"ul" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner/east,
/obj/structure/window/reinforced/spawner/west,
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
dir = 4
},
/obj/effect/decal/cleanable/glass,
/obj/structure/window/reinforced/spawner/north,
/turf/open/floor/plating/icemoon,
@@ -1392,8 +1392,9 @@
"ux" = (
/obj/structure/transit_tube/horizontal,
/obj/effect/decal/cleanable/glass,
/obj/structure/grille,
/obj/structure/window/reinforced/spawner/east,
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating/icemoon,
@@ -1753,10 +1754,9 @@
/turf/open/lava/plasma/ice_moon,
/area/icemoon/underground/explored)
"Cm" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner,
/obj/structure/window/reinforced/spawner/north,
/obj/structure/window/reinforced/spawner/east,
/obj/effect/spawner/structure/window/hollow/reinforced/end{
dir = 4
},
/turf/open/floor/plating,
/area/ruin/plasma_facility/commons)
"Co" = (
@@ -1789,8 +1789,9 @@
},
/area/ruin/plasma_facility/operations)
"CU" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner/east,
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
dir = 4
},
/obj/item/shard,
/turf/open/floor/plating/icemoon,
/area/ruin/plasma_facility/operations)
@@ -1855,8 +1856,9 @@
/turf/open/floor/plating/snowed/icemoon,
/area/icemoon/underground/explored)
"Ea" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner/east,
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
dir = 4
},
/obj/item/shard,
/turf/open/floor/plating/icemoon,
/area/ruin/plasma_facility/commons)
@@ -1868,8 +1870,9 @@
/turf/open/lava/plasma/ice_moon,
/area/icemoon/underground/explored)
"Ef" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner/east,
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
dir = 4
},
/turf/open/floor/plating/icemoon,
/area/ruin/plasma_facility/operations)
"El" = (
@@ -2004,9 +2007,7 @@
/turf/open/floor/plating/snowed/icemoon,
/area/ruin/plasma_facility/operations)
"HK" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner,
/obj/structure/window/reinforced/spawner/north,
/obj/effect/spawner/structure/window/hollow/reinforced/middle,
/turf/open/floor/plating/snowed/icemoon,
/area/ruin/plasma_facility/commons)
"HS" = (
@@ -2017,8 +2018,9 @@
/turf/open/floor/plating/snowed/icemoon,
/area/icemoon/underground/explored)
"HX" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner/north,
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
dir = 1
},
/obj/item/shard,
/turf/open/floor/plating/icemoon,
/area/ruin/plasma_facility/operations)
@@ -2111,8 +2113,9 @@
/turf/open/floor/iron/dark/textured_half,
/area/ruin/plasma_facility/commons)
"Ju" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner/west,
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
dir = 8
},
/obj/item/shard,
/turf/open/floor/plating/icemoon,
/area/ruin/plasma_facility/operations)
@@ -2220,8 +2223,9 @@
/turf/open/floor/stone,
/area/ruin/plasma_facility/commons)
"Kx" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner/east,
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
dir = 4
},
/obj/item/shard,
/obj/effect/decal/cleanable/glass,
/turf/open/floor/plating/icemoon,
@@ -2698,8 +2702,9 @@
/turf/open/floor/plating/icemoon,
/area/ruin/plasma_facility/operations)
"Rj" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner/north,
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
dir = 1
},
/obj/item/shard,
/obj/structure/cable,
/turf/open/floor/plating/icemoon,
@@ -2735,13 +2740,6 @@
/obj/item/shard,
/turf/open/floor/plating/icemoon,
/area/icemoon/underground/explored)
"RX" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner/west,
/obj/structure/window/reinforced/spawner/east,
/obj/structure/curtain/bounty,
/turf/open/floor/plating/icemoon,
/area/ruin/plasma_facility/commons)
"Sd" = (
/obj/structure/railing{
dir = 8
@@ -2858,13 +2856,6 @@
/obj/item/chair/plastic,
/turf/open/floor/plating/icemoon,
/area/ruin/plasma_facility/operations)
"UT" = (
/obj/structure/window/reinforced/spawner,
/obj/structure/grille,
/obj/structure/window/reinforced/spawner/north,
/obj/structure/window/reinforced/spawner/east,
/turf/open/floor/plating,
/area/ruin/plasma_facility/commons)
"Ve" = (
/obj/structure/flora/tree/stump,
/turf/open/misc/asteroid/snow/icemoon,
@@ -2964,8 +2955,7 @@
},
/area/ruin/plasma_facility/operations)
"Xj" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner,
/obj/effect/spawner/structure/window/hollow/reinforced/directional,
/obj/item/shard,
/turf/open/floor/plating/icemoon,
/area/ruin/plasma_facility/commons)
@@ -3052,9 +3042,7 @@
/turf/open/misc/asteroid/snow/icemoon,
/area/icemoon/underground/explored)
"YP" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner,
/obj/structure/window/reinforced/spawner/north,
/obj/effect/spawner/structure/window/hollow/reinforced/middle,
/turf/open/floor/plating/icemoon,
/area/ruin/plasma_facility/commons)
"Zf" = (
@@ -3162,9 +3150,9 @@
/turf/open/floor/wood/large,
/area/ruin/plasma_facility/commons)
"ZN" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner/east,
/obj/structure/window/reinforced/spawner/west,
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
dir = 4
},
/turf/open/floor/plating/icemoon,
/area/ruin/plasma_facility/operations)
"ZR" = (
@@ -3570,7 +3558,7 @@ AG
vY
vY
XI
RX
ri
Ea
qW
ri
@@ -3715,7 +3703,7 @@ BJ
hK
ZH
wF
UT
Cm
pn
PB
eC
_maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm
+15 -11
View File
@@ -114,8 +114,9 @@
},
/area/ruin/powered/shuttle)
"sM" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner/east,
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
dir = 4
},
/obj/item/shard,
/obj/effect/decal/cleanable/glass,
/turf/open/floor/plating/icemoon,
@@ -227,8 +228,9 @@
/area/icemoon/underground/explored)
"CH" = (
/obj/structure/window/reinforced/spawner,
/obj/structure/grille,
/obj/structure/window/reinforced/spawner/north,
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
dir = 1
},
/obj/effect/decal/cleanable/glass,
/turf/open/floor/plating/icemoon,
/area/ruin/powered/shuttle)
@@ -252,9 +254,9 @@
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/ruin/powered/shuttle)
"FP" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner/west,
/obj/structure/window/reinforced/spawner/east,
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
dir = 4
},
/obj/effect/decal/cleanable/glass,
/turf/open/floor/plating/icemoon,
/area/ruin/powered/shuttle)
@@ -267,8 +269,9 @@
},
/area/ruin/powered/shuttle)
"GH" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner/north,
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
dir = 1
},
/obj/item/shard,
/obj/effect/decal/cleanable/glass,
/turf/open/floor/plating/icemoon,
@@ -296,8 +299,9 @@
/turf/open/misc/asteroid/snow/icemoon,
/area/icemoon/underground/explored)
"Jt" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner/east,
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
dir = 4
},
/obj/effect/decal/cleanable/glass,
/turf/open/floor/plating/icemoon,
/area/ruin/powered/shuttle)
_maps/RandomRuins/SpaceRuins/clericden.dmm
+3 -6
View File
@@ -22,8 +22,7 @@
/turf/open/misc/asteroid/airless,
/area/ruin/unpowered/no_grav)
"g" = (
/obj/structure/grille,
/obj/structure/window/fulltile,
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/ruin/unpowered/no_grav)
"h" = (
@@ -159,8 +158,7 @@
/turf/open/floor/iron/dark/airless,
/area/ruin/unpowered/no_grav)
"K" = (
/obj/structure/grille,
/obj/structure/window/fulltile,
/obj/effect/spawner/structure/window,
/turf/open/floor/plating/airless,
/area/ruin/unpowered/no_grav)
"L" = (
@@ -177,8 +175,7 @@
/turf/open/misc/asteroid/airless,
/area/ruin/unpowered/no_grav)
"O" = (
/obj/structure/grille,
/obj/structure/window/fulltile,
/obj/effect/spawner/structure/window,
/obj/structure/barricade/wooden/crude,
/turf/open/floor/plating/airless,
/area/ruin/unpowered/no_grav)
_maps/RandomRuins/SpaceRuins/deepstorage.dmm
+3 -4
View File
@@ -2106,7 +2106,7 @@
"fJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/atmos_control/noreconnect{
atmos_chambers = list("deepo2" = "Oxygen Supply");
atmos_chambers = list("deepo2"="Oxygen Supply");
dir = 8
},
/turf/open/floor/iron,
@@ -2426,7 +2426,7 @@
"gC" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/atmos_control/noreconnect{
atmos_chambers = list("deepn2" = "Nitrogen Supply");
atmos_chambers = list("deepn2"="Nitrogen Supply");
dir = 8
},
/turf/open/floor/iron,
@@ -2505,8 +2505,7 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage)
"gR" = (
/obj/structure/grille,
/obj/structure/cable,
/obj/effect/spawner/structure/electrified_grille,
/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/power)
"gT" = (
_maps/RandomZLevels/snowdin.dmm
+6 -12
View File
@@ -6310,9 +6310,8 @@
/area/awaymission/snowdin/cave/cavern)
"rx" = (
/obj/machinery/door/firedoor,
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile/ice,
/obj/structure/cable,
/obj/effect/spawner/structure/electrified_grille,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/cavern2)
"ry" = (
@@ -6965,9 +6964,8 @@
/area/awaymission/snowdin/post/cavern1)
"uO" = (
/obj/machinery/door/firedoor,
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile/ice,
/obj/structure/cable,
/obj/effect/spawner/structure/electrified_grille,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/cavern1)
"uS" = (
@@ -8144,9 +8142,8 @@
/area/awaymission/snowdin/igloo)
"zR" = (
/obj/machinery/door/firedoor,
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile/ice,
/obj/structure/cable,
/obj/effect/spawner/structure/electrified_grille,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_dock)
"zS" = (
@@ -9511,8 +9508,7 @@
/turf/closed/wall/ice,
/area/awaymission/snowdin/post/mining_main)
"Ga" = (
/obj/structure/window/reinforced/fulltile/ice,
/obj/structure/grille,
/obj/effect/spawner/structure/window/ice,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_main)
"Gb" = (
@@ -9525,8 +9521,7 @@
/area/awaymission/snowdin/post/mining_main/robotics)
"Ge" = (
/obj/machinery/door/firedoor,
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile/ice,
/obj/effect/spawner/structure/window/ice,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_main/robotics)
"Gf" = (
@@ -9811,8 +9806,7 @@
/area/awaymission/snowdin/post/mining_main/mechbay)
"Hj" = (
/obj/machinery/door/firedoor,
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile/ice,
/obj/effect/spawner/structure/window/ice,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_main/mechbay)
"Hk" = (
_maps/map_files/KiloStation/KiloStation.dmm
+7 -17
View File
@@ -10166,10 +10166,9 @@
/area/station/service/hydroponics)
"dcJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/grille,
/obj/structure/sign/warning/electric_shock/directional/west,
/obj/structure/cable,
/obj/effect/mapping_helpers/burnt_floor,
/obj/effect/spawner/structure/electrified_grille,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"ddb" = (
@@ -11762,9 +11761,8 @@
/area/station/science/xenobiology)
"dxz" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/grille,
/obj/structure/cable,
/obj/effect/mapping_helpers/broken_floor,
/obj/effect/spawner/structure/electrified_grille,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"dxB" = (
@@ -57415,11 +57413,7 @@
/obj/structure/transit_tube/horizontal{
dir = 1
},
/obj/structure/grille,
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 1
},
/obj/effect/spawner/structure/window/hollow/reinforced/middle,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
@@ -60514,14 +60508,13 @@
},
/area/station/ai_monitored/turret_protected/ai)
"rph" = (
/obj/structure/grille,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/effect/mapping_helpers/burnt_floor,
/obj/effect/spawner/structure/electrified_grille,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
"rpl" = (
@@ -67742,12 +67735,11 @@
/turf/open/floor/plating,
/area/station/maintenance/disposal)
"tmU" = (
/obj/structure/grille,
/obj/structure/barricade/wooden,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/abandoned,
/obj/structure/cable,
/obj/effect/spawner/structure/electrified_grille,
/obj/effect/mapping_helpers/airlock/access/any/security/maintenance,
/turf/open/floor/iron/dark,
/area/station/maintenance/port/aft)
@@ -75120,16 +75112,15 @@
/turf/open/floor/iron,
/area/station/security/brig)
"vtl" = (
/obj/structure/grille,
/obj/structure/barricade/wooden,
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/abandoned,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/effect/mapping_helpers/airlock/unres{
dir = 1
},
/obj/effect/mapping_helpers/airlock/access/all/security/general,
/obj/effect/spawner/structure/electrified_grille,
/turf/open/floor/iron/dark,
/area/station/maintenance/fore)
"vto" = (
@@ -85258,8 +85249,7 @@
/turf/open/floor/iron/dark,
/area/station/hallway/primary/central/fore)
"yfP" = (
/obj/structure/grille,
/obj/structure/cable,
/obj/effect/spawner/structure/electrified_grille,
/turf/open/floor/plating/rust,
/area/station/security/prison)
"yfS" = (
_maps/map_files/tramstation/tramstation.dmm
+3 -8
View File
@@ -45383,9 +45383,7 @@
/turf/open/floor/engine,
/area/station/maintenance/disposal/incinerator)
"pDW" = (
/obj/structure/sign/warning/radiation/rad_area/directional/north{
dir = 1
},
/obj/structure/sign/warning/radiation/rad_area/directional/north,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 1
@@ -61307,8 +61305,7 @@
/turf/open/floor/plating,
/area/station/engineering/engine_smes)
"vfU" = (
/obj/structure/cable,
/obj/structure/grille,
/obj/effect/spawner/structure/electrified_grille,
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating/airless,
/area/mine/explored)
@@ -64572,9 +64569,7 @@
/turf/open/floor/iron,
/area/station/security/checkpoint/engineering)
"wpo" = (
/obj/structure/sign/warning/radiation/rad_area/directional/north{
dir = 1
},
/obj/structure/sign/warning/radiation/rad_area/directional/north,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/trimline/neutral/filled/line{
_maps/shuttles/emergency_monastery.dmm
+2 -3
View File
@@ -970,8 +970,7 @@
/turf/open/floor/iron/dark,
/area/shuttle/escape)
"nK" = (
/obj/structure/grille,
/obj/structure/window/reinforced/tinted/fulltile,
/obj/effect/spawner/structure/window/reinforced/tinted,
/turf/open/floor/iron/dark,
/area/shuttle/escape)
"nQ" = (
@@ -2633,7 +2632,7 @@
/obj/docking_port/mobile/emergency{
dwidth = 40;
height = 43;
movement_force = list("KNOCKDOWN" = 3, "THROW" = 6);
movement_force = list("KNOCKDOWN"=3,"THROW"=6);
name = "\proper a monastery with engines strapped to it";
port_direction = 1;
width = 80
_maps/shuttles/emergency_raven.dmm
+1 -3
View File
@@ -3,8 +3,7 @@
/turf/template_noop,
/area/template_noop)
"ab" = (
/obj/structure/grille,
/obj/structure/window/reinforced/plasma/plastitanium,
/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/obj/machinery/door/poddoor/preopen{
id = "escape_cockpit_windows";
name = "Cockpit Blast Door"
@@ -2076,7 +2075,6 @@
lethal = 1;
pixel_x = 5;
pixel_y = 32;
req_access = null;
req_access = list("command")
},
/turf/open/floor/iron/dark,
_maps/shuttles/infiltrator_advanced.dmm
+3 -6
View File
@@ -1184,8 +1184,7 @@
/turf/open/floor/pod/dark,
/area/shuttle/syndicate/medical)
"cx" = (
/obj/structure/grille,
/obj/structure/window/reinforced/plasma/plastitanium,
/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/obj/structure/shuttle/engine/heater,
/turf/open/floor/plating,
/area/shuttle/syndicate/medical)
@@ -1244,8 +1243,7 @@
/turf/closed/wall/r_wall/syndicate,
/area/shuttle/syndicate/armory)
"cH" = (
/obj/structure/grille,
/obj/structure/window/reinforced/plasma/plastitanium,
/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/obj/structure/shuttle/engine/heater,
/turf/open/floor/plating,
/area/shuttle/syndicate/armory)
@@ -1275,8 +1273,7 @@
/turf/closed/wall/r_wall/syndicate,
/area/shuttle/syndicate/hallway)
"cN" = (
/obj/structure/grille,
/obj/structure/window/reinforced/plasma/plastitanium,
/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/obj/structure/shuttle/engine/heater,
/turf/open/floor/plating,
/area/shuttle/syndicate/hallway)
_maps/shuttles/pirate_default.dmm
+1 -2
View File
@@ -872,8 +872,7 @@
/obj/machinery/door/poddoor/shutters/preopen{
id = "piratebridge"
},
/obj/structure/grille,
/obj/structure/window/reinforced/plasma/plastitanium,
/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating,
/area/shuttle/pirate)
"ez" = (
_maps/shuttles/ruin_syndicate_dropship.dmm
+1 -2
View File
@@ -156,8 +156,7 @@
/turf/open/floor/iron/dark,
/area/shuttle/caravan/syndicate3)
"rU" = (
/obj/structure/grille,
/obj/structure/window/reinforced/plasma/plastitanium,
/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/obj/machinery/door/poddoor{
id = "caravansyndicate3_bridge"
},
code/game/objects/effects/spawners/structure.dm
+6
View File
@@ -369,3 +369,9 @@ again.
if(NORTHWEST)
spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/plasma/spawner/north, /obj/structure/window/reinforced/plasma/spawner/west)
. = ..()
/obj/effect/spawner/structure/electrified_grille
name = "electrified grill spawner"
icon = 'icons/obj/structures_spawners.dmi'
icon_state = "electrified_grille"
spawn_list = list(/obj/structure/grille, /obj/structure/cable)
icons/obj/structures_spawners.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 49 KiB

tools/ci/check_grep.sh
+25
View File
@@ -157,6 +157,31 @@ if grep -Pzo '"\w+" = \(\n[^)]*?/obj/structure/stairs[/\w]*?,\n[^)]*?/turf/open/
echo -e "${RED}ERROR: Found a staircase on top of a gen_turf. Please replace the gen_turf with a proper turf.${NC}"
st=1
fi;
if grep -Pzo '"\w+" = \(\n[^)]*?/obj/structure/grille,\n[^)]*?/obj/structure/cable,\n[^)]*?/area/.+\)' _maps/**/*.dmm; then
echo
echo -e "${RED}ERROR: Found a grille above a cable. Please replace with the proper structure spawner.${NC}"
st=1
fi;
if grep -Pzo '"\w+" = \(\n[^)]*?/obj/structure/cable,\n[^)]*?/obj/structure/grille,\n[^)]*?/area/.+\)' _maps/**/*.dmm; then
echo
echo -e "${RED}ERROR: Found a grille above a cable. Please replace with the proper structure spawner.${NC}"
st=1
fi;
if grep -Pzo '"\w+" = \(\n[^)]*?/obj/structure/grille,\n[^)]*?/obj/structure/window/reinforced/fulltile/ice,\n[^)]*?/area/.+\)' _maps/**/*.dmm; then
echo
echo -e "${RED}ERROR: Found grille above a fulltile ice window. Please replace it with the proper structure spawner.${NC}"
st=1
fi;
if grep -Pzo '"\w+" = \(\n[^)]*?/obj/structure/grille,\n[^)]*?/obj/structure/window[/\w]*?fulltile,\n[^)]*?/area/.+\)' _maps/**/*.dmm; then
echo
echo -e "${RED}ERROR: Found grille above a fulltile window. Please replace it with the proper structure spawner.${NC}"
st=1
fi;
if grep -Pzo '"\w+" = \(\n[^)]*?/obj/structure/grille,\n[^)]*?/obj/structure/window/reinforced/plasma/plastitanium,\n[^)]*?/area/.+\)' _maps/**/*.dmm; then
echo
echo -e "${RED}ERROR: Found grille above a fulltile plastitanium window. Please replace it with the proper structure spawner.${NC}"
st=1
fi;
if grep -Pzo '/obj/machinery/conveyor/inverted[/\w]*?\{\n[^}]*?dir = [1248];[^}]*?\},?\n' _maps/**/*.dmm; then
echo
echo -e "${RED}ERROR: Found an inverted conveyor belt with a cardinal dir. Please replace it with a normal conveyor belt.${NC}"