shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4095 from Citadel-Station-13/upstream-merge-33018

Browse Source 
[MIRROR] Replaces "console screen" stock part with glass sheets
This commit is contained in:
deathride58
2017-11-24 06:42:51 +00:00
committed by GitHub
parent 876b3ebff0 d5d89a57b4
commit 470f4169df
14 changed files with 66 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
+2 -2
View File
@@ -559,7 +559,7 @@
/turf/template_noop,
/area/ruin/space/derelict/bridge/ai_upload)
"bM" = (
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/turf/template_noop,
/area/ruin/space/derelict/bridge/ai_upload)
"bN" = (
@@ -991,7 +991,7 @@
icon_state = "0-8"
},
/obj/structure/frame/machine,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/turf/open/floor/plating/airless,
/area/ruin/space/derelict/gravity_generator)
"dj" = (
_maps/RandomRuins/SpaceRuins/oldstation.dmm
+3 -3
View File
@@ -2610,8 +2610,8 @@
/area/ruin/space/has_grav/ancientstation/rnd)
"gQ" = (
/obj/structure/table,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/item/stock_parts/matter_bin,
/obj/item/stock_parts/scanning_module{
pixel_x = 2;
@@ -4457,7 +4457,7 @@
/area/template_noop)
"lv" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/turf/open/floor/plasteel/airless/white/side{
dir = 4
},
_maps/RandomZLevels/undergroundoutpost45.dmm
+3 -3
View File
@@ -3735,9 +3735,9 @@
/area/awaymission/undergroundoutpost45/research)
"ik" = (
/obj/structure/table/glass,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/item/stock_parts/matter_bin,
/obj/item/stock_parts/matter_bin,
/turf/open/floor/plasteel/white/side{
_maps/map_files/BoxStation/BoxStation.dmm
+3 -3
View File
@@ -25912,10 +25912,10 @@
/turf/open/floor/plasteel/white,
/area/science/lab)
"bnl" = (
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/structure/table/glass,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/item/stock_parts/matter_bin,
/obj/item/stock_parts/matter_bin,
/obj/machinery/light{
_maps/map_files/Deltastation/DeltaStation2.dmm
+17 -17
View File
@@ -3164,7 +3164,7 @@
name = "dust"
},
/obj/structure/frame/computer,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/turf/open/floor/plasteel/whitepurple/side{
dir = 8
},
@@ -7652,8 +7652,8 @@
},
/obj/item/stack/cable_coil/white,
/obj/item/stack/cable_coil/white,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/item/circuitboard/machine/microwave,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/electronic_marketing_den)
@@ -43446,9 +43446,9 @@
/obj/structure/table/reinforced,
/obj/item/folder/white,
/obj/item/stock_parts/cell/high,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -61739,7 +61739,7 @@
/obj/item/clipboard,
/obj/item/folder/blue,
/obj/item/electronics/firelock,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/maintenance/port)
@@ -75440,7 +75440,7 @@
/obj/structure/table,
/obj/item/clipboard,
/obj/item/electronics/airlock,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/item/device/assembly/signaler,
/obj/machinery/airalarm{
dir = 1;
@@ -79144,9 +79144,9 @@
/obj/structure/table/reinforced,
/obj/item/folder/white,
/obj/item/stock_parts/cell/high,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/structure/cable/white{
icon_state = "0-4"
},
@@ -84059,9 +84059,9 @@
/obj/structure/table/reinforced,
/obj/item/folder/white,
/obj/item/stock_parts/cell/high,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/science/research/abandoned)
@@ -86074,7 +86074,7 @@
/area/science/research/abandoned)
"dus" = (
/obj/structure/table/reinforced,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/item/stock_parts/micro_laser,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery,
@@ -87643,7 +87643,7 @@
/obj/item/clipboard,
/obj/item/folder/yellow,
/obj/item/electronics/firealarm,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/hallway/secondary/construction)
@@ -90494,7 +90494,7 @@
"dDk" = (
/obj/structure/frame/machine,
/obj/machinery/light/small,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/science/research/abandoned)
_maps/map_files/MetaStation/MetaStation.dmm
+5 -5
View File
@@ -50277,7 +50277,7 @@
/area/science/research)
"caA" = (
/obj/structure/table,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/item/electronics/airlock,
/obj/item/device/assembly/timer{
pixel_x = -4;
@@ -52868,7 +52868,7 @@
"cfC" = (
/obj/item/trash/pistachios,
/obj/structure/closet,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/item/extinguisher,
/obj/item/storage/belt/utility,
/turf/open/floor/plating,
@@ -56852,9 +56852,9 @@
/area/science/lab)
"cnW" = (
/obj/structure/table,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/item/stock_parts/cell/high{
charge = 100;
maxcharge = 15000
_maps/map_files/OmegaStation/OmegaStation.dmm
+5 -5
View File
@@ -24721,9 +24721,9 @@
/obj/structure/table/reinforced,
/obj/item/folder/white,
/obj/item/stock_parts/cell/high,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -25197,8 +25197,8 @@
/obj/structure/table/wood,
/obj/item/stack/cable_coil/white,
/obj/item/stack/cable_coil/white,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/item/circuitboard/machine/microwave,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
_maps/map_files/PubbyStation/PubbyStation.dmm
+4 -4
View File
@@ -32699,8 +32699,8 @@
/area/science/lab)
"bAq" = (
/obj/structure/table,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/item/stock_parts/capacitor,
/obj/item/stock_parts/capacitor,
/obj/item/stock_parts/manipulator,
@@ -47954,8 +47954,8 @@
/area/tcommsat/server)
"cnw" = (
/obj/structure/table,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/item/stock_parts/micro_laser,
/obj/item/stock_parts/micro_laser,
/turf/open/floor/plasteel/dark/telecomms,
_maps/shuttles/whiteship_delta.dmm
+1 -1
View File
@@ -1413,7 +1413,7 @@
name = "dust"
},
/obj/structure/frame/computer,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/turf/open/floor/plasteel/whitepurple/side{
dir = 8
},