mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-20 20:45:28 +01:00
Refactor lighting items that use fuel (#72146)
## About The Pull Request Fixes #71826 This does the following: - Makes candles a subtype of flare - Fixes candles having lighting inconsistencies - Fixes burning items (welder, candles, flares, etc.) not causing ignition effects when held in hand - Adds burnt flares and melted candles to maint loot and trash spawners - Add match lighting sound when candles are lit - Add time defines for fuel amounts and rounded them (ex. instead of 32.3333 minutes, it's now 35 minutes) - Light sources that burn will now spawn a trash item once fuel is spent - Light sources that burn now have a welder hitsound - Light sources that burn can now be extinguished by a fire extinguisher (except flares) - Light sources that burn can now be used to ignite another object on fire (ex. a lit candle can be used to light a cigarette) - Light sources that burn and are lit now do `BURN` damage while attacking ## Why It's Good For The Game Code is more cleaner and consistent. Also fixes some bugs. ## Changelog 🆑 soundadd: Candles will now use the match lighting sound when lit soundadd: Light sources that burn will now have a welding hitsound fix: Fix candle light behaving erratically fix: Fix burning items that are held in hand will now have an ignition effect on the turf. (ex. lit welders in hand will now ignite plasma in the air) balance: Light sources that burn and are lit now do `BURN` damage while attacking balance: Light sources fuel amounts were rounded to exact numbers (ex. instead of 32.3333 minutes, it's now 35 minutes) qol: Light items that burn can now be extinguished by a fire extinguisher (except flares), used to ignite another object on fire, and will now leave a trash item once fuel is used qol: Add burnt flares and melted candles to trash spawners refactor: Refactor lighting items that use fuel to be more robust /🆑 Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
This commit is contained in:
Tim
@@ -128,7 +128,7 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/candle{
|
||||
/obj/item/flashlight/flare/candle{
|
||||
pixel_x = -8;
|
||||
pixel_y = 13
|
||||
},
|
||||
@@ -191,7 +191,7 @@
|
||||
/obj/item/storage/book/bible{
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/item/candle{
|
||||
/obj/item/flashlight/flare/candle{
|
||||
pixel_x = -10;
|
||||
pixel_y = 5
|
||||
},
|
||||
|
||||
@@ -661,17 +661,6 @@
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/turf/open/floor/iron/large,
|
||||
/area/ruin/plasma_facility/commons)
|
||||
"jb" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/item/storage/box/lights/mixed{
|
||||
pixel_x = 15;
|
||||
pixel_y = 14
|
||||
},
|
||||
/mob/living/basic/frog{
|
||||
name = "Peter Jr."
|
||||
},
|
||||
/turf/open/floor/plating/icemoon,
|
||||
/area/ruin/plasma_facility/operations)
|
||||
"js" = (
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
|
||||
dir = 1
|
||||
@@ -1115,6 +1104,15 @@
|
||||
/obj/machinery/space_heater/improvised_chem_heater,
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/plasma_facility/commons)
|
||||
"pE" = (
|
||||
/obj/structure/bed/maint,
|
||||
/obj/item/bedsheet/dorms,
|
||||
/obj/item/flashlight/flare/candle{
|
||||
pixel_x = 12;
|
||||
pixel_y = 9
|
||||
},
|
||||
/turf/open/floor/plating/icemoon,
|
||||
/area/ruin/plasma_facility/operations)
|
||||
"pR" = (
|
||||
/obj/structure/reagent_dispensers/watertank,
|
||||
/turf/open/floor/plating/icemoon,
|
||||
@@ -1625,15 +1623,6 @@
|
||||
/obj/effect/mapping_helpers/airlock/abandoned,
|
||||
/turf/open/floor/iron/smooth_half,
|
||||
/area/ruin/plasma_facility/operations)
|
||||
"Ak" = (
|
||||
/obj/structure/bed/maint,
|
||||
/obj/item/bedsheet/dorms,
|
||||
/obj/item/candle{
|
||||
pixel_x = 12;
|
||||
pixel_y = 9
|
||||
},
|
||||
/turf/open/floor/plating/icemoon,
|
||||
/area/ruin/plasma_facility/operations)
|
||||
"An" = (
|
||||
/obj/effect/turf_decal/tile/brown/half{
|
||||
dir = 1
|
||||
@@ -2807,6 +2796,17 @@
|
||||
},
|
||||
/turf/open/floor/stone,
|
||||
/area/ruin/plasma_facility/commons)
|
||||
"TE" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/item/storage/box/lights/mixed{
|
||||
pixel_x = 15;
|
||||
pixel_y = 14
|
||||
},
|
||||
/mob/living/basic/frog{
|
||||
name = "Peter Jr."
|
||||
},
|
||||
/turf/open/floor/plating/icemoon,
|
||||
/area/ruin/plasma_facility/operations)
|
||||
"TK" = (
|
||||
/obj/effect/turf_decal/tile/neutral,
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
@@ -3888,7 +3888,7 @@ pd
|
||||
XI
|
||||
Hv
|
||||
SR
|
||||
Ak
|
||||
pE
|
||||
hR
|
||||
oc
|
||||
rs
|
||||
@@ -3958,7 +3958,7 @@ vt
|
||||
hR
|
||||
qW
|
||||
EZ
|
||||
jb
|
||||
TE
|
||||
QY
|
||||
rk
|
||||
rs
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
/area/ruin/space/has_grav/powered/dinner_for_two)
|
||||
"n" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/candle{
|
||||
/obj/item/flashlight/flare/candle{
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/item/plate{
|
||||
|
||||
@@ -575,7 +575,7 @@
|
||||
pixel_x = 7;
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/item/candle/infinite{
|
||||
/obj/item/flashlight/flare/candle/infinite{
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/effect/turf_decal/siding/wood{
|
||||
@@ -3661,7 +3661,7 @@
|
||||
pixel_x = 7;
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/item/candle/infinite{
|
||||
/obj/item/flashlight/flare/candle/infinite{
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/structure/table/wood/fancy,
|
||||
@@ -4373,7 +4373,7 @@
|
||||
/turf/open/floor/wood/tile,
|
||||
/area/ruin/space/has_grav/hotel)
|
||||
"WZ" = (
|
||||
/obj/item/candle/infinite{
|
||||
/obj/item/flashlight/flare/candle/infinite{
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/structure/table/wood/fancy,
|
||||
|
||||
@@ -337,11 +337,6 @@
|
||||
/obj/structure/cable,
|
||||
/turf/open/floor/carpet,
|
||||
/area/awaymission/cabin)
|
||||
"bc" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/reagent_containers/cup/glass/mug/britcup,
|
||||
/turf/open/floor/carpet,
|
||||
/area/awaymission/cabin)
|
||||
"bd" = (
|
||||
/obj/structure/chair/office,
|
||||
/turf/open/floor/carpet,
|
||||
@@ -2291,10 +2286,6 @@
|
||||
"hM" = (
|
||||
/turf/closed/wall/mineral/snow,
|
||||
/area/awaymission/cabin/caves/mountain)
|
||||
"hP" = (
|
||||
/obj/item/candle/infinite,
|
||||
/turf/open/floor/plating/snowed,
|
||||
/area/awaymission/cabin/caves)
|
||||
"hQ" = (
|
||||
/obj/item/reagent_containers/cup/glass/bottle/beer,
|
||||
/turf/open/floor/plating/snowed,
|
||||
@@ -3888,6 +3879,11 @@
|
||||
/obj/item/food/fishmeat/carp,
|
||||
/turf/open/misc/ice/smooth,
|
||||
/area/awaymission/cabin/snowforest)
|
||||
"xo" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/reagent_containers/cup/glass/mug/britcup,
|
||||
/turf/open/floor/carpet,
|
||||
/area/awaymission/cabin)
|
||||
"xs" = (
|
||||
/mob/living/simple_animal/hostile/tree{
|
||||
desc = "I am death. I will have my vengeance upon my enemies.";
|
||||
@@ -4834,6 +4830,10 @@
|
||||
/obj/item/storage/medkit/fire,
|
||||
/turf/open/floor/iron/white,
|
||||
/area/awaymission/cabin)
|
||||
"WF" = (
|
||||
/obj/item/flashlight/flare/candle/infinite,
|
||||
/turf/open/floor/plating/snowed,
|
||||
/area/awaymission/cabin/caves)
|
||||
"WH" = (
|
||||
/obj/effect/decal/cleanable/blood/old,
|
||||
/obj/effect/decal/cleanable/glitter/blue{
|
||||
@@ -35387,7 +35387,7 @@ ed
|
||||
hu
|
||||
an
|
||||
aY
|
||||
bc
|
||||
xo
|
||||
bg
|
||||
an
|
||||
nU
|
||||
@@ -47869,9 +47869,9 @@ gx
|
||||
gx
|
||||
gx
|
||||
hM
|
||||
hP
|
||||
WF
|
||||
hQ
|
||||
hP
|
||||
WF
|
||||
wI
|
||||
PV
|
||||
Oe
|
||||
@@ -48383,9 +48383,9 @@ gx
|
||||
gx
|
||||
gx
|
||||
hM
|
||||
hP
|
||||
WF
|
||||
hQ
|
||||
hP
|
||||
WF
|
||||
Rz
|
||||
PV
|
||||
PV
|
||||
|
||||
@@ -18395,19 +18395,6 @@
|
||||
/obj/structure/sign/poster/random/directional/west,
|
||||
/turf/open/floor/iron/large,
|
||||
/area/station/service/kitchen/diner)
|
||||
"fAo" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/clothing/under/suit/red,
|
||||
/obj/item/candle{
|
||||
pixel_x = -8;
|
||||
pixel_y = 4
|
||||
},
|
||||
/obj/item/candle{
|
||||
pixel_x = 8;
|
||||
pixel_y = 4
|
||||
},
|
||||
/turf/open/floor/engine/cult,
|
||||
/area/station/service/library)
|
||||
"fAF" = (
|
||||
/obj/structure/rack,
|
||||
/obj/item/clothing/gloves/boxing/green,
|
||||
@@ -24291,6 +24278,19 @@
|
||||
"htB" = (
|
||||
/turf/open/floor/carpet/red,
|
||||
/area/station/security/prison/work)
|
||||
"htN" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/clothing/under/suit/red,
|
||||
/obj/item/flashlight/flare/candle{
|
||||
pixel_x = -8;
|
||||
pixel_y = 4
|
||||
},
|
||||
/obj/item/flashlight/flare/candle{
|
||||
pixel_x = 8;
|
||||
pixel_y = 4
|
||||
},
|
||||
/turf/open/floor/engine/cult,
|
||||
/area/station/service/library)
|
||||
"htO" = (
|
||||
/obj/structure/chair/office{
|
||||
dir = 4
|
||||
@@ -25619,6 +25619,12 @@
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/turf/open/floor/iron/smooth_half,
|
||||
/area/station/security/brig/upper)
|
||||
"hQQ" = (
|
||||
/obj/docking_port/stationary/escape_pod{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating/snowed/icemoon,
|
||||
/area/icemoon/surface/outdoors/nospawn)
|
||||
"hRp" = (
|
||||
/obj/machinery/button/door/directional/north{
|
||||
id = "visitation";
|
||||
@@ -27086,6 +27092,12 @@
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/mine/laborcamp)
|
||||
"ioi" = (
|
||||
/obj/structure/bed/dogbed/lia,
|
||||
/mob/living/basic/carp/pet/lia,
|
||||
/obj/structure/cable,
|
||||
/turf/open/floor/carpet/royalblue,
|
||||
/area/station/command/heads_quarters/hos)
|
||||
"iol" = (
|
||||
/obj/machinery/camera/directional/south{
|
||||
c_tag = "MiniSat Teleporter";
|
||||
@@ -27355,36 +27367,6 @@
|
||||
dir = 8
|
||||
},
|
||||
/area/station/service/chapel)
|
||||
"isa" = (
|
||||
/obj/structure/chair/office{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/button/flasher{
|
||||
pixel_y = -32;
|
||||
id = "hopflash";
|
||||
pixel_x = 8
|
||||
},
|
||||
/obj/machinery/button/door/directional/south{
|
||||
pixel_x = -8;
|
||||
req_access = list("hop");
|
||||
id = "hopqueue";
|
||||
name = "Queue Shutters Control"
|
||||
},
|
||||
/obj/machinery/button/door/directional/south{
|
||||
pixel_x = 8;
|
||||
name = "Privacy Shutters Control";
|
||||
req_access = list("hop");
|
||||
id = "hop"
|
||||
},
|
||||
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/button/ticket_machine{
|
||||
pixel_x = -8;
|
||||
pixel_y = -32
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/station/command/heads_quarters/hop)
|
||||
"isb" = (
|
||||
/obj/machinery/atmospherics/components/binary/pump/off{
|
||||
dir = 1;
|
||||
@@ -29920,19 +29902,6 @@
|
||||
},
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/engineering/atmos/mix)
|
||||
"jew" = (
|
||||
/obj/item/candle{
|
||||
pixel_x = -7;
|
||||
pixel_y = 3
|
||||
},
|
||||
/obj/item/storage/book{
|
||||
name = "Tales from the First";
|
||||
pixel_x = 5;
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/structure/table/wood,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/starboard/lesser)
|
||||
"jeF" = (
|
||||
/obj/effect/landmark/start/security_officer,
|
||||
/turf/open/floor/glass/reinforced,
|
||||
@@ -32021,6 +31990,19 @@
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/port/greater)
|
||||
"jNE" = (
|
||||
/obj/item/flashlight/flare/candle{
|
||||
pixel_x = -7;
|
||||
pixel_y = 3
|
||||
},
|
||||
/obj/item/storage/book{
|
||||
name = "Tales from the First";
|
||||
pixel_x = 5;
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/structure/table/wood,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/starboard/lesser)
|
||||
"jNZ" = (
|
||||
/obj/effect/turf_decal/weather/snow/corner{
|
||||
dir = 9
|
||||
@@ -33064,6 +33046,10 @@
|
||||
},
|
||||
/turf/open/floor/engine/vacuum,
|
||||
/area/station/engineering/atmos)
|
||||
"kei" = (
|
||||
/obj/docking_port/stationary/escape_pod,
|
||||
/turf/open/floor/plating/snowed/icemoon,
|
||||
/area/icemoon/surface/outdoors/nospawn)
|
||||
"keq" = (
|
||||
/obj/effect/turf_decal/trimline/green/filled/line{
|
||||
dir = 5
|
||||
@@ -36021,6 +36007,22 @@
|
||||
/obj/effect/turf_decal/bot,
|
||||
/turf/open/floor/iron,
|
||||
/area/station/cargo/storage)
|
||||
"kXx" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/food/spaghetti/meatballspaghetti{
|
||||
pixel_x = -1;
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/item/flashlight/flare/candle/infinite{
|
||||
pixel_x = -11;
|
||||
pixel_y = 11
|
||||
},
|
||||
/obj/item/trash/candle{
|
||||
pixel_x = 9;
|
||||
pixel_y = -1
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/fore/lesser)
|
||||
"kXA" = (
|
||||
/turf/open/floor/iron,
|
||||
/area/station/cargo/office)
|
||||
@@ -36108,11 +36110,6 @@
|
||||
"kYA" = (
|
||||
/turf/open/floor/circuit,
|
||||
/area/mine/living_quarters)
|
||||
"kYE" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/candle,
|
||||
/turf/open/floor/iron,
|
||||
/area/station/hallway/primary/starboard)
|
||||
"kYF" = (
|
||||
/obj/structure/light_construct/directional/west,
|
||||
/mob/living/simple_animal/hostile/retaliate/goose/vomit,
|
||||
@@ -37030,10 +37027,6 @@
|
||||
/obj/machinery/light/directional/south,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/command/heads_quarters/cmo)
|
||||
"lmR" = (
|
||||
/obj/docking_port/stationary/escape_pod,
|
||||
/turf/open/floor/plating/snowed/icemoon,
|
||||
/area/icemoon/surface/outdoors/nospawn)
|
||||
"lnc" = (
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/turf/open/floor/plating,
|
||||
@@ -41794,22 +41787,6 @@
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/department/medical/morgue)
|
||||
"mUh" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/food/spaghetti/meatballspaghetti{
|
||||
pixel_x = -1;
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/item/candle/infinite{
|
||||
pixel_x = -11;
|
||||
pixel_y = 11
|
||||
},
|
||||
/obj/item/trash/candle{
|
||||
pixel_x = 9;
|
||||
pixel_y = -1
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/fore/lesser)
|
||||
"mUs" = (
|
||||
/obj/machinery/light/directional/south,
|
||||
/turf/open/floor/plating,
|
||||
@@ -47269,12 +47246,6 @@
|
||||
/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/port/aft)
|
||||
"oxJ" = (
|
||||
/obj/structure/bed/dogbed/lia,
|
||||
/mob/living/basic/carp/pet/lia,
|
||||
/obj/structure/cable,
|
||||
/turf/open/floor/carpet/royalblue,
|
||||
/area/station/command/heads_quarters/hos)
|
||||
"oxO" = (
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/aft/lesser)
|
||||
@@ -55740,6 +55711,11 @@
|
||||
dir = 5
|
||||
},
|
||||
/area/mine/living_quarters)
|
||||
"reM" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/flashlight/flare/candle,
|
||||
/turf/open/floor/iron,
|
||||
/area/station/hallway/primary/starboard)
|
||||
"reT" = (
|
||||
/obj/machinery/door/window/left/directional/north{
|
||||
dir = 4;
|
||||
@@ -58326,6 +58302,36 @@
|
||||
},
|
||||
/turf/open/floor/iron/dark/smooth_large,
|
||||
/area/station/security/processing)
|
||||
"rYk" = (
|
||||
/obj/structure/chair/office{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/button/flasher{
|
||||
pixel_y = -32;
|
||||
id = "hopflash";
|
||||
pixel_x = 8
|
||||
},
|
||||
/obj/machinery/button/door/directional/south{
|
||||
pixel_x = -8;
|
||||
req_access = list("hop");
|
||||
id = "hopqueue";
|
||||
name = "Queue Shutters Control"
|
||||
},
|
||||
/obj/machinery/button/door/directional/south{
|
||||
pixel_x = 8;
|
||||
name = "Privacy Shutters Control";
|
||||
req_access = list("hop");
|
||||
id = "hop"
|
||||
},
|
||||
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/button/ticket_machine{
|
||||
pixel_x = -8;
|
||||
pixel_y = -32
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/station/command/heads_quarters/hop)
|
||||
"rYq" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
@@ -58882,12 +58888,6 @@
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/station/engineering/atmos)
|
||||
"shl" = (
|
||||
/obj/docking_port/stationary/escape_pod{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating/snowed/icemoon,
|
||||
/area/icemoon/surface/outdoors/nospawn)
|
||||
"shB" = (
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 8
|
||||
@@ -62546,6 +62546,12 @@
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/station/hallway/primary/central)
|
||||
"tqR" = (
|
||||
/obj/docking_port/stationary/escape_pod{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plating/snowed/icemoon,
|
||||
/area/icemoon/surface/outdoors/nospawn)
|
||||
"tqZ" = (
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/machinery/door/airlock{
|
||||
@@ -69014,12 +69020,6 @@
|
||||
/obj/effect/decal/cleanable/dirt/dust,
|
||||
/turf/open/floor/wood/parquet,
|
||||
/area/station/commons/lounge)
|
||||
"vpI" = (
|
||||
/obj/docking_port/stationary/escape_pod{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plating/snowed/icemoon,
|
||||
/area/icemoon/surface/outdoors/nospawn)
|
||||
"vpR" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/open/floor/iron/dark,
|
||||
@@ -165986,7 +165986,7 @@ gjq
|
||||
gjq
|
||||
cMT
|
||||
vhB
|
||||
mUh
|
||||
kXx
|
||||
ych
|
||||
dkT
|
||||
gjq
|
||||
@@ -185538,7 +185538,7 @@ jre
|
||||
jre
|
||||
jre
|
||||
jre
|
||||
jew
|
||||
jNE
|
||||
aCo
|
||||
hMw
|
||||
jre
|
||||
@@ -218163,7 +218163,7 @@ bln
|
||||
sEB
|
||||
bln
|
||||
sEB
|
||||
vpI
|
||||
tqR
|
||||
sEB
|
||||
bln
|
||||
bln
|
||||
@@ -218177,7 +218177,7 @@ bln
|
||||
bln
|
||||
bln
|
||||
sEB
|
||||
vpI
|
||||
tqR
|
||||
sEB
|
||||
bln
|
||||
bln
|
||||
@@ -235933,7 +235933,7 @@ wjv
|
||||
pec
|
||||
fJl
|
||||
iaS
|
||||
isa
|
||||
rYk
|
||||
cpm
|
||||
dnq
|
||||
ylU
|
||||
@@ -238437,7 +238437,7 @@ lQc
|
||||
nbp
|
||||
mgU
|
||||
nlz
|
||||
oxJ
|
||||
ioi
|
||||
nBx
|
||||
azx
|
||||
tDw
|
||||
@@ -241264,7 +241264,7 @@ xiI
|
||||
bln
|
||||
bln
|
||||
bln
|
||||
lmR
|
||||
kei
|
||||
pDC
|
||||
clq
|
||||
qgO
|
||||
@@ -243686,7 +243686,7 @@ kcG
|
||||
qwF
|
||||
wYJ
|
||||
sEB
|
||||
shl
|
||||
hQQ
|
||||
sEB
|
||||
nyA
|
||||
njm
|
||||
@@ -249024,7 +249024,7 @@ ecZ
|
||||
fkk
|
||||
lmG
|
||||
onv
|
||||
kYE
|
||||
reM
|
||||
lso
|
||||
cbs
|
||||
nGA
|
||||
@@ -254925,7 +254925,7 @@ poy
|
||||
poy
|
||||
vvJ
|
||||
hUD
|
||||
fAo
|
||||
htN
|
||||
xUH
|
||||
dYt
|
||||
nyl
|
||||
|
||||
@@ -5422,10 +5422,6 @@
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/space/nearstation)
|
||||
"bFQ" = (
|
||||
/obj/docking_port/stationary/escape_pod,
|
||||
/turf/open/space/basic,
|
||||
/area/space)
|
||||
"bGx" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
@@ -5796,6 +5792,12 @@
|
||||
/obj/structure/cable,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/port/lesser)
|
||||
"bNl" = (
|
||||
/obj/docking_port/stationary/escape_pod{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/space/basic,
|
||||
/area/space)
|
||||
"bNv" = (
|
||||
/obj/machinery/telecomms/server/presets/common,
|
||||
/obj/machinery/light/directional/west,
|
||||
@@ -6602,12 +6604,6 @@
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/port/lesser)
|
||||
"ccg" = (
|
||||
/obj/docking_port/stationary/escape_pod{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/space/basic,
|
||||
/area/space)
|
||||
"ccr" = (
|
||||
/obj/effect/decal/cleanable/blood/old,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
@@ -9156,12 +9152,6 @@
|
||||
/obj/effect/turf_decal/sand/plating,
|
||||
/turf/open/floor/plating/lowpressure,
|
||||
/area/space/nearstation)
|
||||
"cOd" = (
|
||||
/obj/docking_port/stationary/escape_pod{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/space/basic,
|
||||
/area/space)
|
||||
"cOf" = (
|
||||
/obj/structure/cable,
|
||||
/turf/open/floor/plating,
|
||||
@@ -15483,10 +15473,6 @@
|
||||
},
|
||||
/turf/open/floor/iron/grimy,
|
||||
/area/station/security/prison)
|
||||
"eEt" = (
|
||||
/obj/structure/lattice/catwalk,
|
||||
/turf/open/space/basic,
|
||||
/area/space)
|
||||
"eEz" = (
|
||||
/obj/effect/turf_decal/tile/yellow{
|
||||
dir = 1
|
||||
@@ -23485,12 +23471,6 @@
|
||||
},
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/engineering/supermatter/room)
|
||||
"gKV" = (
|
||||
/obj/docking_port/stationary/escape_pod{
|
||||
dir = 2
|
||||
},
|
||||
/turf/open/space/basic,
|
||||
/area/space)
|
||||
"gLm" = (
|
||||
/obj/machinery/status_display/ai/directional/south,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
@@ -31547,6 +31527,14 @@
|
||||
/obj/structure/cable,
|
||||
/turf/open/floor/iron,
|
||||
/area/station/cargo/miningoffice)
|
||||
"iRt" = (
|
||||
/obj/effect/turf_decal/tile/red,
|
||||
/obj/effect/turf_decal/tile/red{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/spawner/xmastree,
|
||||
/turf/open/floor/iron/showroomfloor,
|
||||
/area/station/service/bar/atrium)
|
||||
"iRJ" = (
|
||||
/obj/effect/turf_decal/tile/blue{
|
||||
dir = 8
|
||||
@@ -32043,6 +32031,12 @@
|
||||
},
|
||||
/turf/open/floor/iron/showroomfloor,
|
||||
/area/station/security/brig)
|
||||
"iXZ" = (
|
||||
/obj/docking_port/stationary/escape_pod{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/space/basic,
|
||||
/area/space)
|
||||
"iYa" = (
|
||||
/obj/effect/turf_decal/tile/blue{
|
||||
dir = 4
|
||||
@@ -36382,6 +36376,15 @@
|
||||
/obj/effect/turf_decal/tile/red/fourcorners,
|
||||
/turf/open/floor/iron/white,
|
||||
/area/station/security/prison/safe)
|
||||
"kom" = (
|
||||
/obj/machinery/computer/security/telescreen/entertainment/directional/south,
|
||||
/obj/structure/reagent_dispensers/wall/peppertank/directional/east,
|
||||
/obj/structure/bed/dogbed/cayenne{
|
||||
name = "Lia's bed"
|
||||
},
|
||||
/mob/living/basic/carp/pet/lia,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/command/heads_quarters/hos)
|
||||
"kox" = (
|
||||
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
|
||||
/turf/open/floor/engine/co2,
|
||||
@@ -39504,21 +39507,6 @@
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
|
||||
/turf/open/floor/grass,
|
||||
/area/station/science/genetics)
|
||||
"lhT" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/candle/infinite{
|
||||
pixel_x = 6;
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/item/food/spaghetti/meatballspaghetti{
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/item/kitchen/fork,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/structure/cable,
|
||||
/obj/effect/mapping_helpers/burnt_floor,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/port/lesser)
|
||||
"lia" = (
|
||||
/obj/effect/turf_decal/tile/brown,
|
||||
/obj/effect/turf_decal/tile/brown{
|
||||
@@ -40788,10 +40776,6 @@
|
||||
/obj/effect/turf_decal/tile/yellow,
|
||||
/turf/open/floor/iron/showroomfloor,
|
||||
/area/station/medical/chemistry)
|
||||
"lzW" = (
|
||||
/obj/structure/lattice,
|
||||
/turf/open/space/basic,
|
||||
/area/space)
|
||||
"lAk" = (
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 1
|
||||
@@ -41486,11 +41470,6 @@
|
||||
"lKq" = (
|
||||
/turf/closed/wall,
|
||||
/area/station/cargo/storage)
|
||||
"lKx" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/effect/spawner/xmastree,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/service/chapel)
|
||||
"lKC" = (
|
||||
/obj/effect/turf_decal/tile/purple{
|
||||
dir = 1
|
||||
@@ -41962,17 +41941,6 @@
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/station/cargo/warehouse)
|
||||
"lSY" = (
|
||||
/obj/effect/spawner/random/structure/table,
|
||||
/obj/item/candle{
|
||||
pixel_x = -5
|
||||
},
|
||||
/obj/effect/spawner/random/food_or_drink/refreshing_beverage{
|
||||
pixel_x = 5;
|
||||
pixel_y = 1
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/department/crew_quarters/bar)
|
||||
"lTc" = (
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 4
|
||||
@@ -42306,6 +42274,11 @@
|
||||
},
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/cargo/warehouse)
|
||||
"lXT" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/effect/spawner/xmastree,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/service/chapel)
|
||||
"lYa" = (
|
||||
/obj/structure/chair/comfy/brown,
|
||||
/obj/effect/landmark/start/detective,
|
||||
@@ -45141,12 +45114,6 @@
|
||||
/obj/structure/window/reinforced,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/commons/fitness/recreation)
|
||||
"mPb" = (
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/space/basic,
|
||||
/area/space/nearstation)
|
||||
"mPo" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/stack/sheet/iron/fifty,
|
||||
@@ -48321,6 +48288,12 @@
|
||||
/obj/effect/mapping_helpers/burnt_floor,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/port/fore)
|
||||
"nLT" = (
|
||||
/obj/docking_port/stationary/escape_pod{
|
||||
dir = 2
|
||||
},
|
||||
/turf/open/space/basic,
|
||||
/area/space)
|
||||
"nLZ" = (
|
||||
/obj/effect/turf_decal/stripes/corner{
|
||||
dir = 1
|
||||
@@ -49895,6 +49868,12 @@
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/turf/open/floor/iron/showroomfloor,
|
||||
/area/station/medical/medbay/central)
|
||||
"omw" = (
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/space/basic,
|
||||
/area/space/nearstation)
|
||||
"omH" = (
|
||||
/obj/machinery/door/poddoor/shutters{
|
||||
id = "Skynet_launch";
|
||||
@@ -50400,6 +50379,10 @@
|
||||
/obj/effect/mapping_helpers/burnt_floor,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/solars/starboard/aft)
|
||||
"ouV" = (
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
/turf/open/space/basic,
|
||||
/area/space/nearstation)
|
||||
"ouX" = (
|
||||
/obj/effect/turf_decal/tile/yellow{
|
||||
dir = 1
|
||||
@@ -51847,6 +51830,10 @@
|
||||
/obj/structure/cable,
|
||||
/turf/open/floor/iron,
|
||||
/area/station/cargo/storage)
|
||||
"oRy" = (
|
||||
/obj/structure/lattice/catwalk,
|
||||
/turf/open/space/basic,
|
||||
/area/space)
|
||||
"oRz" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
@@ -51861,6 +51848,17 @@
|
||||
/obj/effect/mapping_helpers/broken_floor,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/port/fore)
|
||||
"oRI" = (
|
||||
/obj/effect/spawner/random/structure/table,
|
||||
/obj/item/flashlight/flare/candle{
|
||||
pixel_x = -5
|
||||
},
|
||||
/obj/effect/spawner/random/food_or_drink/refreshing_beverage{
|
||||
pixel_x = 5;
|
||||
pixel_y = 1
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/department/crew_quarters/bar)
|
||||
"oRK" = (
|
||||
/obj/structure/chair/office/light,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
@@ -55549,6 +55547,14 @@
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/station/hallway/primary/aft)
|
||||
"pRF" = (
|
||||
/obj/docking_port/stationary/random{
|
||||
dir = 4;
|
||||
name = "lavaland";
|
||||
shuttle_id = "pod_4_lavaland"
|
||||
},
|
||||
/turf/open/space,
|
||||
/area/space/nearstation)
|
||||
"pRO" = (
|
||||
/obj/machinery/door/poddoor/preopen{
|
||||
id = "atmos";
|
||||
@@ -59618,14 +59624,6 @@
|
||||
},
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/security/brig)
|
||||
"rbF" = (
|
||||
/obj/effect/turf_decal/tile/red,
|
||||
/obj/effect/turf_decal/tile/red{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/spawner/xmastree,
|
||||
/turf/open/floor/iron/showroomfloor,
|
||||
/area/station/service/bar/atrium)
|
||||
"rbH" = (
|
||||
/obj/machinery/computer/security/telescreen{
|
||||
dir = 8;
|
||||
@@ -63198,12 +63196,6 @@
|
||||
/obj/effect/mapping_helpers/broken_floor,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/solars/starboard/fore)
|
||||
"sbs" = (
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/space/basic,
|
||||
/area/space/nearstation)
|
||||
"sby" = (
|
||||
/obj/effect/turf_decal/tile/blue{
|
||||
dir = 4
|
||||
@@ -64608,6 +64600,10 @@
|
||||
/obj/structure/cable,
|
||||
/turf/open/floor/iron/showroomfloor,
|
||||
/area/station/medical/surgery/aft)
|
||||
"suU" = (
|
||||
/obj/docking_port/stationary/escape_pod,
|
||||
/turf/open/space/basic,
|
||||
/area/space)
|
||||
"svC" = (
|
||||
/obj/effect/turf_decal/stripes/corner{
|
||||
dir = 8
|
||||
@@ -69643,6 +69639,21 @@
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
/turf/open/floor/iron,
|
||||
/area/station/science/robotics/mechbay)
|
||||
"tPw" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/flashlight/flare/candle/infinite{
|
||||
pixel_x = 6;
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/item/food/spaghetti/meatballspaghetti{
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/item/kitchen/fork,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/structure/cable,
|
||||
/obj/effect/mapping_helpers/burnt_floor,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/port/lesser)
|
||||
"tPz" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/effect/turf_decal/tile/yellow{
|
||||
@@ -71782,6 +71793,12 @@
|
||||
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
|
||||
/turf/open/floor/iron,
|
||||
/area/station/engineering/atmos)
|
||||
"utw" = (
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/space/basic,
|
||||
/area/space/nearstation)
|
||||
"utF" = (
|
||||
/obj/effect/turf_decal/tile/blue,
|
||||
/obj/effect/turf_decal/tile/blue{
|
||||
@@ -76740,6 +76757,10 @@
|
||||
dir = 8
|
||||
},
|
||||
/area/station/hallway/primary/port)
|
||||
"vNT" = (
|
||||
/obj/structure/lattice,
|
||||
/turf/open/space/basic,
|
||||
/area/space)
|
||||
"vOl" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/structure/cable,
|
||||
@@ -76841,15 +76862,6 @@
|
||||
"vOX" = (
|
||||
/turf/closed/wall/rust,
|
||||
/area/station/maintenance/starboard)
|
||||
"vOZ" = (
|
||||
/obj/machinery/computer/security/telescreen/entertainment/directional/south,
|
||||
/obj/structure/reagent_dispensers/wall/peppertank/directional/east,
|
||||
/obj/structure/bed/dogbed/cayenne{
|
||||
name = "Lia's bed"
|
||||
},
|
||||
/mob/living/basic/carp/pet/lia,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/command/heads_quarters/hos)
|
||||
"vPd" = (
|
||||
/obj/effect/turf_decal/tile/neutral,
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
@@ -78743,14 +78755,6 @@
|
||||
/obj/structure/cable,
|
||||
/turf/open/floor/iron,
|
||||
/area/station/security/prison)
|
||||
"woH" = (
|
||||
/mob/living/basic/carp{
|
||||
environment_smash = 0;
|
||||
name = "Tuna";
|
||||
real_name = "Tuna"
|
||||
},
|
||||
/turf/open/misc/asteroid/airless,
|
||||
/area/space/nearstation)
|
||||
"woJ" = (
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 8
|
||||
@@ -79335,14 +79339,6 @@
|
||||
luminosity = 2
|
||||
},
|
||||
/area/station/engineering/supermatter)
|
||||
"wxy" = (
|
||||
/obj/docking_port/stationary/random{
|
||||
dir = 4;
|
||||
name = "lavaland";
|
||||
shuttle_id = "pod_4_lavaland"
|
||||
},
|
||||
/turf/open/space,
|
||||
/area/space/nearstation)
|
||||
"wxF" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/effect/spawner/random/maintenance,
|
||||
@@ -79782,10 +79778,6 @@
|
||||
},
|
||||
/turf/open/floor/iron/grimy,
|
||||
/area/station/security/prison/safe)
|
||||
"wEB" = (
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
/turf/open/space/basic,
|
||||
/area/space/nearstation)
|
||||
"wEI" = (
|
||||
/obj/effect/turf_decal/tile/red,
|
||||
/obj/effect/turf_decal/tile/red{
|
||||
@@ -83508,6 +83500,14 @@
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/station/maintenance/disposal/incinerator)
|
||||
"xGI" = (
|
||||
/mob/living/basic/carp{
|
||||
environment_smash = 0;
|
||||
name = "Tuna";
|
||||
real_name = "Tuna"
|
||||
},
|
||||
/turf/open/misc/asteroid/airless,
|
||||
/area/space/nearstation)
|
||||
"xGN" = (
|
||||
/obj/structure/cable,
|
||||
/turf/open/floor/plating/rust,
|
||||
@@ -96683,9 +96683,9 @@ wDI
|
||||
aeu
|
||||
aeu
|
||||
aDT
|
||||
sbs
|
||||
omw
|
||||
lHD
|
||||
sbs
|
||||
omw
|
||||
sRm
|
||||
aeu
|
||||
ycx
|
||||
@@ -97712,7 +97712,7 @@ ycx
|
||||
vjh
|
||||
vjh
|
||||
aaa
|
||||
cOd
|
||||
iXZ
|
||||
aaa
|
||||
ycx
|
||||
vjh
|
||||
@@ -98161,7 +98161,7 @@ vmZ
|
||||
ewC
|
||||
qER
|
||||
xmn
|
||||
lKx
|
||||
lXT
|
||||
ggj
|
||||
aSu
|
||||
kVd
|
||||
@@ -99995,7 +99995,7 @@ aeu
|
||||
aeU
|
||||
aeU
|
||||
coy
|
||||
woH
|
||||
xGI
|
||||
aDS
|
||||
tpp
|
||||
bFI
|
||||
@@ -101327,7 +101327,7 @@ bJv
|
||||
bJv
|
||||
iTq
|
||||
tKt
|
||||
lhT
|
||||
tPw
|
||||
iMA
|
||||
xad
|
||||
cnM
|
||||
@@ -102644,7 +102644,7 @@ aaa
|
||||
aaa
|
||||
aaa
|
||||
cry
|
||||
wEB
|
||||
ouV
|
||||
acK
|
||||
aaa
|
||||
aaa
|
||||
@@ -102897,7 +102897,7 @@ gDy
|
||||
hOU
|
||||
aHz
|
||||
kZK
|
||||
gKV
|
||||
nLT
|
||||
aaa
|
||||
aaa
|
||||
cry
|
||||
@@ -103158,7 +103158,7 @@ aaa
|
||||
aaa
|
||||
aaa
|
||||
cry
|
||||
wEB
|
||||
ouV
|
||||
acK
|
||||
aaa
|
||||
aaa
|
||||
@@ -105980,7 +105980,7 @@ lZr
|
||||
jPG
|
||||
sYu
|
||||
mIR
|
||||
vOZ
|
||||
kom
|
||||
afL
|
||||
aeu
|
||||
aeU
|
||||
@@ -111853,7 +111853,7 @@ jCm
|
||||
cXT
|
||||
jCm
|
||||
fPN
|
||||
lSY
|
||||
oRI
|
||||
cXT
|
||||
dVb
|
||||
uyl
|
||||
@@ -115694,7 +115694,7 @@ eDT
|
||||
fzL
|
||||
bji
|
||||
qTC
|
||||
rbF
|
||||
iRt
|
||||
hVU
|
||||
mCs
|
||||
vYn
|
||||
@@ -126191,7 +126191,7 @@ aaa
|
||||
aaa
|
||||
aaa
|
||||
acK
|
||||
mPb
|
||||
utw
|
||||
cry
|
||||
aaa
|
||||
aaa
|
||||
@@ -126452,7 +126452,7 @@ iak
|
||||
cry
|
||||
aaa
|
||||
aaa
|
||||
bFQ
|
||||
suU
|
||||
fRt
|
||||
oBf
|
||||
nxa
|
||||
@@ -126705,7 +126705,7 @@ aaB
|
||||
aaa
|
||||
aaa
|
||||
acK
|
||||
mPb
|
||||
utw
|
||||
cry
|
||||
aaa
|
||||
aaa
|
||||
@@ -130079,7 +130079,7 @@ rZV
|
||||
vOX
|
||||
vOX
|
||||
aaa
|
||||
ccg
|
||||
bNl
|
||||
aaa
|
||||
rZV
|
||||
mtc
|
||||
@@ -131107,7 +131107,7 @@ aeU
|
||||
aof
|
||||
qJs
|
||||
cry
|
||||
wxy
|
||||
pRF
|
||||
cry
|
||||
qJs
|
||||
aeu
|
||||
@@ -131363,9 +131363,9 @@ cmU
|
||||
aeU
|
||||
aeU
|
||||
aaQ
|
||||
eEt
|
||||
lzW
|
||||
eEt
|
||||
oRy
|
||||
vNT
|
||||
oRy
|
||||
acm
|
||||
aeu
|
||||
aeu
|
||||
|
||||
@@ -83,25 +83,6 @@
|
||||
},
|
||||
/turf/open/floor/carpet,
|
||||
/area/station/commons/dorms)
|
||||
"aaK" = (
|
||||
/obj/structure/safe,
|
||||
/obj/item/storage/secure/briefcase/riches,
|
||||
/obj/item/storage/backpack/duffelbag/syndie/hitman,
|
||||
/obj/item/card/id/advanced/silver/reaper,
|
||||
/obj/item/lazarus_injector,
|
||||
/obj/item/gun/energy/disabler,
|
||||
/obj/item/gun/ballistic/revolver/russian,
|
||||
/obj/item/ammo_box/a357,
|
||||
/obj/item/clothing/neck/stethoscope,
|
||||
/obj/item/book{
|
||||
desc = "An undeniably handy book.";
|
||||
icon_state = "bookknock";
|
||||
name = "\improper A Simpleton's Guide to Safe-cracking with Stethoscopes"
|
||||
},
|
||||
/obj/effect/turf_decal/bot_white/left,
|
||||
/obj/effect/turf_decal/tile/neutral/fourcorners,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/ai_monitored/command/nuke_storage)
|
||||
"abI" = (
|
||||
/obj/structure/chair/stool/directional/south,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
@@ -2944,6 +2925,21 @@
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/station/security/warden)
|
||||
"aZv" = (
|
||||
/obj/machinery/door/poddoor/shutters/preopen{
|
||||
dir = 1;
|
||||
id = "ordnancebridge"
|
||||
},
|
||||
/obj/machinery/button/door{
|
||||
id = "ordnancebridge";
|
||||
pixel_x = -24;
|
||||
req_one_access = list("maint_tunnels","science")
|
||||
},
|
||||
/obj/effect/turf_decal/caution/stand_clear{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/aft/lesser)
|
||||
"aZL" = (
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
@@ -9239,12 +9235,6 @@
|
||||
/obj/effect/spawner/random/engineering/flashlight,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/security/office)
|
||||
"dtp" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/candle,
|
||||
/obj/effect/turf_decal/delivery,
|
||||
/turf/open/floor/iron,
|
||||
/area/station/hallway/secondary/exit/departure_lounge)
|
||||
"dtB" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{
|
||||
dir = 8
|
||||
@@ -9557,6 +9547,12 @@
|
||||
/obj/effect/landmark/event_spawn,
|
||||
/turf/open/floor/iron,
|
||||
/area/station/service/hydroponics)
|
||||
"dBV" = (
|
||||
/obj/docking_port/stationary/escape_pod{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/space/basic,
|
||||
/area/space)
|
||||
"dBZ" = (
|
||||
/obj/item/clothing/head/cone{
|
||||
pixel_x = -4;
|
||||
@@ -11121,6 +11117,10 @@
|
||||
"ecO" = (
|
||||
/turf/open/floor/carpet,
|
||||
/area/station/service/library)
|
||||
"edl" = (
|
||||
/obj/docking_port/stationary/escape_pod,
|
||||
/turf/open/space/basic,
|
||||
/area/space)
|
||||
"edo" = (
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/paper_bin,
|
||||
@@ -15132,20 +15132,6 @@
|
||||
/obj/machinery/light/small/directional/east,
|
||||
/turf/open/floor/iron/dark/textured,
|
||||
/area/station/engineering/atmos)
|
||||
"fFK" = (
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/door/airlock{
|
||||
name = "Custodial Closet"
|
||||
},
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/obj/effect/mapping_helpers/airlock/access/all/service/janitor,
|
||||
/obj/effect/landmark/navigate_destination/janitor,
|
||||
/turf/open/floor/iron,
|
||||
/area/station/maintenance/starboard/greater)
|
||||
"fGb" = (
|
||||
/obj/machinery/door/airlock/security/glass{
|
||||
name = "Prison Sanitarium"
|
||||
@@ -16879,6 +16865,19 @@
|
||||
/obj/machinery/light_switch/directional/west,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/security/lockers)
|
||||
"gmG" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/plate,
|
||||
/obj/item/flashlight/flare/candle,
|
||||
/obj/effect/decal/cleanable/dirt/dust,
|
||||
/obj/item/radio{
|
||||
desc = "An old handheld radio. You could use it, if you really wanted to.";
|
||||
icon_state = "radio";
|
||||
name = "old radio";
|
||||
pixel_y = 15
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/space_hut)
|
||||
"gmH" = (
|
||||
/obj/structure/sign/warning/secure_area,
|
||||
/turf/closed/wall/r_wall,
|
||||
@@ -17031,6 +17030,20 @@
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/station/service/hydroponics/garden)
|
||||
"gpv" = (
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/door/airlock{
|
||||
name = "Custodial Closet"
|
||||
},
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/obj/effect/mapping_helpers/airlock/access/all/service/janitor,
|
||||
/obj/effect/landmark/navigate_destination/janitor,
|
||||
/turf/open/floor/iron,
|
||||
/area/station/maintenance/starboard/greater)
|
||||
"gpB" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/turf/open/floor/iron,
|
||||
@@ -17623,6 +17636,12 @@
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/command/bridge)
|
||||
"gBz" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/flashlight/flare/candle,
|
||||
/obj/effect/turf_decal/delivery,
|
||||
/turf/open/floor/iron,
|
||||
/area/station/hallway/secondary/exit/departure_lounge)
|
||||
"gBD" = (
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/station/command/teleporter)
|
||||
@@ -19960,19 +19979,6 @@
|
||||
/obj/item/radio/intercom/directional/west,
|
||||
/turf/open/floor/iron,
|
||||
/area/station/service/bar)
|
||||
"hsh" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/plate,
|
||||
/obj/item/candle,
|
||||
/obj/effect/decal/cleanable/dirt/dust,
|
||||
/obj/item/radio{
|
||||
desc = "An old handheld radio. You could use it, if you really wanted to.";
|
||||
icon_state = "radio";
|
||||
name = "old radio";
|
||||
pixel_y = 15
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/space_hut)
|
||||
"hsp" = (
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 1
|
||||
@@ -27066,6 +27072,20 @@
|
||||
/obj/effect/spawner/structure/window,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/space_hut)
|
||||
"jIU" = (
|
||||
/obj/effect/decal/cleanable/dirt/dust,
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/storage/box/lights/mixed,
|
||||
/obj/item/cigbutt/cigarbutt,
|
||||
/obj/item/flashlight/flare/candle{
|
||||
pixel_x = -5
|
||||
},
|
||||
/obj/item/storage/box/matches{
|
||||
pixel_x = 1;
|
||||
pixel_y = -1
|
||||
},
|
||||
/turf/open/floor/iron/white,
|
||||
/area/station/medical/abandoned)
|
||||
"jIV" = (
|
||||
/obj/effect/spawner/random/structure/chair_maintenance,
|
||||
/obj/effect/mapping_helpers/burnt_floor,
|
||||
@@ -30407,6 +30427,21 @@
|
||||
/obj/effect/mapping_helpers/broken_floor,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/port)
|
||||
"kRF" = (
|
||||
/obj/machinery/door/poddoor/shutters/preopen{
|
||||
dir = 4;
|
||||
id = "ordnancebridge"
|
||||
},
|
||||
/obj/machinery/button/door{
|
||||
id = "ordnancebridge";
|
||||
pixel_y = 24;
|
||||
req_one_access = list("maint_tunnels","science")
|
||||
},
|
||||
/obj/effect/turf_decal/caution/stand_clear{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/aft/lesser)
|
||||
"kRV" = (
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4
|
||||
@@ -40574,6 +40609,14 @@
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/station/hallway/primary/central)
|
||||
"oum" = (
|
||||
/obj/item/flashlight/flare/candle,
|
||||
/obj/machinery/light_switch/directional/north,
|
||||
/obj/effect/decal/cleanable/cobweb/cobweb2,
|
||||
/obj/structure/table/wood,
|
||||
/obj/effect/turf_decal/tile/neutral/fourcorners,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/service/chapel)
|
||||
"out" = (
|
||||
/obj/structure/lattice,
|
||||
/obj/item/reagent_containers/cup/glass/bottle/goldschlager,
|
||||
@@ -40963,14 +41006,6 @@
|
||||
/obj/effect/turf_decal/tile/green/fourcorners,
|
||||
/turf/open/floor/iron,
|
||||
/area/station/service/hydroponics)
|
||||
"oBN" = (
|
||||
/obj/item/candle,
|
||||
/obj/machinery/light_switch/directional/north,
|
||||
/obj/effect/decal/cleanable/cobweb/cobweb2,
|
||||
/obj/structure/table/wood,
|
||||
/obj/effect/turf_decal/tile/neutral/fourcorners,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/service/chapel)
|
||||
"oBO" = (
|
||||
/obj/structure/cable,
|
||||
/obj/effect/landmark/start/medical_doctor,
|
||||
@@ -44989,14 +45024,6 @@
|
||||
},
|
||||
/turf/open/floor/circuit/telecomms,
|
||||
/area/station/science/xenobiology)
|
||||
"pZj" = (
|
||||
/obj/item/candle,
|
||||
/obj/machinery/light_switch/directional/west,
|
||||
/obj/effect/decal/cleanable/cobweb,
|
||||
/obj/structure/table/wood,
|
||||
/obj/effect/turf_decal/tile/neutral/fourcorners,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/service/chapel)
|
||||
"pZn" = (
|
||||
/obj/effect/turf_decal/tile/blue{
|
||||
dir = 8
|
||||
@@ -46450,16 +46477,6 @@
|
||||
/obj/machinery/newscaster/directional/west,
|
||||
/turf/open/floor/wood,
|
||||
/area/station/service/library)
|
||||
"qzV" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/machinery/door/window/right/directional/south{
|
||||
dir = 8;
|
||||
name = "Jim Norton's Quebecois Coffee";
|
||||
req_one_access = list("service","maint_tunnels")
|
||||
},
|
||||
/obj/effect/turf_decal/trimline/green/line,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/service/cafeteria)
|
||||
"qAc" = (
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 8
|
||||
@@ -48154,10 +48171,6 @@
|
||||
},
|
||||
/turf/open/floor/engine,
|
||||
/area/station/science/cytology)
|
||||
"rec" = (
|
||||
/obj/docking_port/stationary/escape_pod,
|
||||
/turf/open/space/basic,
|
||||
/area/space)
|
||||
"ret" = (
|
||||
/obj/effect/spawner/random/trash/garbage{
|
||||
spawn_scatter_radius = 1
|
||||
@@ -50115,21 +50128,6 @@
|
||||
/obj/effect/mapping_helpers/broken_floor,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/department/science/xenobiology)
|
||||
"rMx" = (
|
||||
/obj/machinery/door/poddoor/shutters/preopen{
|
||||
dir = 1;
|
||||
id = "ordnancebridge"
|
||||
},
|
||||
/obj/machinery/button/door{
|
||||
id = "ordnancebridge";
|
||||
pixel_x = -24;
|
||||
req_one_access = list("maint_tunnels","science")
|
||||
},
|
||||
/obj/effect/turf_decal/caution/stand_clear{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/aft/lesser)
|
||||
"rMz" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/obj/effect/turf_decal/tile/green{
|
||||
@@ -50338,6 +50336,14 @@
|
||||
"rQw" = (
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/station/solars/starboard/fore)
|
||||
"rQB" = (
|
||||
/obj/item/flashlight/flare/candle,
|
||||
/obj/machinery/light_switch/directional/west,
|
||||
/obj/effect/decal/cleanable/cobweb,
|
||||
/obj/structure/table/wood,
|
||||
/obj/effect/turf_decal/tile/neutral/fourcorners,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/service/chapel)
|
||||
"rQL" = (
|
||||
/obj/effect/turf_decal/stripes/corner{
|
||||
dir = 4
|
||||
@@ -50348,21 +50354,6 @@
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/station/engineering/break_room)
|
||||
"rQO" = (
|
||||
/obj/machinery/door/poddoor/shutters/preopen{
|
||||
dir = 4;
|
||||
id = "ordnancebridge"
|
||||
},
|
||||
/obj/machinery/button/door{
|
||||
id = "ordnancebridge";
|
||||
pixel_y = 24;
|
||||
req_one_access = list("maint_tunnels","science")
|
||||
},
|
||||
/obj/effect/turf_decal/caution/stand_clear{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/aft/lesser)
|
||||
"rQS" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/storage/box/evidence{
|
||||
@@ -59918,20 +59909,6 @@
|
||||
},
|
||||
/turf/open/floor/iron/cafeteria,
|
||||
/area/station/service/kitchen)
|
||||
"veo" = (
|
||||
/obj/effect/decal/cleanable/dirt/dust,
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/storage/box/lights/mixed,
|
||||
/obj/item/cigbutt/cigarbutt,
|
||||
/obj/item/candle{
|
||||
pixel_x = -5
|
||||
},
|
||||
/obj/item/storage/box/matches{
|
||||
pixel_x = 1;
|
||||
pixel_y = -1
|
||||
},
|
||||
/turf/open/floor/iron/white,
|
||||
/area/station/medical/abandoned)
|
||||
"veO" = (
|
||||
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
|
||||
dir = 8
|
||||
@@ -62672,12 +62649,6 @@
|
||||
/obj/effect/mapping_helpers/broken_floor,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/starboard/greater)
|
||||
"waq" = (
|
||||
/obj/docking_port/stationary/escape_pod{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/space/basic,
|
||||
/area/space)
|
||||
"was" = (
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
@@ -64758,6 +64729,25 @@
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/department/engine)
|
||||
"wOQ" = (
|
||||
/obj/structure/safe,
|
||||
/obj/item/storage/secure/briefcase/riches,
|
||||
/obj/item/storage/backpack/duffelbag/syndie/hitman,
|
||||
/obj/item/card/id/advanced/silver/reaper,
|
||||
/obj/item/lazarus_injector,
|
||||
/obj/item/gun/energy/disabler,
|
||||
/obj/item/gun/ballistic/revolver/russian,
|
||||
/obj/item/ammo_box/a357,
|
||||
/obj/item/clothing/neck/stethoscope,
|
||||
/obj/item/book{
|
||||
desc = "An undeniably handy book.";
|
||||
icon_state = "bookknock";
|
||||
name = "\improper A Simpleton's Guide to Safe-cracking with Stethoscopes"
|
||||
},
|
||||
/obj/effect/turf_decal/bot_white/left,
|
||||
/obj/effect/turf_decal/tile/neutral/fourcorners,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/ai_monitored/command/nuke_storage)
|
||||
"wOR" = (
|
||||
/obj/effect/landmark/event_spawn,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
@@ -68773,6 +68763,16 @@
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/port/fore)
|
||||
"ykR" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/machinery/door/window/right/directional/south{
|
||||
dir = 8;
|
||||
name = "Jim Norton's Quebecois Coffee";
|
||||
req_one_access = list("service","maint_tunnels")
|
||||
},
|
||||
/obj/effect/turf_decal/trimline/green/line,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/service/cafeteria)
|
||||
"ykS" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
@@ -78482,7 +78482,7 @@ tkr
|
||||
aaa
|
||||
aaa
|
||||
aaa
|
||||
rec
|
||||
edl
|
||||
cSk
|
||||
auJ
|
||||
jMZ
|
||||
@@ -80339,7 +80339,7 @@ tsd
|
||||
tsd
|
||||
tsd
|
||||
hUN
|
||||
hsh
|
||||
gmG
|
||||
jIR
|
||||
lMJ
|
||||
gQK
|
||||
@@ -87808,7 +87808,7 @@ bEL
|
||||
keq
|
||||
scb
|
||||
suz
|
||||
veo
|
||||
jIU
|
||||
tSw
|
||||
vUM
|
||||
bhS
|
||||
@@ -90550,7 +90550,7 @@ rlU
|
||||
vis
|
||||
mCi
|
||||
ixT
|
||||
aaK
|
||||
wOQ
|
||||
rlU
|
||||
aaa
|
||||
aEH
|
||||
@@ -91075,7 +91075,7 @@ vvH
|
||||
cFp
|
||||
guX
|
||||
mgl
|
||||
qzV
|
||||
ykR
|
||||
wAj
|
||||
pPH
|
||||
hSg
|
||||
@@ -91669,7 +91669,7 @@ bsZ
|
||||
rJI
|
||||
taX
|
||||
tSw
|
||||
pZj
|
||||
rQB
|
||||
gmX
|
||||
lHK
|
||||
tey
|
||||
@@ -93211,7 +93211,7 @@ tSw
|
||||
tSw
|
||||
xWF
|
||||
tSw
|
||||
oBN
|
||||
oum
|
||||
iZi
|
||||
kVN
|
||||
vtD
|
||||
@@ -93725,10 +93725,10 @@ tSw
|
||||
tSw
|
||||
sGA
|
||||
tSw
|
||||
dtp
|
||||
gBz
|
||||
fgl
|
||||
btx
|
||||
dtp
|
||||
gBz
|
||||
otu
|
||||
otu
|
||||
otu
|
||||
@@ -94114,7 +94114,7 @@ isc
|
||||
aaa
|
||||
aaa
|
||||
aaa
|
||||
rec
|
||||
edl
|
||||
tYS
|
||||
lgS
|
||||
jKq
|
||||
@@ -99121,7 +99121,7 @@ wna
|
||||
oFX
|
||||
lWN
|
||||
hND
|
||||
rMx
|
||||
aZv
|
||||
iKL
|
||||
nFa
|
||||
nFa
|
||||
@@ -101182,7 +101182,7 @@ svS
|
||||
svS
|
||||
svS
|
||||
svS
|
||||
rQO
|
||||
kRF
|
||||
dKC
|
||||
anS
|
||||
lMJ
|
||||
@@ -106280,7 +106280,7 @@ unL
|
||||
uNd
|
||||
unL
|
||||
unL
|
||||
fFK
|
||||
gpv
|
||||
unL
|
||||
tUn
|
||||
tUn
|
||||
@@ -106718,7 +106718,7 @@ aaa
|
||||
aaa
|
||||
szp
|
||||
aaa
|
||||
waq
|
||||
dBV
|
||||
aaa
|
||||
szp
|
||||
szp
|
||||
@@ -114730,7 +114730,7 @@ dgm
|
||||
dgB
|
||||
fJy
|
||||
aaa
|
||||
waq
|
||||
dBV
|
||||
aaa
|
||||
fJy
|
||||
oAQ
|
||||
|
||||
@@ -5,6 +5,16 @@
|
||||
"ad" = (
|
||||
/turf/open/space,
|
||||
/area/space)
|
||||
"ai" = (
|
||||
/obj/docking_port/stationary{
|
||||
dwidth = 1;
|
||||
height = 5;
|
||||
name = "recovery ship";
|
||||
shuttle_id = "pod_3_away";
|
||||
width = 3
|
||||
},
|
||||
/turf/open/space,
|
||||
/area/space)
|
||||
"ar" = (
|
||||
/obj/structure/chair/office{
|
||||
dir = 8
|
||||
@@ -94,6 +104,17 @@
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/centcom/central_command_areas/admin)
|
||||
"aL" = (
|
||||
/obj/docking_port/stationary{
|
||||
dir = 4;
|
||||
dwidth = 1;
|
||||
height = 5;
|
||||
name = "recovery ship";
|
||||
shuttle_id = "pod_2_away";
|
||||
width = 3
|
||||
},
|
||||
/turf/open/space,
|
||||
/area/space)
|
||||
"aM" = (
|
||||
/obj/structure/closet/secure_closet/freezer/meat/open,
|
||||
/obj/item/food/meat/rawbacon,
|
||||
@@ -3742,16 +3763,6 @@
|
||||
/obj/effect/mapping_helpers/airlock/access/all/admin/general,
|
||||
/turf/open/floor/iron,
|
||||
/area/centcom/central_command_areas/ferry)
|
||||
"sj" = (
|
||||
/obj/docking_port/stationary{
|
||||
dwidth = 1;
|
||||
height = 5;
|
||||
name = "recovery ship";
|
||||
shuttle_id = "pod_4_away";
|
||||
width = 3
|
||||
},
|
||||
/turf/open/space,
|
||||
/area/space)
|
||||
"sn" = (
|
||||
/obj/machinery/door/airlock/centcom{
|
||||
name = "CentCom Security"
|
||||
@@ -6580,6 +6591,16 @@
|
||||
/obj/effect/turf_decal/bot,
|
||||
/turf/open/floor/iron,
|
||||
/area/centcom/tdome/arena)
|
||||
"Iv" = (
|
||||
/obj/docking_port/stationary{
|
||||
dwidth = 1;
|
||||
height = 5;
|
||||
name = "recovery ship";
|
||||
shuttle_id = "pod_4_away";
|
||||
width = 3
|
||||
},
|
||||
/turf/open/space,
|
||||
/area/space)
|
||||
"Iz" = (
|
||||
/obj/machinery/door/poddoor{
|
||||
id = "thunderdomegen";
|
||||
@@ -8062,16 +8083,6 @@
|
||||
/obj/machinery/status_display/evac/directional/east,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/centcom/central_command_areas/prison)
|
||||
"Qt" = (
|
||||
/obj/docking_port/stationary{
|
||||
dwidth = 1;
|
||||
height = 5;
|
||||
name = "recovery ship";
|
||||
shuttle_id = "pod_3_away";
|
||||
width = 3
|
||||
},
|
||||
/turf/open/space,
|
||||
/area/space)
|
||||
"Qv" = (
|
||||
/obj/effect/turf_decal/tile/red{
|
||||
dir = 8
|
||||
@@ -9777,17 +9788,6 @@
|
||||
},
|
||||
/turf/open/floor/iron/grimy,
|
||||
/area/centcom/central_command_areas/admin)
|
||||
"YS" = (
|
||||
/obj/docking_port/stationary{
|
||||
dir = 4;
|
||||
dwidth = 1;
|
||||
height = 5;
|
||||
name = "recovery ship";
|
||||
shuttle_id = "pod_2_away";
|
||||
width = 3
|
||||
},
|
||||
/turf/open/space,
|
||||
/area/space)
|
||||
"YT" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/structure/plaque/static_plaque/thunderdome{
|
||||
@@ -36193,7 +36193,7 @@ aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
sj
|
||||
Iv
|
||||
KO
|
||||
KV
|
||||
KV
|
||||
@@ -37221,7 +37221,7 @@ aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
Qt
|
||||
ai
|
||||
KO
|
||||
KV
|
||||
KV
|
||||
@@ -38257,7 +38257,7 @@ KQ
|
||||
KH
|
||||
aa
|
||||
aa
|
||||
YS
|
||||
aL
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
|
||||
+1
-1
@@ -119,7 +119,7 @@
|
||||
/obj/item/trash/candle,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/effect/spawner/random/food_or_drink/booze,
|
||||
/obj/item/candle{
|
||||
/obj/item/flashlight/flare/candle{
|
||||
pixel_y = 4;
|
||||
pixel_x = -7
|
||||
},
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1565,7 +1565,7 @@
|
||||
/area/shuttle/escape)
|
||||
"YN" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/candle,
|
||||
/obj/item/flashlight/flare/candle,
|
||||
/turf/open/floor/wood,
|
||||
/area/shuttle/escape)
|
||||
"YS" = (
|
||||
|
||||
@@ -102,6 +102,19 @@
|
||||
/obj/structure/table/wood/fancy,
|
||||
/turf/open/floor/wood,
|
||||
/area/shuttle/escape)
|
||||
"iO" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/reagent_containers/cup/glass/mug/britcup{
|
||||
pixel_x = 8;
|
||||
pixel_y = -1
|
||||
},
|
||||
/obj/item/storage/medkit/regular{
|
||||
pixel_x = -9;
|
||||
pixel_y = 3
|
||||
},
|
||||
/obj/effect/turf_decal/tile/blue/fourcorners,
|
||||
/turf/open/floor/iron/white,
|
||||
/area/shuttle/escape)
|
||||
"iP" = (
|
||||
/obj/effect/turf_decal/tile/blue/fourcorners,
|
||||
/obj/effect/turf_decal/tile/blue/fourcorners,
|
||||
@@ -155,6 +168,16 @@
|
||||
"kd" = (
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
"kE" = (
|
||||
/obj/structure/table/wood/fancy,
|
||||
/obj/item/flashlight/flare/candle/infinite{
|
||||
desc = "A synthetic candle that won't melt down.";
|
||||
name = "crimson red candle";
|
||||
pixel_x = 1;
|
||||
pixel_y = 6
|
||||
},
|
||||
/turf/open/floor/wood,
|
||||
/area/shuttle/escape)
|
||||
"kJ" = (
|
||||
/obj/structure/table/wood/fancy,
|
||||
/obj/item/food/burger/baconburger{
|
||||
@@ -410,19 +433,6 @@
|
||||
},
|
||||
/turf/open/floor/iron/white,
|
||||
/area/shuttle/escape)
|
||||
"tJ" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/reagent_containers/cup/glass/mug/britcup{
|
||||
pixel_x = 8;
|
||||
pixel_y = -1
|
||||
},
|
||||
/obj/item/storage/medkit/regular{
|
||||
pixel_x = -9;
|
||||
pixel_y = 3
|
||||
},
|
||||
/obj/effect/turf_decal/tile/blue/fourcorners,
|
||||
/turf/open/floor/iron/white,
|
||||
/area/shuttle/escape)
|
||||
"uV" = (
|
||||
/turf/closed/wall/mineral/titanium/nodiagonal,
|
||||
/area/shuttle/escape)
|
||||
@@ -800,16 +810,6 @@
|
||||
},
|
||||
/turf/open/floor/iron/white,
|
||||
/area/shuttle/escape)
|
||||
"Hi" = (
|
||||
/obj/structure/table/wood/fancy,
|
||||
/obj/item/candle/infinite{
|
||||
desc = "A synthetic candle that won't melt down.";
|
||||
name = "crimson red candle";
|
||||
pixel_x = 1;
|
||||
pixel_y = 6
|
||||
},
|
||||
/turf/open/floor/wood,
|
||||
/area/shuttle/escape)
|
||||
"Ho" = (
|
||||
/obj/effect/turf_decal/tile/blue{
|
||||
dir = 4
|
||||
@@ -1237,7 +1237,7 @@ en
|
||||
jt
|
||||
jt
|
||||
EC
|
||||
Hi
|
||||
kE
|
||||
Me
|
||||
jt
|
||||
aY
|
||||
@@ -1266,7 +1266,7 @@ kd
|
||||
kd
|
||||
en
|
||||
EC
|
||||
Hi
|
||||
kE
|
||||
WT
|
||||
WT
|
||||
WT
|
||||
@@ -1290,7 +1290,7 @@ WT
|
||||
WT
|
||||
WT
|
||||
EC
|
||||
Hi
|
||||
kE
|
||||
Me
|
||||
jt
|
||||
jt
|
||||
@@ -1655,7 +1655,7 @@ qw
|
||||
Nv
|
||||
VO
|
||||
Gv
|
||||
tJ
|
||||
iO
|
||||
SK
|
||||
cf
|
||||
tB
|
||||
@@ -1956,7 +1956,7 @@ kd
|
||||
kd
|
||||
en
|
||||
EC
|
||||
Hi
|
||||
kE
|
||||
WT
|
||||
WT
|
||||
WT
|
||||
@@ -1980,7 +1980,7 @@ WT
|
||||
WT
|
||||
WT
|
||||
EC
|
||||
Hi
|
||||
kE
|
||||
Me
|
||||
jt
|
||||
jt
|
||||
@@ -2019,7 +2019,7 @@ en
|
||||
jt
|
||||
jt
|
||||
EC
|
||||
Hi
|
||||
kE
|
||||
Me
|
||||
jt
|
||||
qE
|
||||
|
||||
@@ -126,7 +126,7 @@
|
||||
/turf/template_noop,
|
||||
/area/shuttle/escape)
|
||||
"gt" = (
|
||||
/obj/item/candle/infinite{
|
||||
/obj/item/flashlight/flare/candle/infinite{
|
||||
anchored = 1;
|
||||
pixel_y = 8
|
||||
},
|
||||
@@ -721,7 +721,7 @@
|
||||
/turf/open/floor/mineral/titanium/yellow,
|
||||
/area/shuttle/escape)
|
||||
"Fs" = (
|
||||
/obj/item/candle/infinite{
|
||||
/obj/item/flashlight/flare/candle/infinite{
|
||||
anchored = 1;
|
||||
pixel_y = 8
|
||||
},
|
||||
|
||||
@@ -3334,12 +3334,12 @@
|
||||
/area/shuttle/escape)
|
||||
"Sq" = (
|
||||
/obj/structure/table/wood/fancy,
|
||||
/obj/item/candle,
|
||||
/obj/item/candle{
|
||||
/obj/item/flashlight/flare/candle,
|
||||
/obj/item/flashlight/flare/candle{
|
||||
pixel_x = 6;
|
||||
pixel_y = 8
|
||||
},
|
||||
/obj/item/candle{
|
||||
/obj/item/flashlight/flare/candle{
|
||||
pixel_x = -8;
|
||||
pixel_y = 6
|
||||
},
|
||||
|
||||
@@ -120,7 +120,7 @@
|
||||
/area/shuttle/escape)
|
||||
"y" = (
|
||||
/obj/effect/decal/cleanable/blood/gibs/up,
|
||||
/obj/item/candle/infinite,
|
||||
/obj/item/flashlight/flare/candle/infinite,
|
||||
/turf/open/floor/cult,
|
||||
/area/shuttle/escape)
|
||||
"z" = (
|
||||
@@ -128,7 +128,7 @@
|
||||
/turf/open/floor/cult,
|
||||
/area/shuttle/escape)
|
||||
"A" = (
|
||||
/obj/item/candle/infinite,
|
||||
/obj/item/flashlight/flare/candle/infinite,
|
||||
/turf/open/floor/cult,
|
||||
/area/shuttle/escape)
|
||||
"B" = (
|
||||
|
||||
@@ -63,7 +63,7 @@
|
||||
/area/shuttle/escape/brig)
|
||||
"an" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/candle/infinite,
|
||||
/obj/item/flashlight/flare/candle/infinite,
|
||||
/turf/open/floor/cult,
|
||||
/area/shuttle/escape)
|
||||
"ao" = (
|
||||
|
||||
@@ -765,18 +765,6 @@
|
||||
},
|
||||
/turf/open/floor/carpet/black,
|
||||
/area/centcom/central_command_areas/holding)
|
||||
"rW" = (
|
||||
/obj/structure/bed/dogbed/cayenne{
|
||||
name = "Paprika's bed"
|
||||
},
|
||||
/mob/living/basic/carp/pet/cayenne{
|
||||
desc = "It's Paprika! One of the Spider Clan's lovable Space Carp!";
|
||||
faction = list("neutral");
|
||||
name = "Paprika";
|
||||
real_name = "Paprika"
|
||||
},
|
||||
/turf/open/floor/carpet/black,
|
||||
/area/centcom/central_command_areas/holding)
|
||||
"sc" = (
|
||||
/obj/structure/sink/directional/west,
|
||||
/obj/structure/mirror/directional/east,
|
||||
@@ -802,16 +790,6 @@
|
||||
},
|
||||
/turf/open/floor/stone,
|
||||
/area/centcom/central_command_areas/holding)
|
||||
"ti" = (
|
||||
/obj/effect/turf_decal/siding/wood{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/table/wood/fancy/green,
|
||||
/obj/item/candle/infinite{
|
||||
pixel_y = 6
|
||||
},
|
||||
/turf/open/floor/carpet/black,
|
||||
/area/centcom/central_command_areas/holding)
|
||||
"ts" = (
|
||||
/obj/item/food/meat/slab/chicken,
|
||||
/obj/item/food/meat/slab/chicken,
|
||||
@@ -1166,6 +1144,18 @@
|
||||
/obj/machinery/light/small/directional/south,
|
||||
/turf/open/floor/wood/tile,
|
||||
/area/centcom/central_command_areas/holding)
|
||||
"Cr" = (
|
||||
/obj/structure/bed/dogbed/cayenne{
|
||||
name = "Paprika's bed"
|
||||
},
|
||||
/mob/living/basic/carp/pet/cayenne{
|
||||
desc = "It's Paprika! One of the Spider Clan's lovable Space Carp!";
|
||||
faction = list("neutral");
|
||||
name = "Paprika";
|
||||
real_name = "Paprika"
|
||||
},
|
||||
/turf/open/floor/carpet/black,
|
||||
/area/centcom/central_command_areas/holding)
|
||||
"CD" = (
|
||||
/obj/effect/turf_decal/siding/wood{
|
||||
dir = 8
|
||||
@@ -1956,6 +1946,16 @@
|
||||
/obj/structure/chair/stool/bar/directional/west,
|
||||
/turf/open/floor/carpet/black,
|
||||
/area/centcom/central_command_areas/holding)
|
||||
"UW" = (
|
||||
/obj/effect/turf_decal/siding/wood{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/table/wood/fancy/green,
|
||||
/obj/item/flashlight/flare/candle/infinite{
|
||||
pixel_y = 6
|
||||
},
|
||||
/turf/open/floor/carpet/black,
|
||||
/area/centcom/central_command_areas/holding)
|
||||
"UY" = (
|
||||
/obj/machinery/vending/boozeomat,
|
||||
/turf/closed/wall/mineral/wood,
|
||||
@@ -2789,7 +2789,7 @@ XP
|
||||
dg
|
||||
PX
|
||||
hO
|
||||
ti
|
||||
UW
|
||||
jf
|
||||
hO
|
||||
hO
|
||||
@@ -3159,7 +3159,7 @@ xw
|
||||
So
|
||||
dg
|
||||
xi
|
||||
rW
|
||||
Cr
|
||||
dg
|
||||
iH
|
||||
mw
|
||||
|
||||
@@ -24,6 +24,8 @@ GLOBAL_LIST_INIT(trash_loot, list(//junk: useless, very easy to get, or ghetto c
|
||||
/obj/item/trash/popcorn = 1,
|
||||
/obj/item/trash/raisins = 1,
|
||||
/obj/item/trash/sosjerky = 1,
|
||||
/obj/item/trash/flare = 1,
|
||||
/obj/item/trash/candle = 1,
|
||||
|
||||
/obj/item/c_tube = 1,
|
||||
/obj/item/disk/data = 1,
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
/obj/item/stack/cable_coil = 5,
|
||||
/obj/item/food/deadmouse = 1,
|
||||
/obj/item/trash/candle = 1,
|
||||
/obj/item/trash/flare = 1,
|
||||
/obj/item/popsicle_stick = 1,
|
||||
/obj/item/reagent_containers/syringe = 1,
|
||||
/obj/item/reagent_containers/cup/glass/sillycup = 1,
|
||||
|
||||
@@ -879,18 +879,20 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e
|
||||
else
|
||||
. = SFX_DESECRATION
|
||||
|
||||
/// Creates an ignition hotspot if item is lit and located on turf, in mask, or in hand
|
||||
/obj/item/proc/open_flame(flame_heat=700)
|
||||
var/turf/location = loc
|
||||
if(ismob(location))
|
||||
var/mob/M = location
|
||||
var/mob/pyromanic = location
|
||||
var/success = FALSE
|
||||
if(src == M.get_item_by_slot(ITEM_SLOT_MASK))
|
||||
if(src == pyromanic.get_item_by_slot(ITEM_SLOT_MASK) || (src in pyromanic.held_items))
|
||||
success = TRUE
|
||||
if(success)
|
||||
location = get_turf(M)
|
||||
location = get_turf(pyromanic)
|
||||
if(isturf(location))
|
||||
location.hotspot_expose(flame_heat, 5)
|
||||
|
||||
/// If an object can successfully be used as a fire starter it will return a message
|
||||
/obj/item/proc/ignition_effect(atom/A, mob/user)
|
||||
if(get_temperature())
|
||||
. = span_notice("[user] lights [A] with [src].")
|
||||
|
||||
@@ -1,82 +0,0 @@
|
||||
#define CANDLE_LUMINOSITY 2
|
||||
/obj/item/candle
|
||||
name = "red candle"
|
||||
desc = "In Greek myth, Prometheus stole fire from the Gods and gave it to \
|
||||
humankind. The jewelry he kept for himself."
|
||||
icon = 'icons/obj/candle.dmi'
|
||||
icon_state = "candle1"
|
||||
inhand_icon_state = null
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
light_color = LIGHT_COLOR_FIRE
|
||||
heat = 1000
|
||||
/// How many seconds it burns for
|
||||
var/wax = 2000
|
||||
var/lit = FALSE
|
||||
var/infinite = FALSE
|
||||
var/start_lit = FALSE
|
||||
|
||||
/obj/item/candle/Initialize(mapload)
|
||||
. = ..()
|
||||
if(start_lit)
|
||||
light()
|
||||
|
||||
/obj/item/candle/update_icon_state()
|
||||
icon_state = "candle[(wax > 800) ? ((wax > 1500) ? 1 : 2) : 3][lit ? "_lit" : ""]"
|
||||
return ..()
|
||||
|
||||
/obj/item/candle/attackby(obj/item/W, mob/user, params)
|
||||
var/msg = W.ignition_effect(src, user)
|
||||
if(msg)
|
||||
light(msg)
|
||||
else
|
||||
return ..()
|
||||
|
||||
/obj/item/candle/fire_act(exposed_temperature, exposed_volume)
|
||||
if(!lit)
|
||||
light() //honk
|
||||
return ..()
|
||||
|
||||
/obj/item/candle/get_temperature()
|
||||
return lit * heat
|
||||
|
||||
/obj/item/candle/proc/light(show_message)
|
||||
if(!lit)
|
||||
lit = TRUE
|
||||
if(show_message)
|
||||
usr.visible_message(show_message)
|
||||
set_light(CANDLE_LUMINOSITY)
|
||||
START_PROCESSING(SSobj, src)
|
||||
update_appearance()
|
||||
|
||||
/obj/item/candle/proc/put_out_candle()
|
||||
if(!lit)
|
||||
return
|
||||
lit = FALSE
|
||||
update_appearance()
|
||||
set_light(0)
|
||||
return TRUE
|
||||
|
||||
/obj/item/candle/extinguish()
|
||||
put_out_candle()
|
||||
return ..()
|
||||
|
||||
/obj/item/candle/process(delta_time)
|
||||
if(!lit)
|
||||
return PROCESS_KILL
|
||||
if(!infinite)
|
||||
wax -= delta_time
|
||||
if(wax <= 0)
|
||||
new /obj/item/trash/candle(loc)
|
||||
qdel(src)
|
||||
update_appearance()
|
||||
open_flame()
|
||||
|
||||
/obj/item/candle/attack_self(mob/user)
|
||||
if(put_out_candle())
|
||||
user.visible_message(span_notice("[user] snuffs [src]."))
|
||||
|
||||
/obj/item/candle/infinite
|
||||
infinite = TRUE
|
||||
start_lit = TRUE
|
||||
|
||||
#undef CANDLE_LUMINOSITY
|
||||
@@ -45,7 +45,7 @@
|
||||
|
||||
return NONE
|
||||
|
||||
/obj/item/flashlight/proc/update_brightness(mob/user)
|
||||
/obj/item/flashlight/proc/update_brightness()
|
||||
if(on)
|
||||
icon_state = "[initial(icon_state)]-on"
|
||||
else
|
||||
@@ -54,14 +54,15 @@
|
||||
if(light_system == STATIC_LIGHT)
|
||||
update_light()
|
||||
|
||||
/obj/item/flashlight/proc/toggle_light(mob/user)
|
||||
/obj/item/flashlight/proc/toggle_light()
|
||||
on = !on
|
||||
playsound(user, on ? sound_on : sound_off, 40, TRUE)
|
||||
update_brightness(user)
|
||||
playsound(src, on ? sound_on : sound_off, 40, TRUE)
|
||||
update_brightness()
|
||||
update_item_action_buttons()
|
||||
return TRUE
|
||||
|
||||
/obj/item/flashlight/attack_self(mob/user)
|
||||
toggle_light(user)
|
||||
toggle_light()
|
||||
|
||||
/obj/item/flashlight/attack_hand_secondary(mob/user, list/modifiers)
|
||||
attack_self(user)
|
||||
@@ -293,62 +294,151 @@
|
||||
toggle_context = FALSE
|
||||
/// How many seconds of fuel we have left
|
||||
var/fuel = 0
|
||||
/// Do we randomize the fuel when initialized
|
||||
var/randomize_fuel = TRUE
|
||||
/// How much damage it does when turned on
|
||||
var/on_damage = 7
|
||||
var/produce_heat = 1500
|
||||
/// Type of atom thats spawns after fuel is used up
|
||||
var/trash_type = /obj/item/trash/flare
|
||||
/// If the light source can be extinguished
|
||||
var/can_be_extinguished = FALSE
|
||||
|
||||
/obj/item/flashlight/flare/Initialize(mapload)
|
||||
. = ..()
|
||||
fuel = rand(1600, 2000)
|
||||
if(randomize_fuel)
|
||||
fuel = rand(25 MINUTES, 35 MINUTES)
|
||||
if(on)
|
||||
attack_verb_continuous = string_list(list("burns", "singes"))
|
||||
attack_verb_simple = string_list(list("burn", "singe"))
|
||||
hitsound = 'sound/items/welder.ogg'
|
||||
force = on_damage
|
||||
damtype = BURN
|
||||
update_brightness()
|
||||
|
||||
/obj/item/flashlight/flare/process(delta_time)
|
||||
open_flame(heat)
|
||||
fuel = max(fuel -= delta_time, 0)
|
||||
if(fuel <= 0 || !on)
|
||||
turn_off()
|
||||
if(!fuel)
|
||||
icon_state = "[initial(icon_state)]-empty"
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
/obj/item/flashlight/flare/toggle_light()
|
||||
if(on || !fuel)
|
||||
return FALSE
|
||||
|
||||
/obj/item/flashlight/flare/ignition_effect(atom/A, mob/user)
|
||||
. = fuel && on ? span_notice("[user] lights [A] with [src] like a real badass.") : ""
|
||||
name = "lit [initial(name)]"
|
||||
attack_verb_continuous = string_list(list("burns", "singes"))
|
||||
attack_verb_simple = string_list(list("burn", "singe"))
|
||||
hitsound = 'sound/items/welder.ogg'
|
||||
force = on_damage
|
||||
damtype = BURN
|
||||
. = ..()
|
||||
|
||||
/obj/item/flashlight/flare/proc/turn_off()
|
||||
on = FALSE
|
||||
force = initial(src.force)
|
||||
damtype = initial(src.damtype)
|
||||
if(ismob(loc))
|
||||
var/mob/U = loc
|
||||
update_brightness(U)
|
||||
else
|
||||
update_brightness(null)
|
||||
name = initial(name)
|
||||
attack_verb_continuous = initial(attack_verb_continuous)
|
||||
attack_verb_simple = initial(attack_verb_simple)
|
||||
hitsound = initial(hitsound)
|
||||
force = initial(force)
|
||||
damtype = initial(damtype)
|
||||
update_brightness()
|
||||
|
||||
/obj/item/flashlight/flare/update_brightness(mob/user = null)
|
||||
/obj/item/flashlight/flare/extinguish()
|
||||
if(fuel != INFINITY && can_be_extinguished)
|
||||
turn_off()
|
||||
return ..()
|
||||
|
||||
/obj/item/flashlight/flare/update_brightness()
|
||||
..()
|
||||
if(on)
|
||||
inhand_icon_state = "[initial(inhand_icon_state)]-on"
|
||||
else
|
||||
inhand_icon_state = "[initial(inhand_icon_state)]"
|
||||
inhand_icon_state = "[initial(inhand_icon_state)]" + (on ? "-on" : "")
|
||||
update_appearance()
|
||||
|
||||
/obj/item/flashlight/flare/process(delta_time)
|
||||
open_flame(heat)
|
||||
fuel = max(fuel - delta_time * (1 SECONDS), 0)
|
||||
|
||||
if(!fuel || !on)
|
||||
turn_off()
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
|
||||
if(!fuel && trash_type)
|
||||
new trash_type(loc)
|
||||
qdel(src)
|
||||
|
||||
/obj/item/flashlight/flare/ignition_effect(atom/A, mob/user)
|
||||
if(get_temperature())
|
||||
. = span_notice("[user] lights [A] with [src].")
|
||||
|
||||
/obj/item/flashlight/flare/proc/ignition(mob/user)
|
||||
if(user && !fuel)
|
||||
to_chat(user, span_warning("[src] is out of fuel!"))
|
||||
return FALSE
|
||||
if(user && on)
|
||||
to_chat(user, span_warning("[src] is already lit!"))
|
||||
return FALSE
|
||||
if(!toggle_light())
|
||||
return FALSE
|
||||
|
||||
if(fuel != INFINITY)
|
||||
START_PROCESSING(SSobj, src)
|
||||
|
||||
return TRUE
|
||||
|
||||
/obj/item/flashlight/flare/fire_act(exposed_temperature, exposed_volume)
|
||||
ignition()
|
||||
return ..()
|
||||
|
||||
/obj/item/flashlight/flare/attack_self(mob/user)
|
||||
// Usual checks
|
||||
if(fuel <= 0)
|
||||
to_chat(user, span_warning("[src] is out of fuel!"))
|
||||
return
|
||||
if(on)
|
||||
to_chat(user, span_warning("[src] is already on!"))
|
||||
return
|
||||
|
||||
. = ..()
|
||||
// All good, turn it on.
|
||||
if(.)
|
||||
if(ignition(user))
|
||||
user.visible_message(span_notice("[user] lights \the [src]."), span_notice("You light \the [src]!"))
|
||||
force = on_damage
|
||||
damtype = BURN
|
||||
START_PROCESSING(SSobj, src)
|
||||
|
||||
/obj/item/flashlight/flare/get_temperature()
|
||||
return on * heat
|
||||
|
||||
/obj/item/flashlight/flare/candle
|
||||
name = "red candle"
|
||||
desc = "In Greek myth, Prometheus stole fire from the Gods and gave it to \
|
||||
humankind. The jewelry he kept for himself."
|
||||
icon = 'icons/obj/candle.dmi'
|
||||
icon_state = "candle1"
|
||||
inhand_icon_state = null
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
light_color = LIGHT_COLOR_FIRE
|
||||
light_range = 2
|
||||
fuel = 35 MINUTES
|
||||
randomize_fuel = FALSE
|
||||
trash_type = /obj/item/trash/candle
|
||||
can_be_extinguished = TRUE
|
||||
|
||||
/obj/item/flashlight/flare/candle/update_icon_state()
|
||||
. = ..()
|
||||
var/wax_level
|
||||
switch(fuel)
|
||||
if(25 MINUTES to INFINITY)
|
||||
wax_level = 1
|
||||
if(15 MINUTES to 25 MINUTES)
|
||||
wax_level = 2
|
||||
if(0 to 15 MINUTES)
|
||||
wax_level = 3
|
||||
icon_state = "candle[wax_level][on ? "_lit" : ""]"
|
||||
|
||||
/obj/item/flashlight/flare/candle/attackby(obj/item/fire_starter, mob/user, params)
|
||||
var/success_msg = fire_starter.ignition_effect(src, user)
|
||||
if(success_msg && ignition(user))
|
||||
user.visible_message(success_msg)
|
||||
else
|
||||
return ..()
|
||||
|
||||
/obj/item/flashlight/flare/candle/attack_self(mob/user)
|
||||
if(on && fuel != INFINITY && !can_be_extinguished) // can't extinguish eternal candles
|
||||
turn_off()
|
||||
user.visible_message(span_notice("[user] snuffs [src]."))
|
||||
|
||||
/obj/item/flashlight/flare/candle/process(delta_time)
|
||||
. = ..()
|
||||
update_appearance()
|
||||
|
||||
/obj/item/flashlight/flare/candle/infinite
|
||||
name = "eternal candle"
|
||||
fuel = INFINITY
|
||||
on = TRUE
|
||||
randomize_fuel = FALSE
|
||||
can_be_extinguished = FALSE
|
||||
|
||||
/obj/item/flashlight/flare/torch
|
||||
name = "torch"
|
||||
desc = "A torch fashioned from some leaves and a log."
|
||||
@@ -361,6 +451,8 @@
|
||||
light_color = LIGHT_COLOR_ORANGE
|
||||
on_damage = 10
|
||||
slot_flags = null
|
||||
trash_type = /obj/effect/decal/cleanable/ash
|
||||
can_be_extinguished = TRUE
|
||||
|
||||
/obj/item/flashlight/lantern
|
||||
name = "lantern"
|
||||
@@ -478,7 +570,7 @@
|
||||
var/fuel = 0
|
||||
|
||||
/obj/item/flashlight/glowstick/Initialize(mapload)
|
||||
fuel = rand(3200, 4000)
|
||||
fuel = rand(50 MINUTES, 60 MINUTES)
|
||||
set_light_color(color)
|
||||
return ..()
|
||||
|
||||
@@ -487,7 +579,7 @@
|
||||
return ..()
|
||||
|
||||
/obj/item/flashlight/glowstick/process(delta_time)
|
||||
fuel = max(fuel - delta_time, 0)
|
||||
fuel = max(fuel - delta_time * (1 SECONDS), 0)
|
||||
if(fuel <= 0)
|
||||
turn_off()
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
@@ -608,7 +700,7 @@
|
||||
///Variable to preserve old lighting behavior in flashlights, to handle darkness.
|
||||
var/dark_light_power = -3
|
||||
|
||||
/obj/item/flashlight/flashdark/update_brightness(mob/user)
|
||||
/obj/item/flashlight/flashdark/update_brightness()
|
||||
. = ..()
|
||||
if(on)
|
||||
set_light(dark_light_range, dark_light_power)
|
||||
|
||||
@@ -162,7 +162,7 @@
|
||||
worn_icon_state = "cigpack"
|
||||
throwforce = 2
|
||||
slot_flags = ITEM_SLOT_BELT
|
||||
spawn_type = /obj/item/candle
|
||||
spawn_type = /obj/item/flashlight/flare/candle
|
||||
spawn_count = 5
|
||||
is_open = TRUE
|
||||
contents_tag = "candle"
|
||||
|
||||
@@ -102,10 +102,15 @@
|
||||
resistance_flags = NONE
|
||||
|
||||
/obj/item/trash/candle
|
||||
name = "candle"
|
||||
name = "melted candle"
|
||||
icon = 'icons/obj/candle.dmi'
|
||||
icon_state = "candle4"
|
||||
|
||||
/obj/item/trash/flare
|
||||
name = "burnt flare"
|
||||
icon = 'icons/obj/lighting.dmi'
|
||||
icon_state = "flare-empty"
|
||||
|
||||
/obj/item/trash/can
|
||||
name = "crushed can"
|
||||
icon_state = "cola"
|
||||
|
||||
@@ -574,7 +574,7 @@
|
||||
|
||||
var/static/list/potential_easy_items = list(
|
||||
/obj/item/shard,
|
||||
/obj/item/candle,
|
||||
/obj/item/flashlight/flare/candle,
|
||||
/obj/item/book,
|
||||
/obj/item/pen,
|
||||
/obj/item/paper,
|
||||
|
||||
@@ -137,7 +137,7 @@
|
||||
/obj/item/organ/internal/liver = 1,
|
||||
/obj/item/melee/baton/security = 1, // Technically means a cattleprod is valid
|
||||
/obj/item/clothing/mask = 1,
|
||||
/obj/item/candle = 4,
|
||||
/obj/item/flashlight/flare/candle = 4,
|
||||
)
|
||||
result_atoms = list(/obj/item/clothing/mask/madness_mask)
|
||||
cost = 1
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
required_atoms = list(
|
||||
/obj/item/organ/internal/eyes = 1,
|
||||
/obj/item/shard = 1,
|
||||
/obj/item/candle = 1,
|
||||
/obj/item/flashlight/flare/candle = 1,
|
||||
)
|
||||
result_atoms = list(/obj/item/clothing/neck/eldritch_amulet)
|
||||
cost = 1
|
||||
|
||||
@@ -155,4 +155,4 @@
|
||||
/datum/export/candle
|
||||
cost = CARGO_CRATE_VALUE * 0.125
|
||||
unit_name = "candle"
|
||||
export_types = list(/obj/item/candle)
|
||||
export_types = list(/obj/item/flashlight/flare/candle)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
//Chaplain Suit Subtypes
|
||||
//If any new staple chaplain items get added, put them in these lists
|
||||
/obj/item/clothing/suit/chaplainsuit
|
||||
allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
|
||||
allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/flashlight/flare/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
|
||||
icon = 'icons/obj/clothing/suits/chaplain.dmi'
|
||||
worn_icon = 'icons/mob/clothing/suits/chaplain.dmi'
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
wound = 20
|
||||
|
||||
/obj/item/clothing/suit/hooded/chaplainsuit
|
||||
allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
|
||||
allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/flashlight/flare/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
|
||||
|
||||
//Suits
|
||||
/obj/item/clothing/suit/chaplainsuit/holidaypriest
|
||||
@@ -134,7 +134,7 @@
|
||||
desc = "It sounds like hissing steam, ticking cogs, gone silent, It looks like a dead machine, trying to tick with life."
|
||||
icon_state = "clockwork_cuirass"
|
||||
inhand_icon_state = null
|
||||
allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
|
||||
allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/flashlight/flare/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
|
||||
slowdown = 0
|
||||
clothing_flags = NONE
|
||||
|
||||
@@ -164,7 +164,7 @@
|
||||
desc = "God wills it!"
|
||||
icon_state = "knight_templar"
|
||||
inhand_icon_state = null
|
||||
allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
|
||||
allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/flashlight/flare/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
|
||||
slowdown = 0
|
||||
clothing_flags = NONE
|
||||
|
||||
@@ -242,7 +242,7 @@
|
||||
worn_icon = 'icons/mob/clothing/suits/chaplain.dmi'
|
||||
inhand_icon_state = null
|
||||
body_parts_covered = CHEST|GROIN|LEGS|ARMS
|
||||
allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
|
||||
allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/flashlight/flare/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
|
||||
hoodtype = /obj/item/clothing/head/hooded/chaplain_hood
|
||||
|
||||
/obj/item/clothing/head/hooded/chaplain_hood
|
||||
|
||||
@@ -128,7 +128,7 @@
|
||||
inhand_icon_state = "imperium_monk"
|
||||
body_parts_covered = CHEST|GROIN|LEGS|ARMS
|
||||
flags_inv = HIDESHOES|HIDEJUMPSUIT
|
||||
allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
|
||||
allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/flashlight/flare/candle, /obj/item/tank/internals/emergency_oxygen)
|
||||
|
||||
/obj/item/clothing/suit/costume/chickensuit
|
||||
name = "chicken suit"
|
||||
|
||||
@@ -70,7 +70,7 @@
|
||||
name = "Birthday cake"
|
||||
reqs = list(
|
||||
/obj/item/food/cake/plain = 1,
|
||||
/obj/item/candle = 1,
|
||||
/obj/item/flashlight/flare/candle = 1,
|
||||
/datum/reagent/consumable/sugar = 5,
|
||||
/datum/reagent/consumable/caramel = 2
|
||||
)
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
|
||||
/datum/crafting_recipe/food/reaction/candle
|
||||
reaction = /datum/chemical_reaction/candlefication
|
||||
result = /obj/item/candle
|
||||
result = /obj/item/flashlight/flare/candle
|
||||
category = CAT_CAKE
|
||||
|
||||
/datum/crafting_recipe/food/reaction/tofu
|
||||
|
||||
@@ -119,7 +119,7 @@
|
||||
/datum/chemical_reaction/candlefication/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
|
||||
var/location = get_turf(holder.my_atom)
|
||||
for(var/i in 1 to created_volume)
|
||||
new /obj/item/candle(location)
|
||||
new /obj/item/flashlight/flare/candle(location)
|
||||
|
||||
/datum/chemical_reaction/meatification
|
||||
required_reagents = list(/datum/reagent/liquidgibs = 10, /datum/reagent/consumable/nutriment = 10, /datum/reagent/carbon = 10)
|
||||
|
||||
@@ -204,7 +204,7 @@
|
||||
tgui_icon = "fire-alt"
|
||||
alignment = ALIGNMENT_NEUT
|
||||
max_favor = 10000
|
||||
desired_items = list(/obj/item/candle = "already lit")
|
||||
desired_items = list(/obj/item/flashlight/flare/candle = "already lit")
|
||||
rites_list = list(/datum/religion_rites/fireproof, /datum/religion_rites/burning_sacrifice, /datum/religion_rites/infinite_candle)
|
||||
altar_icon_state = "convertaltar-red"
|
||||
|
||||
@@ -212,10 +212,10 @@
|
||||
/datum/religion_sect/pyre/sect_bless(mob/living/target, mob/living/chap)
|
||||
return TRUE
|
||||
|
||||
/datum/religion_sect/pyre/on_sacrifice(obj/item/candle/offering, mob/living/user)
|
||||
/datum/religion_sect/pyre/on_sacrifice(obj/item/flashlight/flare/candle/offering, mob/living/user)
|
||||
if(!istype(offering))
|
||||
return
|
||||
if(!offering.lit)
|
||||
if(!offering.on)
|
||||
to_chat(user, span_notice("The candle needs to be lit to be offered!"))
|
||||
return
|
||||
to_chat(user, span_notice("[GLOB.deity] is pleased with your sacrifice."))
|
||||
|
||||
@@ -253,7 +253,7 @@
|
||||
..()
|
||||
var/altar_turf = get_turf(religious_tool)
|
||||
for(var/i in 1 to 5)
|
||||
new /obj/item/candle/infinite(altar_turf)
|
||||
new /obj/item/flashlight/flare/candle/infinite(altar_turf)
|
||||
playsound(altar_turf, 'sound/magic/fireball.ogg', 50, TRUE)
|
||||
return TRUE
|
||||
|
||||
|
||||
@@ -1667,7 +1667,6 @@
|
||||
#include "code\game\objects\items\bouquets.dm"
|
||||
#include "code\game\objects\items\boxcutter.dm"
|
||||
#include "code\game\objects\items\broom.dm"
|
||||
#include "code\game\objects\items\candle.dm"
|
||||
#include "code\game\objects\items\cardboard_cutouts.dm"
|
||||
#include "code\game\objects\items\cards_ids.dm"
|
||||
#include "code\game\objects\items\chainsaw.dm"
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
#comment This repaths candles to be a subtype of a flares.
|
||||
|
||||
/obj/item/candle : /obj/item/flashlight/flare/candle{@OLD}
|
||||
/obj/item/candle/infinite : /obj/item/flashlight/flare/candle/infinite{@OLD}
|
||||
Reference in New Issue
Block a user