cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-08-28 07:26:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #702 from ArchieBeepBoop/idbullshitpart3

Browse Source 
Cleaning up ID Console code and other tweaks - The "I want to die" edition
This commit is contained in:
Dahlular
2020-11-21 23:00:50 -07:00
committed by GitHub
parent f7bd548da6 1b529c1ca1
commit fa5e05c44c
38 changed files with 581 additions and 716 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
+1
View File
@@ -62592,6 +62592,7 @@
/obj/effect/turf_decal/tile/brown{
dir = 1
},
/obj/machinery/computer/card/minor/qm,
/turf/open/floor/plasteel/dark,
/area/quartermaster/qm)
"tDj" = (
_maps/map_files/Deltastation/DeltaStation2.dmm
+3 -1
View File
@@ -27550,7 +27550,6 @@
/turf/open/floor/plasteel,
/area/quartermaster/qm)
"aZh" = (
/obj/structure/table/reinforced,
/obj/machinery/light{
dir = 4
},
@@ -27561,6 +27560,9 @@
/obj/effect/turf_decal/tile/brown{
dir = 8
},
/obj/machinery/computer/card/minor/qm{
dir = 8
},
/turf/open/floor/plasteel,
/area/quartermaster/qm)
"aZi" = (
_maps/map_files/PubbyStation/PubbyStation.dmm
+3 -3
View File
@@ -687,7 +687,7 @@
"ank" = (/obj/machinery/computer/card/minor/hos{dir = 8},/turf/open/floor/carpet,/area/crew_quarters/heads/hos)
"anl" = (/obj/structure/transit_tube/diagonal,/turf/open/space/basic,/area/space/nearstation)
"anm" = (/obj/machinery/door/airlock/maintenance/abandoned{name = "Pete's Speakeasy"; req_access_txt = "0"},/turf/open/floor/plating,/area/maintenance/department/crew_quarters/dorms)
"ann" = (/obj/structure/table,/obj/machinery/requests_console{department = "Cargo Bay"; departmentType = 2; pixel_x = -30},/obj/item/paper_bin{layer = 2.9},/obj/item/pen,/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/obj/item/book/lorebooks/welcome_to_kinaris,/turf/open/floor/plasteel,/area/quartermaster/qm)
"ann" = (/obj/structure/table,/obj/machinery/requests_console{department = "Cargo Bay"; departmentType = 2; pixel_x = -30},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/obj/machinery/computer/card/minor/qm{dir = 1},/turf/open/floor/plasteel,/area/quartermaster/qm)
"ano" = (/obj/machinery/button/door{desc = "A remote control-switch for the engineering security doors."; id = "Engineering"; name = "Engineering Lockdown"; pixel_x = -24; pixel_y = -10; req_access_txt = "10"},/obj/machinery/button/door{desc = "A remote control-switch for secure storage."; id = "Secure Storage"; name = "Engineering Secure Storage"; pixel_x = -24; req_access_txt = "11"},/obj/machinery/button/door{id = "atmos"; name = "Atmospherics Lockdown"; pixel_x = -24; pixel_y = 10; req_access_txt = "24"},/obj/structure/table/reinforced,/obj/item/folder/yellow,/obj/item/paper/monitorkey,/obj/item/pen,/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/item/book/lorebooks/welcome_to_kinaris,/mob/living/simple_animal/parrot/Poly,/turf/open/floor/plasteel,/area/crew_quarters/heads/chief)
"anp" = (/obj/structure/closet/secure_closet/personal,/obj/item/toy/poolnoodle/red,/obj/item/toy/poolnoodle/yellow,/obj/item/toy/poolnoodle/blue,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/turf/open/floor/plasteel,/area/crew_quarters/fitness/pool)
"anq" = (/obj/structure/grille/broken,/turf/open/floor/plating,/area/maintenance/department/security/brig)
@@ -2943,7 +2943,7 @@
"beG" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/camera{c_tag = "Bar Starboard"; dir = 1},/obj/machinery/light{light_color = "#c9d3e8"},/turf/open/floor/plasteel/dark,/area/crew_quarters/bar)
"beH" = (/obj/machinery/disposal/bin,/obj/structure/disposalpipe/trunk{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/crew_quarters/bar)
"beI" = (/turf/closed/wall,/area/science/robotics/mechbay)
"beJ" = (/obj/structure/filingcabinet,/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 8},/obj/machinery/keycard_auth{pixel_x = -23; pixel_y = 0},/turf/open/floor/plasteel,/area/quartermaster/qm)
"beJ" = (/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 8},/obj/machinery/keycard_auth{pixel_x = -23; pixel_y = 0},/turf/open/floor/plasteel,/area/quartermaster/qm)
"beK" = (/obj/structure/chair/office/dark{dir = 4},/obj/effect/landmark/start/quartermaster,/turf/open/floor/plasteel,/area/quartermaster/qm)
"beL" = (/obj/machinery/computer/cargo{dir = 8},/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 4},/turf/open/floor/plasteel,/area/quartermaster/qm)
"beM" = (/obj/machinery/mineral/equipment_vendor,/obj/effect/turf_decal/tile/brown{dir = 1},/turf/open/floor/plasteel,/area/quartermaster/miningdock)
@@ -2988,7 +2988,7 @@
"bfz" = (/turf/open/floor/plasteel/dark,/area/science/robotics/mechbay)
"bfA" = (/obj/machinery/computer/mech_bay_power_console,/obj/structure/cable{icon_state = "0-2"},/turf/open/floor/plasteel/dark,/area/science/robotics/mechbay)
"bfB" = (/obj/effect/turf_decal/tile/red{dir = 8},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red,/turf/open/floor/plasteel,/area/security/range)
"bfC" = (/obj/structure/table,/obj/item/clipboard,/obj/machinery/light,/obj/machinery/camera{c_tag = "Cargo Quartermaster's Office"; dir = 1},/obj/machinery/light_switch{pixel_y = -24},/obj/item/cartridge/quartermaster{pixel_x = 6; pixel_y = 5},/obj/item/cartridge/quartermaster,/obj/item/cartridge/quartermaster{pixel_x = -4; pixel_y = 7},/obj/item/coin/silver,/obj/item/stamp/qm,/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel,/area/quartermaster/qm)
"bfC" = (/obj/structure/table,/obj/item/clipboard,/obj/machinery/light,/obj/machinery/camera{c_tag = "Cargo Quartermaster's Office"; dir = 1},/obj/machinery/light_switch{pixel_y = -24},/obj/item/cartridge/quartermaster{pixel_x = 6; pixel_y = 5},/obj/item/cartridge/quartermaster,/obj/item/cartridge/quartermaster{pixel_x = -4; pixel_y = 7},/obj/item/coin/silver,/obj/item/stamp/qm,/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/obj/item/paper_bin{layer = 2.9},/obj/item/pen,/turf/open/floor/plasteel,/area/quartermaster/qm)
"bfD" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -35},/obj/machinery/computer/security/qm{dir = 8},/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel,/area/quartermaster/qm)
"bfE" = (/obj/structure/rack,/obj/item/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/item/pickaxe{pixel_x = 5},/obj/item/shovel{pixel_x = -5},/obj/machinery/camera{c_tag = "Cargo Mining Dock"; dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/turf/open/floor/plasteel,/area/quartermaster/miningdock)
"bfF" = (/obj/structure/cable{icon_state = "1-2"},/obj/effect/landmark/start/shaft_miner,/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/open/floor/plasteel,/area/quartermaster/miningdock)