Add ore silo examine message, add it to runtimestation (#39792)

I added an examine message to the ore silo:

    [src] can be linked to techfabs, circuit printers and protolathes with a
    multitool.

Also added it to runtimestation, which required me to expand the area a little.
This commit is contained in:
81Denton
2018-08-21 08:24:36 +02:00
committed by Tad Hardesty
parent 89a3e26ecd
commit 7a52e44b0d
2 changed files with 213 additions and 161 deletions

View File

@@ -39,15 +39,6 @@
"ak" = ( "ak" = (
/turf/closed/wall/r_wall, /turf/closed/wall/r_wall,
/area/engine/gravity_generator) /area/engine/gravity_generator)
"al" = (
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/obj/structure/closet/secure_closet/atmospherics{
locked = 0
},
/turf/open/floor/plating,
/area/engine/atmos)
"am" = ( "am" = (
/obj/machinery/atmospherics/components/unary/tank/air, /obj/machinery/atmospherics/components/unary/tank/air,
/turf/open/floor/plating, /turf/open/floor/plating,
@@ -257,10 +248,6 @@
dir = 4 dir = 4
}, },
/area/engine/gravity_generator) /area/engine/gravity_generator)
"aM" = (
/obj/machinery/suit_storage_unit/ce,
/turf/open/floor/plating,
/area/engine/atmos)
"aN" = ( "aN" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{ /obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 4 dir = 4
@@ -374,12 +361,6 @@
}, },
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/engine/gravity_generator) /area/engine/gravity_generator)
"aZ" = (
/obj/structure/tank_dispenser{
pixel_x = -1
},
/turf/open/floor/plating,
/area/engine/atmos)
"ba" = ( "ba" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plating, /turf/open/floor/plating,
@@ -438,24 +419,12 @@
dir = 8 dir = 8
}, },
/area/engine/gravity_generator) /area/engine/gravity_generator)
"bj" = (
/obj/machinery/power/apc{
dir = 8;
pixel_x = -24
},
/obj/structure/cable{
icon_state = "0-2"
},
/obj/machinery/light,
/obj/structure/table,
/obj/item/analyzer,
/obj/item/wrench,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bk" = ( "bk" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ /obj/machinery/atmospherics/pipe/simple/supply/hidden,
dir = 8 /obj/structure/cable{
icon_state = "1-2"
}, },
/obj/machinery/door/airlock,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/engine/atmos) /area/engine/atmos)
"bl" = ( "bl" = (
@@ -471,13 +440,6 @@
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
/area/engine/atmos) /area/engine/atmos)
"bn" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
/obj/machinery/light,
/turf/open/floor/plating,
/area/engine/atmos)
"bo" = ( "bo" = (
/obj/structure/table, /obj/structure/table,
/obj/item/screwdriver/power, /obj/item/screwdriver/power,
@@ -507,16 +469,22 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/engine/gravity_generator) /area/engine/gravity_generator)
"bs" = ( "bs" = (
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/obj/machinery/rnd/destructive_analyzer,
/turf/open/floor/plasteel,
/area/science)
"bt" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable{ /obj/structure/cable{
icon_state = "1-2" icon_state = "1-2"
}, },
/turf/closed/wall/r_wall, /obj/structure/cable{
/area/hallway/primary/central) icon_state = "2-4"
"bt" = ( },
/obj/machinery/door/airlock,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/engine/atmos) /area/science)
"bu" = ( "bu" = (
/turf/closed/wall/r_wall, /turf/closed/wall/r_wall,
/area/bridge) /area/bridge)
@@ -543,18 +511,7 @@
/turf/closed/wall/r_wall, /turf/closed/wall/r_wall,
/area/science) /area/science)
"bB" = ( "bB" = (
/obj/machinery/power/apc{ /obj/machinery/mecha_part_fabricator,
dir = 8;
pixel_x = -24
},
/obj/structure/cable,
/obj/structure/cable{
icon_state = "0-2"
},
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/obj/machinery/autolathe/hacked,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/science) /area/science)
"bC" = ( "bC" = (
@@ -564,10 +521,6 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/security/brig) /area/security/brig)
"bD" = ( "bD" = (
/obj/machinery/light{
dir = 1
},
/obj/machinery/mecha_part_fabricator,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/science) /area/science)
"bE" = ( "bE" = (
@@ -729,19 +682,14 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/hallway/primary/central) /area/hallway/primary/central)
"ca" = ( "ca" = (
/obj/structure/cable{ /obj/machinery/autolathe/hacked,
icon_state = "1-4"
},
/obj/structure/cable{
icon_state = "2-4"
},
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/science) /area/science)
"cb" = ( "cb" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable{
icon_state = "1-4"
},
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/science) /area/science)
"cc" = ( "cc" = (
@@ -825,15 +773,11 @@
"cm" = ( "cm" = (
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/medical/medbay) /area/medical/medbay)
"cn" = (
/obj/machinery/door/airlock,
/turf/open/floor/plating,
/area/medical/medbay)
"co" = ( "co" = (
/obj/machinery/light{ /obj/machinery/light{
dir = 4 dir = 4
}, },
/obj/structure/closet/syndicate/resources/everything, /obj/machinery/ore_silo,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/science) /area/science)
"cp" = ( "cp" = (
@@ -1104,9 +1048,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/security/brig) /area/security/brig)
"dg" = ( "dg" = (
/obj/machinery/airalarm/unlocked{ /obj/machinery/airalarm/directional/east,
pixel_x = 32
},
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/security/brig) /area/security/brig)
"dh" = ( "dh" = (
@@ -2069,11 +2011,7 @@
"fI" = ( "fI" = (
/obj/machinery/door/airlock, /obj/machinery/door/airlock,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/hallway/secondary/entry) /area/maintenance/aft)
"fJ" = (
/obj/machinery/door/airlock,
/turf/open/floor/plating,
/area/hallway/secondary/exit/departure_lounge)
"fK" = ( "fK" = (
/obj/structure/cable{ /obj/structure/cable{
icon_state = "4-8" icon_state = "4-8"
@@ -2164,6 +2102,9 @@
/area/hallway/secondary/exit/departure_lounge) /area/hallway/secondary/exit/departure_lounge)
"fT" = ( "fT" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/science) /area/science)
"fU" = ( "fU" = (
@@ -2502,6 +2443,9 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{ /obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8 dir = 8
}, },
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/science) /area/science)
"hD" = ( "hD" = (
@@ -2516,22 +2460,28 @@
/area/medical/chemistry) /area/medical/chemistry)
"jb" = ( "jb" = (
/obj/machinery/door/airlock, /obj/machinery/door/airlock,
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/science) /area/science)
"jE" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
/turf/open/floor/plating,
/area/engine/atmos)
"jU" = ( "jU" = (
/obj/structure/table, /obj/structure/table,
/obj/item/melee/transforming/energy/axe, /obj/item/melee/transforming/energy/axe,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/storage/primary) /area/storage/primary)
"kn" = ( "kn" = (
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/light{ /obj/machinery/light{
dir = 1 dir = 1
}, },
/obj/structure/cable{ /obj/structure/cable{
icon_state = "1-4" icon_state = "2-4"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/primary/central) /area/hallway/primary/central)
@@ -2546,6 +2496,9 @@
dir = 1; dir = 1;
pixel_y = 25 pixel_y = 25
}, },
/obj/structure/cable{
icon_state = "0-4"
},
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/primary/central) /area/hallway/primary/central)
"lg" = ( "lg" = (
@@ -2568,6 +2521,10 @@
/obj/item/storage/toolbox/syndicate, /obj/item/storage/toolbox/syndicate,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/storage/primary) /area/storage/primary)
"ou" = (
/obj/machinery/airalarm/directional/west,
/turf/open/floor/plating,
/area/engine/atmos)
"oV" = ( "oV" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4 dir = 4
@@ -2592,6 +2549,10 @@
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/medical/chemistry) /area/medical/chemistry)
"qb" = (
/obj/machinery/door/airlock,
/turf/open/floor/plating,
/area/engine/atmos)
"qn" = ( "qn" = (
/obj/structure/cable{ /obj/structure/cable{
icon_state = "0-2" icon_state = "0-2"
@@ -2603,6 +2564,21 @@
/obj/structure/cable, /obj/structure/cable,
/turf/open/floor/plating/airless, /turf/open/floor/plating/airless,
/area/space/nearstation) /area/space/nearstation)
"ut" = (
/obj/structure/closet/secure_closet/atmospherics{
locked = 0
},
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plating,
/area/engine/atmos)
"vf" = (
/turf/open/floor/plasteel,
/area/space)
"vm" = (
/turf/closed/wall/r_wall,
/area/maintenance/aft)
"vv" = ( "vv" = (
/obj/machinery/door/airlock, /obj/machinery/door/airlock,
/turf/open/floor/plating, /turf/open/floor/plating,
@@ -2634,11 +2610,17 @@
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/primary/central) /area/hallway/primary/central)
"zo" = (
/obj/machinery/power/apc/auto_name/south,
/obj/structure/cable{
icon_state = "0-8"
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"AP" = ( "AP" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8 dir = 8
}, },
/obj/machinery/rnd/production/techfab/department,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/science) /area/science)
"Bl" = ( "Bl" = (
@@ -2669,7 +2651,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/medical/chemistry) /area/medical/chemistry)
"Ct" = ( "Ct" = (
/obj/machinery/rnd/production/circuit_imprinter/department, /obj/structure/closet/syndicate/resources/everything,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/science) /area/science)
"CV" = ( "CV" = (
@@ -2685,18 +2667,18 @@
}, },
/turf/open/floor/plasteel/blue/side, /turf/open/floor/plasteel/blue/side,
/area/bridge) /area/bridge)
"If" = ( "ES" = (
/obj/structure/cable{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
icon_state = "1-2" dir = 4
},
/obj/structure/cable{
icon_state = "1-8"
}, },
/obj/machinery/rnd/destructive_analyzer,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/science) /area/hallway/primary/central)
"In" = ( "If" = (
/obj/structure/cable{ /obj/machinery/rnd/production/techfab/department,
icon_state = "1-2" /turf/open/floor/plasteel,
},
/turf/closed/wall/r_wall,
/area/science) /area/science)
"Iy" = ( "Iy" = (
/obj/structure/closet/secure_closet/RD{ /obj/structure/closet/secure_closet/RD{
@@ -2710,14 +2692,32 @@
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/medical/chemistry) /area/medical/chemistry)
"Kx" = (
/obj/structure/table,
/obj/item/analyzer,
/obj/item/wrench,
/obj/machinery/light,
/turf/open/floor/plating,
/area/engine/atmos)
"Ly" = ( "Ly" = (
/obj/machinery/chem_dispenser/chem_synthesizer, /obj/machinery/chem_dispenser/chem_synthesizer,
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/medical/chemistry) /area/medical/chemistry)
"MY" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable{
icon_state = "2-4"
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"NZ" = ( "NZ" = (
/obj/machinery/rnd/production/protolathe/department, /obj/machinery/rnd/production/protolathe/department,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/science) /area/science)
"OU" = (
/obj/item/disk/tech_disk/debug,
/turf/open/floor/plasteel,
/area/science)
"PI" = ( "PI" = (
/obj/structure/fans/tiny/invisible, /obj/structure/fans/tiny/invisible,
/turf/open/space/basic, /turf/open/space/basic,
@@ -2729,6 +2729,10 @@
/obj/machinery/door/airlock/external/glass, /obj/machinery/door/airlock/external/glass,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/medical/medbay) /area/medical/medbay)
"Rb" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/maintenance/aft)
"RC" = ( "RC" = (
/obj/machinery/power/rtg/advanced, /obj/machinery/power/rtg/advanced,
/obj/structure/cable{ /obj/structure/cable{
@@ -2736,17 +2740,13 @@
}, },
/turf/open/floor/plating/airless, /turf/open/floor/plating/airless,
/area/space/nearstation) /area/space/nearstation)
"RY" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/item/disk/tech_disk/debug,
/turf/open/floor/plasteel,
/area/science)
"Sj" = ( "Sj" = (
/obj/structure/table/optable, /obj/structure/table/optable,
/turf/open/floor/plasteel/arrival, /turf/open/floor/plasteel/arrival,
/area/medical/medbay) /area/medical/medbay)
"Tt" = (
/turf/open/floor/plating,
/area/maintenance/aft)
"Ut" = ( "Ut" = (
/obj/structure/closet/secure_closet/medical3{ /obj/structure/closet/secure_closet/medical3{
locked = 0 locked = 0
@@ -2771,6 +2771,10 @@
/obj/structure/fans/tiny, /obj/structure/fans/tiny,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/engine/engineering) /area/engine/engineering)
"Wh" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/engine/atmos)
"WT" = ( "WT" = (
/obj/structure/cable{ /obj/structure/cable{
icon_state = "4-8" icon_state = "4-8"
@@ -2787,6 +2791,50 @@
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/medical/chemistry) /area/medical/chemistry)
"Xp" = (
/obj/machinery/light,
/obj/structure/tank_dispenser{
pixel_x = -1
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"XC" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/structure/cable{
icon_state = "2-8"
},
/turf/open/floor/plasteel,
/area/science)
"XR" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
/turf/open/floor/plating,
/area/engine/atmos)
"XU" = (
/obj/machinery/atmospherics/components/unary/tank/air,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plating,
/area/engine/atmos)
"Yy" = (
/obj/machinery/light{
dir = 1
},
/obj/machinery/rnd/production/circuit_imprinter/department,
/obj/machinery/power/apc/auto_name/north,
/obj/structure/cable{
icon_state = "0-8"
},
/turf/open/floor/plasteel,
/area/science)
"ZD" = (
/obj/machinery/suit_storage_unit/ce,
/turf/open/floor/plasteel,
/area/engine/atmos)
(1,1,1) = {" (1,1,1) = {"
aa aa
@@ -6021,10 +6069,9 @@ aa
aa aa
aa aa
aa aa
ad
dH
ah ah
ah ah
qb
ah ah
ah ah
ah ah
@@ -6033,6 +6080,7 @@ ah
bA bA
bA bA
bA bA
gd
bA bA
bZ bZ
ft ft
@@ -6113,19 +6161,19 @@ aa
aa aa
aa aa
aa aa
ad
af
ah ah
al ut
aw aw
aM ou
aZ aw
bj aw
Kx
ah
bs bs
bB bB
ca ca
If If
In bA
kn kn
fu fu
bO bO
@@ -6143,8 +6191,8 @@ dy
dm dm
dK dK
cN cN
af Tt
ad vm
fg fg
aa aa
aa aa
@@ -6205,13 +6253,13 @@ aa
aa aa
aa aa
aa aa
ad
af
ah ah
am am
ax ax
aw aw
ba ba
jE
MY
bk bk
bt bt
fT fT
@@ -6235,8 +6283,8 @@ dn
dn dn
dL dL
cN cN
af Tt
ad vm
fg fg
aa aa
aa aa
@@ -6297,20 +6345,20 @@ aa
aa aa
aa aa
aa aa
ad
af
ah ah
dS dS
ay ay
aN aN
bb bb
bl bl
zo
ah ah
Yy
bD bD
cc XC
gY gY
jb jb
cA ES
bE bE
bE bE
cQ cQ
@@ -6327,8 +6375,8 @@ dn
dn dn
dL dL
cN cN
af Tt
ad vm
fg fg
aa aa
aa aa
@@ -6389,16 +6437,16 @@ aa
aa aa
aa aa
aa aa
ad
af
ah ah
am am
ay ay
aO aO
bc bc
bm bm
ZD
ah ah
bF bF
OU
cc cc
Ct Ct
gd gd
@@ -6419,8 +6467,8 @@ dn
dn dn
dL dL
cN cN
af Tt
ad vm
fg fg
aa aa
aa aa
@@ -6481,22 +6529,22 @@ aa
aa aa
aa aa
aa aa
ad
af
ah ah
am XU
az az
aP aP
aP aP
bn XR
Xp
ah ah
NZ NZ
RY bD
cc
co co
bA bA
wS wS
bE bE
bE vf
cN cN
dW dW
dn dn
@@ -6511,8 +6559,8 @@ dn
dn dn
dL dL
cN cN
af Tt
ad vm
fg fg
aa aa
aa aa
@@ -6573,11 +6621,11 @@ aa
aa aa
aa aa
aa aa
ad ah
bY Wh
ah
ah ah
ah ah
Wh
ah ah
ah ah
ah ah
@@ -6603,8 +6651,8 @@ dn
dn dn
dL dL
cN cN
af Tt
ad vm
fg fg
aa aa
aa aa
@@ -6695,8 +6743,8 @@ dn
dn dn
dZ dZ
cN cN
af Tt
bY Rb
fg fg
aa aa
aa aa
@@ -6787,8 +6835,8 @@ dn
dn dn
dL dL
cN cN
af Tt
bY Rb
fg fg
aa aa
aa aa
@@ -6879,8 +6927,8 @@ dn
dn dn
dL dL
cN cN
af Tt
bY Rb
fg fg
aa aa
aa aa
@@ -6971,8 +7019,8 @@ dn
dn dn
dL dL
cN cN
af Tt
bY Rb
fg fg
aa aa
aa aa
@@ -7063,8 +7111,8 @@ dn
dn dn
dL dL
cN cN
af Tt
bY Rb
fg fg
aa aa
aa aa
@@ -7155,8 +7203,8 @@ dz
do do
dM dM
cN cN
af Tt
bY Rb
fg fg
aa aa
aa aa
@@ -7247,7 +7295,7 @@ cS
cS cS
cS cS
cS cS
fJ fI
ga ga
ga ga
ga ga
@@ -8515,7 +8563,7 @@ ak
ak ak
by by
by by
cn dH
by by
Qt Qt
by by

View File

@@ -180,6 +180,10 @@ GLOBAL_LIST_EMPTY(silo_access_logs)
updateUsrDialog() updateUsrDialog()
flick("silo_active", src) flick("silo_active", src)
/obj/machinery/ore_silo/examine(mob/user)
..()
to_chat(user, "<span class='notice'>[src] can be linked to techfabs, circuit printers and protolathes with a multitool.</span>")
/datum/ore_silo_log /datum/ore_silo_log
var/name // for VV var/name // for VV
var/formatted // for display var/formatted // for display