Grants the common man access to some parts of the lavaland mining base (#44769)

* will this work?

* add shuttle console to meta

* add shuttle console to box

* remove glide size from box, add shuttle console to delta

* replace airlocks in lavaland common area

* remove step

* secure the gulag a bit more, add a beer fridge

* restore unix line endings?

* Update code/game/objects/structures/crates_lockers/closets/secure/freezer.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* review
This commit is contained in:
vuonojenmustaturska
2019-06-26 14:52:19 -04:00
committed by Emmett Gaines
co-authored by Emmett Gaines
parent 29f419c855
commit 867aca7abf
11 changed files with 1190 additions and 552 deletions
+5 -1
View File
@@ -22630,6 +22630,9 @@
dir = 1
},
/obj/effect/turf_decal/stripes/line,
/obj/machinery/computer/shuttle/mining/common{
dir = 1
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bgj" = (
@@ -47139,7 +47142,8 @@
height = 22;
id = "whiteship_home";
name = "SS13: Auxiliary Dock, Station-Port";
width = 35
width = 35;
roundstart_template = /datum/map_template/shuttle/mining_common/meta
},
/turf/open/space/basic,
/area/space)
+11 -2
View File
@@ -1569,7 +1569,8 @@
height = 22;
id = "whiteship_home";
name = "SS13: Auxiliary Dock, Station-Fore";
width = 35
width = 35;
roundstart_template = /datum/map_template/shuttle/mining_common/meta
},
/turf/open/space/basic,
/area/space)
@@ -116757,6 +116758,14 @@
/obj/machinery/door/poddoor/incinerator_toxmix,
/turf/open/floor/engine/vacuum,
/area/science/mixing/chamber)
"sDV" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery,
/obj/machinery/computer/shuttle/mining/common{
dir = 4
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"sJw" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -149639,7 +149648,7 @@ aec
aaO
aeR
aft
aeb
sDV
agj
aaO
aej
+12 -2
View File
@@ -70053,6 +70053,15 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/construction/mining/aux_base)
"cWS" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/obj/machinery/computer/shuttle/mining/common{
dir = 4
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"cXc" = (
/obj/machinery/light/small{
dir = 8
@@ -75569,7 +75578,8 @@
height = 22;
id = "whiteship_home";
name = "SS13: Auxiliary Dock, Station-Port";
width = 35
width = 35;
roundstart_template = /datum/map_template/shuttle/mining_common/meta
},
/turf/open/space/basic,
/area/space)
@@ -85774,7 +85784,7 @@ aaa
aaa
aVs
bKS
aWT
cWS
aVs
aVs
aVs
File diff suppressed because it is too large Load Diff
+124
View File
@@ -0,0 +1,124 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/mining)
"b" = (
/obj/effect/spawner/structure/window/shuttle,
/turf/open/floor/plating,
/area/shuttle/mining)
"c" = (
/obj/structure/table,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/mining)
"d" = (
/obj/machinery/computer/shuttle/mining/common,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/mining)
"e" = (
/turf/open/floor/mineral/titanium,
/area/shuttle/mining)
"f" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/mining)
"g" = (
/obj/machinery/light{
dir = 8
},
/turf/open/floor/mineral/titanium,
/area/shuttle/mining)
"h" = (
/obj/machinery/door/airlock/titanium{
name = "Lavaland Shuttle Airlock"
},
/obj/docking_port/mobile{
dir = 8;
dwidth = 3;
height = 5;
id = "mining_common";
name = "lavaland shuttle";
port_direction = 4;
width = 7
},
/turf/open/floor/plating,
/area/shuttle/mining)
"i" = (
/obj/structure/closet/crate,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/mining)
"j" = (
/obj/structure/shuttle/engine/heater,
/obj/structure/window/reinforced{
dir = 1;
layer = 2.9
},
/obj/structure/window/reinforced{
dir = 8
},
/obj/structure/window/reinforced{
dir = 4
},
/turf/open/floor/plating,
/area/shuttle/mining)
"k" = (
/obj/structure/ore_box,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/mining)
"l" = (
/obj/structure/shuttle/engine/propulsion/burst,
/turf/open/floor/plating/airless,
/area/shuttle/mining)
"Q" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium,
/area/shuttle/mining)
(1,1,1) = {"
a
a
b
a
b
a
a
"}
(2,1,1) = {"
a
c
e
g
f
i
a
"}
(3,1,1) = {"
b
d
Q
e
f
j
l
"}
(4,1,1) = {"
a
c
e
e
f
k
a
"}
(5,1,1) = {"
a
a
b
h
b
a
a
"}
+8
View File
@@ -124,6 +124,10 @@
port_id = "mining"
can_be_bought = FALSE
/datum/map_template/shuttle/mining_common
port_id = "mining_common"
can_be_bought = FALSE
/datum/map_template/shuttle/cargo
port_id = "cargo"
can_be_bought = FALSE
@@ -522,6 +526,10 @@
suffix = "kilo"
name = "labour shuttle (Kilo)"
/datum/map_template/shuttle/mining_common/meta
suffix = "meta"
name = "lavaland shuttle (Meta)"
/datum/map_template/shuttle/arrival/delta
suffix = "delta"
name = "arrival shuttle (Delta)"
@@ -312,6 +312,10 @@
name = "Mining Shuttle (Computer Board)"
build_path = /obj/machinery/computer/shuttle/mining
/obj/item/circuitboard/computer/mining_shuttle/common
name = "Lavaland Shuttle (Computer Board)"
build_path = /obj/machinery/computer/shuttle/mining/common
/obj/item/circuitboard/computer/white_ship
name = "White Ship (Computer Board)"
build_path = /obj/machinery/computer/shuttle/white_ship
@@ -49,6 +49,13 @@
req_access = null
locked = FALSE
/obj/structure/closet/secure_closet/freezer/gulag_fridge
name = "refrigerator"
/obj/structure/closet/secure_closet/freezer/gulag_fridge/PopulateContents()
..()
for(var/i in 1 to 3)
new /obj/item/reagent_containers/food/drinks/beer/light(src)
/obj/structure/closet/secure_closet/freezer/fridge
name = "refrigerator"
@@ -310,3 +310,17 @@
..()
for(var/i in 1 to 3)
new /obj/item/storage/box/lethalshot(src)
/obj/structure/closet/secure_closet/labor_camp_security
name = "labor camp security locker"
req_access = list(ACCESS_SECURITY)
icon_state = "sec"
/obj/structure/closet/secure_closet/labor_camp_security/PopulateContents()
..()
new /obj/item/clothing/suit/armor/vest(src)
new /obj/item/clothing/head/helmet/sec(src)
new /obj/item/clothing/under/rank/security(src)
new /obj/item/clothing/under/rank/security/skirt(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
new /obj/item/flashlight/seclite(src)
+8
View File
@@ -82,6 +82,14 @@
return
. = ..()
/obj/machinery/computer/shuttle/mining/common
name = "lavaland shuttle console"
desc = "Used to call and send the lavaland shuttle."
circuit = /obj/item/circuitboard/computer/mining_shuttle/common
shuttleId = "mining_common"
possible_destinations = "whiteship_home;lavaland_common_away;landing_zone_dock;mining_public"
/**********************Mining car (Crate like thing, not the rail car)**************************/
/obj/structure/closet/crate/miningcar
+3 -3
View File
@@ -202,7 +202,7 @@
roundstart_template = SSmapping.shuttle_templates[sid]
if(!roundstart_template)
CRASH("Invalid path ([roundstart_template]) passed to docking port.")
CRASH("Invalid path ([sid]/[roundstart_template]) passed to docking port.")
if(roundstart_template)
SSshuttle.action_load(roundstart_template, src)
@@ -786,8 +786,8 @@
current_engines = max(0,current_engines + mod)
if(in_flight())
var/delta_coeff = engine_coeff / old_coeff
modTimer(delta_coeff)
modTimer(delta_coeff)
/obj/docking_port/mobile/proc/count_engines()
. = 0
for(var/thing in shuttle_areas)