mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-26 22:57:39 +01:00
Merge pull request #6172 from Verkister/unpeanus
Fixes char setup tail layering and some POI/xenoarch active edges.
This commit is contained in:
Nadyr
@@ -161,7 +161,7 @@ var/list/preferences_datums = list()
|
||||
var/multilingual_mode = 0 // Default behaviour, delimiter-key-space, delimiter-key-delimiter, off
|
||||
|
||||
var/list/volume_channels = list()
|
||||
|
||||
|
||||
///If they are currently in the process of swapping slots, don't let them open 999 windows for it and get confused
|
||||
var/selecting_slots = FALSE
|
||||
|
||||
@@ -278,7 +278,7 @@ var/list/preferences_datums = list()
|
||||
popup.open(FALSE) // Skip registring onclose on the browser pane
|
||||
onclose(user, "preferences_window", src) // We want to register on the window itself
|
||||
|
||||
/datum/preferences/proc/update_character_previews(mutable_appearance/MA)
|
||||
/*datum/preferences/proc/update_character_previews(mutable_appearance/MA) //CHOMPEdit _ch override.
|
||||
if(!client)
|
||||
return
|
||||
|
||||
@@ -309,7 +309,7 @@ var/list/preferences_datums = list()
|
||||
client.screen |= O
|
||||
O.appearance = MA
|
||||
O.dir = D
|
||||
O.screen_loc = preview_screen_locs["[D]"]
|
||||
O.screen_loc = preview_screen_locs["[D]"]*/
|
||||
|
||||
/datum/preferences/proc/show_character_previews()
|
||||
if(!client || !char_render_holders)
|
||||
|
||||
@@ -27,3 +27,39 @@
|
||||
SScharacter_setup.queue_preferences_save(prefs)
|
||||
|
||||
feedback_add_details("admin_verb", "TSleepMusic")
|
||||
|
||||
/datum/preferences/proc/update_character_previews(var/mob/living/carbon/human/mannequin)
|
||||
if(!client)
|
||||
return
|
||||
|
||||
var/obj/screen/setup_preview/pm_helper/PMH = LAZYACCESS(char_render_holders, "PMH")
|
||||
if(!PMH)
|
||||
PMH = new
|
||||
LAZYSET(char_render_holders, "PMH", PMH)
|
||||
client.screen |= PMH
|
||||
PMH.screen_loc = preview_screen_locs["PMH"]
|
||||
|
||||
var/obj/screen/setup_preview/bg/BG = LAZYACCESS(char_render_holders, "BG")
|
||||
if(!BG)
|
||||
BG = new
|
||||
BG.plane = TURF_PLANE
|
||||
BG.icon = 'icons/effects/setup_backgrounds_vr.dmi'
|
||||
BG.pref = src
|
||||
LAZYSET(char_render_holders, "BG", BG)
|
||||
client.screen |= BG
|
||||
BG.icon_state = bgstate
|
||||
BG.screen_loc = preview_screen_locs["BG"]
|
||||
|
||||
for(var/D in global.cardinal)
|
||||
var/obj/screen/setup_preview/O = LAZYACCESS(char_render_holders, "[D]")
|
||||
if(!O)
|
||||
O = new
|
||||
O.pref = src
|
||||
LAZYSET(char_render_holders, "[D]", O)
|
||||
client.screen |= O
|
||||
mannequin.set_dir(D)
|
||||
mannequin.update_tail_showing()
|
||||
mannequin.ImmediateOverlayUpdate()
|
||||
var/mutable_appearance/MA = new(mannequin)
|
||||
O.appearance = MA
|
||||
O.screen_loc = preview_screen_locs["[D]"]
|
||||
@@ -261,10 +261,10 @@
|
||||
mannequin.update_transform() //VOREStation Edit to update size/shape stuff.
|
||||
mannequin.toggle_tail(setting = animations_toggle)
|
||||
mannequin.toggle_wing(setting = animations_toggle)
|
||||
mannequin.update_tail_showing()
|
||||
mannequin.ImmediateOverlayUpdate()
|
||||
//mannequin.update_tail_showing() //CHOMPEdit. Moved to preferences_ch.dm
|
||||
//mannequin.ImmediateOverlayUpdate() //CHOMPEdit
|
||||
|
||||
update_character_previews(new /mutable_appearance(mannequin))
|
||||
update_character_previews(mannequin) //CHOMPEdit
|
||||
|
||||
/datum/preferences/proc/get_highest_job()
|
||||
var/datum/job/highJob
|
||||
|
||||
@@ -24,26 +24,46 @@
|
||||
/obj/machinery/conveyor{
|
||||
id = "anolongstorage"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/turf/simulated/floor/plating{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/surface/outpost/research/xenoarcheology)
|
||||
"ai" = (
|
||||
/turf/simulated/floor/plating,
|
||||
/turf/simulated/floor/plating{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/surface/outpost/research/xenoarcheology)
|
||||
"aj" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/simulated/floor/plating,
|
||||
/turf/simulated/floor/plating{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/surface/outpost/research/xenoarcheology)
|
||||
"ak" = (
|
||||
/obj/machinery/conveyor_switch{
|
||||
id = "anolongstorage";
|
||||
req_access = list(65)
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/turf/simulated/floor/plating{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/surface/outpost/research/xenoarcheology)
|
||||
"al" = (
|
||||
/obj/machinery/light/small,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/simulated/floor/plating,
|
||||
/turf/simulated/floor/plating{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/surface/outpost/research/xenoarcheology)
|
||||
"am" = (
|
||||
/turf/simulated/wall/r_wall,
|
||||
@@ -1796,7 +1816,9 @@
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/floodlight,
|
||||
/turf/simulated/floor/tiled/asteroid_steel,
|
||||
/turf/simulated/floor/tiled/asteroid_steel{
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"dE" = (
|
||||
/obj/machinery/artifact_scanpad,
|
||||
@@ -1839,7 +1861,9 @@
|
||||
pixel_x = 2;
|
||||
pixel_y = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/asteroid_steel,
|
||||
/turf/simulated/floor/tiled/asteroid_steel{
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"dK" = (
|
||||
/obj/machinery/computer/crew{
|
||||
@@ -1977,7 +2001,9 @@
|
||||
pixel_x = 2;
|
||||
pixel_y = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/asteroid_steel,
|
||||
/turf/simulated/floor/tiled/asteroid_steel{
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"dW" = (
|
||||
/obj/machinery/atmospherics/binary/pump{
|
||||
@@ -2227,7 +2253,9 @@
|
||||
/obj/effect/floor_decal/industrial/warning/dust{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/asteroid_steel,
|
||||
/turf/simulated/floor/tiled/asteroid_steel{
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"ez" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
@@ -3194,7 +3222,9 @@
|
||||
/obj/machinery/light/small{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/asteroid_steel,
|
||||
/turf/simulated/floor/tiled/asteroid_steel{
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"gq" = (
|
||||
/obj/machinery/light/small{
|
||||
@@ -3203,7 +3233,9 @@
|
||||
/obj/effect/floor_decal/industrial/warning/dust{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/asteroid_steel,
|
||||
/turf/simulated/floor/tiled/asteroid_steel{
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"gr" = (
|
||||
/obj/item/stack/flag/red{
|
||||
@@ -3216,13 +3248,17 @@
|
||||
/obj/effect/floor_decal/industrial/warning/dust{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled/asteroid_steel,
|
||||
/turf/simulated/floor/tiled/asteroid_steel{
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"gt" = (
|
||||
/obj/effect/floor_decal/industrial/warning/dust{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/asteroid_steel,
|
||||
/turf/simulated/floor/tiled/asteroid_steel{
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"gu" = (
|
||||
/obj/structure/cable{
|
||||
@@ -3366,7 +3402,10 @@
|
||||
/area/surface/cave/explored/normal)
|
||||
"gM" = (
|
||||
/turf/simulated/floor/plating{
|
||||
icon_state = "asteroidplating2"
|
||||
icon_state = "asteroidplating2";
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/research/xenoarcheology/exterior)
|
||||
"gN" = (
|
||||
@@ -4006,7 +4045,9 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/light/small,
|
||||
/turf/simulated/floor/tiled/asteroid_steel,
|
||||
/turf/simulated/floor/tiled/asteroid_steel{
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"ij" = (
|
||||
/obj/structure/cable/heavyduty{
|
||||
@@ -4016,7 +4057,10 @@
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/turf/simulated/floor/plating{
|
||||
icon_state = "asteroidplating2"
|
||||
icon_state = "asteroidplating2";
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"ik" = (
|
||||
@@ -4027,25 +4071,35 @@
|
||||
/obj/structure/cable/heavyduty{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/simulated/floor/tiled/asteroid_steel,
|
||||
/turf/simulated/floor/tiled/asteroid_steel{
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"il" = (
|
||||
/obj/structure/cable/heavyduty{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/simulated/floor/plating{
|
||||
icon_state = "asteroidplating2"
|
||||
icon_state = "asteroidplating2";
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/research/xenoarcheology/exterior)
|
||||
"im" = (
|
||||
/turf/simulated/floor/tiled/asteroid_steel,
|
||||
/turf/simulated/floor/tiled/asteroid_steel{
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"in" = (
|
||||
/obj/structure/cable/heavyduty{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/plating{
|
||||
icon_state = "asteroidplating2"
|
||||
icon_state = "asteroidplating2";
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"io" = (
|
||||
@@ -4064,21 +4118,29 @@
|
||||
/obj/vehicle/train/engine{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/asteroid_steel,
|
||||
/turf/simulated/floor/tiled/asteroid_steel{
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"ir" = (
|
||||
/obj/machinery/mining/brace,
|
||||
/turf/simulated/floor/tiled/asteroid_steel,
|
||||
/turf/simulated/floor/tiled/asteroid_steel{
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"is" = (
|
||||
/obj/machinery/mining/drill,
|
||||
/turf/simulated/floor/tiled/asteroid_steel,
|
||||
/turf/simulated/floor/tiled/asteroid_steel{
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"it" = (
|
||||
/obj/vehicle/train/trolley{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/asteroid_steel,
|
||||
/turf/simulated/floor/tiled/asteroid_steel{
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"iw" = (
|
||||
/obj/machinery/power/apc{
|
||||
@@ -4089,22 +4151,31 @@
|
||||
d2 = 4;
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/turf/simulated/floor/tiled/asteroid_steel,
|
||||
/turf/simulated/floor/tiled/asteroid_steel{
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"ix" = (
|
||||
/obj/structure/cable/heavyduty{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/simulated/floor/tiled/asteroid_steel,
|
||||
/turf/simulated/floor/tiled/asteroid_steel{
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"iz" = (
|
||||
/obj/effect/floor_decal/industrial/warning/dust,
|
||||
/obj/structure/ore_box,
|
||||
/turf/simulated/floor/tiled/asteroid_steel,
|
||||
/turf/simulated/floor/tiled/asteroid_steel{
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"iA" = (
|
||||
/turf/simulated/floor/plating{
|
||||
icon_state = "asteroidplating2"
|
||||
icon_state = "asteroidplating2";
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"iB" = (
|
||||
@@ -4127,7 +4198,10 @@
|
||||
},
|
||||
/obj/effect/zone_divider,
|
||||
/turf/simulated/floor/plating{
|
||||
icon_state = "asteroidplating2"
|
||||
icon_state = "asteroidplating2";
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"kX" = (
|
||||
@@ -4158,7 +4232,10 @@
|
||||
},
|
||||
/obj/effect/zone_divider,
|
||||
/turf/simulated/floor/plating{
|
||||
icon_state = "asteroidplating2"
|
||||
icon_state = "asteroidplating2";
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"ot" = (
|
||||
@@ -4186,7 +4263,10 @@
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/simulated/floor/plating{
|
||||
icon_state = "asteroidplating2"
|
||||
icon_state = "asteroidplating2";
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/research/xenoarcheology/exterior)
|
||||
"qC" = (
|
||||
@@ -4225,13 +4305,19 @@
|
||||
pixel_y = 24
|
||||
},
|
||||
/turf/simulated/floor/plating{
|
||||
icon_state = "asteroidplating2"
|
||||
icon_state = "asteroidplating2";
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/research/xenoarcheology/exterior)
|
||||
"xh" = (
|
||||
/obj/effect/zone_divider,
|
||||
/turf/simulated/floor/plating{
|
||||
icon_state = "asteroidplating2"
|
||||
icon_state = "asteroidplating2";
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"zJ" = (
|
||||
@@ -4239,7 +4325,10 @@
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/plating{
|
||||
icon_state = "asteroidplating2"
|
||||
icon_state = "asteroidplating2";
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/research/xenoarcheology/exterior)
|
||||
"zL" = (
|
||||
@@ -4252,7 +4341,10 @@
|
||||
},
|
||||
/obj/effect/map_effect/perma_light/concentrated/incandescent,
|
||||
/turf/simulated/floor/plating{
|
||||
icon_state = "asteroidplating2"
|
||||
icon_state = "asteroidplating2";
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"Co" = (
|
||||
@@ -4260,7 +4352,10 @@
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/plating{
|
||||
icon_state = "asteroidplating2"
|
||||
icon_state = "asteroidplating2";
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"Cx" = (
|
||||
@@ -4275,7 +4370,10 @@
|
||||
},
|
||||
/obj/effect/zone_divider,
|
||||
/turf/simulated/floor/plating{
|
||||
icon_state = "asteroidplating2"
|
||||
icon_state = "asteroidplating2";
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/research/xenoarcheology/exterior)
|
||||
"EC" = (
|
||||
@@ -4322,7 +4420,10 @@
|
||||
/obj/effect/map_effect/perma_light/concentrated/incandescent,
|
||||
/obj/effect/zone_divider,
|
||||
/turf/simulated/floor/plating{
|
||||
icon_state = "asteroidplating2"
|
||||
icon_state = "asteroidplating2";
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"NL" = (
|
||||
@@ -4350,13 +4451,19 @@
|
||||
starts_with = list(/obj/item/weapon/tool/crowbar/red,/obj/item/weapon/extinguisher/mini,/obj/item/device/radio,/obj/item/weapon/light/bulb)
|
||||
},
|
||||
/turf/simulated/floor/plating{
|
||||
icon_state = "asteroidplating2"
|
||||
icon_state = "asteroidplating2";
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/research/xenoarcheology/exterior)
|
||||
"Qy" = (
|
||||
/obj/effect/zone_divider,
|
||||
/turf/simulated/floor/plating{
|
||||
icon_state = "asteroidplating2"
|
||||
icon_state = "asteroidplating2";
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/research/xenoarcheology/exterior)
|
||||
"RX" = (
|
||||
@@ -4368,7 +4475,10 @@
|
||||
icon_state = "1-4"
|
||||
},
|
||||
/turf/simulated/floor/plating{
|
||||
icon_state = "asteroidplating2"
|
||||
icon_state = "asteroidplating2";
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"Ug" = (
|
||||
@@ -4380,7 +4490,10 @@
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/simulated/floor/plating{
|
||||
icon_state = "asteroidplating2"
|
||||
icon_state = "asteroidplating2";
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/mining_main/cave)
|
||||
"VP" = (
|
||||
@@ -4396,7 +4509,10 @@
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/plating{
|
||||
icon_state = "asteroidplating2"
|
||||
icon_state = "asteroidplating2";
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/surface/outpost/research/xenoarcheology/exterior)
|
||||
"Zo" = (
|
||||
|
||||
@@ -19,7 +19,11 @@
|
||||
/obj/random/material/precious,
|
||||
/obj/random/material/refined,
|
||||
/obj/random/material/refined,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"aM" = (
|
||||
/obj/fire,
|
||||
@@ -31,7 +35,11 @@
|
||||
/obj/random/maintenance/foodstuff,
|
||||
/obj/random/maintenance/foodstuff,
|
||||
/obj/random/medical/pillbottle,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"bm" = (
|
||||
/obj/structure/cliff/automatic{
|
||||
@@ -44,7 +52,11 @@
|
||||
/obj/random/explorer_shield,
|
||||
/obj/random/maintenance/foodstuff,
|
||||
/obj/random/maintenance/foodstuff,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"cb" = (
|
||||
/obj/structure/cliff/automatic/ramp,
|
||||
@@ -52,7 +64,11 @@
|
||||
/area/submap/demonranch)
|
||||
"cc" = (
|
||||
/obj/structure/simple_door/sifwood,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"dg" = (
|
||||
/mob/living/simple_mob/humanoid/cultist/hunter,
|
||||
@@ -65,7 +81,11 @@
|
||||
"gE" = (
|
||||
/obj/item/weapon/flame/candle/everburn,
|
||||
/obj/structure/table/sifwoodentable,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"hq" = (
|
||||
/turf/simulated/floor/water,
|
||||
@@ -81,7 +101,11 @@
|
||||
/area/submap/demonranch)
|
||||
"ie" = (
|
||||
/mob/living/simple_mob/humanoid/cultist/castertesh,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"iw" = (
|
||||
/obj/effect/landmark/loot_spawn/low,
|
||||
@@ -95,7 +119,11 @@
|
||||
/area/submap/demonranch)
|
||||
"kz" = (
|
||||
/obj/structure/railing,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"lo" = (
|
||||
/obj/structure/cliff/automatic{
|
||||
@@ -112,14 +140,22 @@
|
||||
/obj/random/contraband/nofail,
|
||||
/obj/item/weapon/storage/backpack/dufflebag/syndie/med,
|
||||
/obj/item/weapon/spellbook/oneuse/charge,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"mC" = (
|
||||
/obj/random/projectile/random,
|
||||
/turf/simulated/floor/outdoors/dirt,
|
||||
/area/submap/demonranch)
|
||||
"mG" = (
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"nh" = (
|
||||
/obj/structure/cliff/automatic{
|
||||
@@ -137,7 +173,11 @@
|
||||
/obj/random/medical/pillbottle,
|
||||
/obj/random/maintenance/foodstuff,
|
||||
/obj/random/maintenance/foodstuff,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"nY" = (
|
||||
/obj/structure/girder/reinforced,
|
||||
@@ -157,7 +197,11 @@
|
||||
/area/submap/demonranch)
|
||||
"qA" = (
|
||||
/obj/structure/table/sifwoodentable,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"qC" = (
|
||||
/obj/item/clothing/shoes/cult,
|
||||
@@ -171,7 +215,11 @@
|
||||
/obj/structure/railing{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"su" = (
|
||||
/turf/simulated/floor/outdoors/dirt,
|
||||
@@ -189,7 +237,11 @@
|
||||
/area/submap/demonranch)
|
||||
"uu" = (
|
||||
/obj/structure/girder/reinforced,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"uM" = (
|
||||
/obj/structure/cliff/automatic{
|
||||
@@ -209,17 +261,29 @@
|
||||
/area/submap/demonranch)
|
||||
"yj" = (
|
||||
/mob/living/simple_mob/humanoid/cultist/noodle,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"yT" = (
|
||||
/mob/living/simple_mob/humanoid/cultist/hunter,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"zl" = (
|
||||
/obj/structure/railing{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"Ak" = (
|
||||
/obj/structure/table/sifwoodentable,
|
||||
@@ -232,15 +296,27 @@
|
||||
/obj/random/medical/pillbottle,
|
||||
/obj/random/maintenance/foodstuff,
|
||||
/obj/random/maintenance/foodstuff,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"AI" = (
|
||||
/mob/living/simple_mob/humanoid/cultist/tesh,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"Bh" = (
|
||||
/obj/item/clothing/head/culthood/alt,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"Dw" = (
|
||||
/obj/effect/landmark/loot_spawn,
|
||||
@@ -252,21 +328,37 @@
|
||||
/mob/living/simple_mob/humanoid/pirate/mate/ranged/rifle{
|
||||
faction = "cult"
|
||||
},
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"Gb" = (
|
||||
/obj/structure/railing{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"Hj" = (
|
||||
/obj/item/clothing/suit/cultrobes,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"In" = (
|
||||
/obj/item/clothing/shoes/cult,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"IW" = (
|
||||
/obj/structure/table/sifwoodentable,
|
||||
@@ -280,11 +372,19 @@
|
||||
/obj/random/medical/pillbottle,
|
||||
/obj/random/maintenance/foodstuff,
|
||||
/obj/random/maintenance/foodstuff,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"JL" = (
|
||||
/obj/structure/kitchenspike,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"JR" = (
|
||||
/obj/random/projectile/scrapped_shotgun,
|
||||
@@ -292,7 +392,11 @@
|
||||
/area/submap/demonranch)
|
||||
"JY" = (
|
||||
/obj/item/clothing/suit/cultrobes/magusred,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"Kt" = (
|
||||
/turf/simulated/wall/log_sif,
|
||||
@@ -329,14 +433,22 @@
|
||||
/area/submap/demonranch)
|
||||
"Oz" = (
|
||||
/mob/living/simple_mob/humanoid/cultist/lizard,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"QH" = (
|
||||
/obj/structure/table/sifwoodentable,
|
||||
/obj/random/firstaid,
|
||||
/obj/random/maintenance/foodstuff,
|
||||
/obj/random/maintenance/foodstuff,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"QO" = (
|
||||
/obj/structure/cliff/automatic/ramp{
|
||||
@@ -347,7 +459,11 @@
|
||||
"Rp" = (
|
||||
/obj/structure/table/sifwoodentable,
|
||||
/obj/item/weapon/flame/candle/everburn,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"Si" = (
|
||||
/obj/effect/landmark/loot_spawn,
|
||||
@@ -358,15 +474,27 @@
|
||||
/mob/living/simple_mob/humanoid/pirate/las/armored{
|
||||
faction = "cult"
|
||||
},
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"Tn" = (
|
||||
/obj/item/clothing/suit/cultrobes/alt,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"TI" = (
|
||||
/obj/item/clothing/head/culthood,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"TL" = (
|
||||
/mob/living/simple_mob/vore/demonAI{
|
||||
@@ -391,15 +519,27 @@
|
||||
/area/submap/demonranch)
|
||||
"VJ" = (
|
||||
/obj/structure/table/bench/sifwooden,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"WY" = (
|
||||
/obj/structure/bookcase,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"Ye" = (
|
||||
/obj/item/clothing/head/culthood/magus,
|
||||
/turf/simulated/floor/wood/sif,
|
||||
/turf/simulated/floor/wood/sif{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/demonranch)
|
||||
"Zy" = (
|
||||
/turf/template_noop,
|
||||
|
||||
@@ -106,7 +106,11 @@
|
||||
/area/submap/eclipsedigsight)
|
||||
"md" = (
|
||||
/obj/structure/cliff/automatic/corner,
|
||||
/turf/simulated/floor/lava,
|
||||
/turf/simulated/floor/lava{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/eclipsedigsight)
|
||||
"mm" = (
|
||||
/turf/simulated/wall/r_wall,
|
||||
@@ -127,7 +131,11 @@
|
||||
/obj/structure/cliff/automatic/corner{
|
||||
dir = 9
|
||||
},
|
||||
/turf/simulated/floor/lava,
|
||||
/turf/simulated/floor/lava{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/eclipsedigsight)
|
||||
"nQ" = (
|
||||
/obj/effect/floor_decal/borderfloorwhite{
|
||||
@@ -227,7 +235,11 @@
|
||||
/obj/structure/cliff/automatic{
|
||||
dir = 6
|
||||
},
|
||||
/turf/simulated/floor/lava,
|
||||
/turf/simulated/floor/lava{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/eclipsedigsight)
|
||||
"wH" = (
|
||||
/obj/effect/floor_decal/corner/purple/diagonal,
|
||||
@@ -308,7 +320,11 @@
|
||||
/turf/simulated/floor/tiled/monotile,
|
||||
/area/submap/eclipsedigsight)
|
||||
"Fc" = (
|
||||
/turf/simulated/floor/lava,
|
||||
/turf/simulated/floor/lava{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/eclipsedigsight)
|
||||
"FE" = (
|
||||
/obj/effect/floor_decal/borderfloorwhite,
|
||||
@@ -338,7 +354,11 @@
|
||||
/obj/structure/cliff/automatic/corner{
|
||||
dir = 10
|
||||
},
|
||||
/turf/simulated/floor/lava,
|
||||
/turf/simulated/floor/lava{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/eclipsedigsight)
|
||||
"Hx" = (
|
||||
/obj/structure/cliff/automatic{
|
||||
@@ -390,7 +410,11 @@
|
||||
/obj/structure/cliff/automatic{
|
||||
dir = 10
|
||||
},
|
||||
/turf/simulated/floor/lava,
|
||||
/turf/simulated/floor/lava{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/eclipsedigsight)
|
||||
"KQ" = (
|
||||
/mob/living/simple_mob/humanoid/eclipse/solar/snipertesh,
|
||||
@@ -473,7 +497,11 @@
|
||||
/obj/structure/cliff/automatic{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/lava,
|
||||
/turf/simulated/floor/lava{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/eclipsedigsight)
|
||||
"PW" = (
|
||||
/mob/living/simple_mob/humanoid/eclipse/lunar/ravanger,
|
||||
@@ -584,7 +612,11 @@
|
||||
/obj/structure/cliff/automatic/corner{
|
||||
dir = 6
|
||||
},
|
||||
/turf/simulated/floor/lava,
|
||||
/turf/simulated/floor/lava{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/eclipsedigsight)
|
||||
"XC" = (
|
||||
/mob/living/simple_mob/humanoid/eclipse/solar/firemoff,
|
||||
@@ -605,7 +637,11 @@
|
||||
/obj/structure/cliff/automatic{
|
||||
dir = 2
|
||||
},
|
||||
/turf/simulated/floor/lava,
|
||||
/turf/simulated/floor/lava{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/eclipsedigsight)
|
||||
"Zk" = (
|
||||
/obj/structure/window/phoronreinforced,
|
||||
@@ -650,7 +686,11 @@
|
||||
/obj/structure/cliff/automatic{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/lava,
|
||||
/turf/simulated/floor/lava{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/eclipsedigsight)
|
||||
"ZT" = (
|
||||
/obj/effect/floor_decal/corner/purple/diagonal,
|
||||
@@ -1718,8 +1758,8 @@ pW
|
||||
Qb
|
||||
lF
|
||||
pW
|
||||
Qd
|
||||
rA
|
||||
Xx
|
||||
wm
|
||||
pW
|
||||
pW
|
||||
pW
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -7,7 +7,11 @@
|
||||
/obj/machinery/porta_turret/poi{
|
||||
faction = "syndicate"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/turf/simulated/floor/plating{
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"bg" = (
|
||||
/obj/random/landmine,
|
||||
@@ -34,7 +38,11 @@
|
||||
dir = 10
|
||||
},
|
||||
/obj/structure/dispenser/oxygen,
|
||||
/turf/simulated/floor/tiled,
|
||||
/turf/simulated/floor/tiled{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"bF" = (
|
||||
/obj/effect/floor_decal/corner/mauve/diagonal,
|
||||
@@ -48,7 +56,11 @@
|
||||
/obj/structure/table/woodentable,
|
||||
/obj/item/weapon/oar,
|
||||
/obj/item/weapon/oar,
|
||||
/turf/simulated/floor/wood,
|
||||
/turf/simulated/floor/wood{
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"cd" = (
|
||||
/obj/structure/cliff/automatic{
|
||||
@@ -61,7 +73,11 @@
|
||||
/area/submap/DugOutMercs)
|
||||
"cj" = (
|
||||
/obj/machinery/light,
|
||||
/turf/simulated/floor/wood,
|
||||
/turf/simulated/floor/wood{
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"cu" = (
|
||||
/obj/effect/floor_decal/corner/mauve/diagonal,
|
||||
@@ -75,7 +91,11 @@
|
||||
/obj/effect/floor_decal/corner/lightgrey/diagonal,
|
||||
/obj/structure/table/woodentable,
|
||||
/obj/item/weapon/storage/toolbox/lunchbox/syndicate/filled,
|
||||
/turf/simulated/floor/tiled/hydro,
|
||||
/turf/simulated/floor/tiled/hydro{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"dh" = (
|
||||
/obj/structure/cliff/automatic{
|
||||
@@ -112,7 +132,11 @@
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/turf/simulated/floor/tiled{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"el" = (
|
||||
/obj/random/mob/merc/all,
|
||||
@@ -135,7 +159,11 @@
|
||||
/obj/item/weapon/reagent_containers/food/snacks/jellyfishcore,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/monkfishfillet,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/monkfishfillet,
|
||||
/turf/simulated/floor/tiled/hydro,
|
||||
/turf/simulated/floor/tiled/hydro{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"fx" = (
|
||||
/obj/effect/floor_decal/corner/mauve/diagonal,
|
||||
@@ -164,7 +192,11 @@
|
||||
/turf/simulated/floor/water,
|
||||
/area/submap/DugOutMercs)
|
||||
"fS" = (
|
||||
/turf/simulated/floor/tiled,
|
||||
/turf/simulated/floor/tiled{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"go" = (
|
||||
/turf/template_noop,
|
||||
@@ -181,7 +213,11 @@
|
||||
/area/submap/DugOutMercs)
|
||||
"iq" = (
|
||||
/obj/random/mob/merc/armored,
|
||||
/turf/simulated/floor/wood,
|
||||
/turf/simulated/floor/wood{
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"iG" = (
|
||||
/obj/structure/table/bench/padded,
|
||||
@@ -221,7 +257,11 @@
|
||||
/obj/effect/floor_decal/corner/blue/border{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/turf/simulated/floor/tiled{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"kF" = (
|
||||
/obj/structure/table/sifwooden_reinforced,
|
||||
@@ -242,7 +282,11 @@
|
||||
dir = 1
|
||||
},
|
||||
/obj/random/material/precious,
|
||||
/turf/simulated/floor/tiled,
|
||||
/turf/simulated/floor/tiled{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"lq" = (
|
||||
/obj/effect/floor_decal/corner/mauve/diagonal,
|
||||
@@ -272,7 +316,11 @@
|
||||
"mv" = (
|
||||
/obj/effect/floor_decal/corner/lightgrey/diagonal,
|
||||
/obj/random/mob/merc/all,
|
||||
/turf/simulated/floor/tiled/hydro,
|
||||
/turf/simulated/floor/tiled/hydro{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"my" = (
|
||||
/obj/effect/floor_decal/corner/mauve/diagonal,
|
||||
@@ -298,7 +346,11 @@
|
||||
/obj/effect/floor_decal/corner/blue/border,
|
||||
/obj/machinery/portable_atmospherics/canister/empty/oxygen,
|
||||
/obj/machinery/light,
|
||||
/turf/simulated/floor/tiled,
|
||||
/turf/simulated/floor/tiled{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"oq" = (
|
||||
/obj/structure/ledge/ledge_stairs,
|
||||
@@ -317,7 +369,11 @@
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/turf/simulated/floor/tiled{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"oN" = (
|
||||
/obj/structure/railing/grey{
|
||||
@@ -352,7 +408,11 @@
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled/hydro,
|
||||
/turf/simulated/floor/tiled/hydro{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"qR" = (
|
||||
/obj/effect/floor_decal/borderfloorblack{
|
||||
@@ -377,7 +437,11 @@
|
||||
/obj/effect/floor_decal/corner/blue/border{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/turf/simulated/floor/tiled{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"rl" = (
|
||||
/obj/structure/table/reinforced,
|
||||
@@ -396,7 +460,11 @@
|
||||
/obj/effect/floor_decal/corner/blue/border{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/turf/simulated/floor/tiled{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"ry" = (
|
||||
/obj/effect/floor_decal/borderfloorblack/corner,
|
||||
@@ -414,7 +482,11 @@
|
||||
/area/submap/DugOutMercs)
|
||||
"sc" = (
|
||||
/obj/effect/floor_decal/corner/lightgrey/diagonal,
|
||||
/turf/simulated/floor/tiled/hydro,
|
||||
/turf/simulated/floor/tiled/hydro{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"so" = (
|
||||
/obj/effect/floor_decal/corner/lightgrey/diagonal,
|
||||
@@ -422,7 +494,11 @@
|
||||
/obj/item/weapon/material/fishing_net,
|
||||
/obj/item/weapon/material/fishing_net,
|
||||
/obj/item/weapon/material/fishing_net,
|
||||
/turf/simulated/floor/tiled/hydro,
|
||||
/turf/simulated/floor/tiled/hydro{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"sO" = (
|
||||
/obj/machinery/power/smes/buildable/point_of_interest,
|
||||
@@ -435,7 +511,11 @@
|
||||
"sZ" = (
|
||||
/obj/structure/table/sifwooden_reinforced,
|
||||
/obj/item/weapon/oar,
|
||||
/turf/simulated/floor/wood,
|
||||
/turf/simulated/floor/wood{
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"tS" = (
|
||||
/obj/effect/floor_decal/corner/red/diagonal,
|
||||
@@ -449,7 +529,11 @@
|
||||
},
|
||||
/obj/random/material/refined,
|
||||
/obj/random/material,
|
||||
/turf/simulated/floor/tiled,
|
||||
/turf/simulated/floor/tiled{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"uk" = (
|
||||
/obj/effect/floor_decal/corner/mauve/diagonal,
|
||||
@@ -465,20 +549,32 @@
|
||||
/obj/item/weapon/material/fishing_rod/modern/built,
|
||||
/obj/item/weapon/material/fishing_rod/modern/built,
|
||||
/obj/item/weapon/material/fishing_rod/modern/built,
|
||||
/turf/simulated/floor/tiled/hydro,
|
||||
/turf/simulated/floor/tiled/hydro{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"uv" = (
|
||||
/turf/simulated/wall/r_wall,
|
||||
/area/submap/DugOutMercs)
|
||||
"uF" = (
|
||||
/obj/structure/barricade,
|
||||
/turf/simulated/floor/wood,
|
||||
/turf/simulated/floor/wood{
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"uQ" = (
|
||||
/obj/machinery/light,
|
||||
/obj/effect/floor_decal/corner/lightgrey/diagonal,
|
||||
/obj/random/mob/merc/all,
|
||||
/turf/simulated/floor/tiled/hydro,
|
||||
/turf/simulated/floor/tiled/hydro{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"vh" = (
|
||||
/obj/effect/floor_decal/borderfloorblack/corner{
|
||||
@@ -509,7 +605,11 @@
|
||||
/obj/item/clothing/suit/space/syndicate/black/blue,
|
||||
/obj/item/clothing/head/helmet/space/syndicate/black/blue,
|
||||
/obj/item/weapon/tank/oxygen/welded,
|
||||
/turf/simulated/floor/tiled,
|
||||
/turf/simulated/floor/tiled{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"xy" = (
|
||||
/obj/machinery/door/airlock/highsecurity{
|
||||
@@ -544,7 +644,11 @@
|
||||
/area/submap/DugOutMercs)
|
||||
"yA" = (
|
||||
/mob/living/simple_mob/humanoid/merc/ranged/technician,
|
||||
/turf/simulated/floor/tiled,
|
||||
/turf/simulated/floor/tiled{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"yG" = (
|
||||
/obj/effect/floor_decal/borderfloor,
|
||||
@@ -615,7 +719,11 @@
|
||||
"Cr" = (
|
||||
/obj/effect/floor_decal/corner/blue/border,
|
||||
/mob/living/simple_mob/humanoid/merc/ranged/ionrifle,
|
||||
/turf/simulated/floor/tiled,
|
||||
/turf/simulated/floor/tiled{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"CA" = (
|
||||
/obj/structure/cliff/automatic/corner{
|
||||
@@ -655,7 +763,11 @@
|
||||
"DR" = (
|
||||
/obj/structure/table/sifwooden_reinforced,
|
||||
/obj/item/weapon/material/fishing_rod/modern/built,
|
||||
/turf/simulated/floor/wood,
|
||||
/turf/simulated/floor/wood{
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"DV" = (
|
||||
/obj/structure/table/marble,
|
||||
@@ -667,7 +779,11 @@
|
||||
"Ed" = (
|
||||
/obj/structure/table/sifwooden_reinforced,
|
||||
/obj/item/weapon/material/fishing_net,
|
||||
/turf/simulated/floor/wood,
|
||||
/turf/simulated/floor/wood{
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"Eh" = (
|
||||
/obj/effect/floor_decal/corner/paleblue/diagonal,
|
||||
@@ -689,7 +805,11 @@
|
||||
/obj/effect/floor_decal/corner/blue/bordercorner{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/turf/simulated/floor/tiled{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"EY" = (
|
||||
/obj/structure/railing/grey,
|
||||
@@ -700,7 +820,11 @@
|
||||
/area/submap/DugOutMercs)
|
||||
"Fr" = (
|
||||
/obj/effect/floor_decal/corner/blue/border,
|
||||
/turf/simulated/floor/tiled,
|
||||
/turf/simulated/floor/tiled{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"FQ" = (
|
||||
/obj/machinery/power/terminal{
|
||||
@@ -756,7 +880,11 @@
|
||||
/obj/structure/table/woodentable,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/carpmeat/sif/murkfish,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/carpmeat/sif/murkfish,
|
||||
/turf/simulated/floor/tiled/hydro,
|
||||
/turf/simulated/floor/tiled/hydro{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"Ia" = (
|
||||
/obj/structure/railing/grey,
|
||||
@@ -792,11 +920,19 @@
|
||||
},
|
||||
/obj/random/material/refined,
|
||||
/obj/random/material,
|
||||
/turf/simulated/floor/tiled,
|
||||
/turf/simulated/floor/tiled{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"Jh" = (
|
||||
/obj/random/mob/merc/all,
|
||||
/turf/simulated/floor/tiled,
|
||||
/turf/simulated/floor/tiled{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"Jp" = (
|
||||
/obj/structure/table/woodentable,
|
||||
@@ -851,7 +987,11 @@
|
||||
"Mh" = (
|
||||
/mob/living/simple_mob/humanoid/merc/ranged/grenadier/poi,
|
||||
/obj/effect/floor_decal/corner/lightgrey/diagonal,
|
||||
/turf/simulated/floor/tiled/hydro,
|
||||
/turf/simulated/floor/tiled/hydro{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"Mi" = (
|
||||
/obj/effect/floor_decal/borderfloorblack{
|
||||
@@ -869,7 +1009,11 @@
|
||||
"Nl" = (
|
||||
/obj/machinery/light,
|
||||
/obj/effect/floor_decal/corner/lightgrey/diagonal,
|
||||
/turf/simulated/floor/tiled/hydro,
|
||||
/turf/simulated/floor/tiled/hydro{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"Nr" = (
|
||||
/obj/machinery/light,
|
||||
@@ -889,7 +1033,11 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/random/mob/merc/all,
|
||||
/turf/simulated/floor/tiled,
|
||||
/turf/simulated/floor/tiled{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"OP" = (
|
||||
/turf/simulated/floor/water,
|
||||
@@ -958,7 +1106,11 @@
|
||||
"Sl" = (
|
||||
/obj/effect/floor_decal/corner/blue/border,
|
||||
/obj/machinery/light,
|
||||
/turf/simulated/floor/tiled,
|
||||
/turf/simulated/floor/tiled{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"Sn" = (
|
||||
/obj/machinery/light{
|
||||
@@ -972,7 +1124,11 @@
|
||||
dir = 1
|
||||
},
|
||||
/obj/random/mob/merc/all,
|
||||
/turf/simulated/floor/tiled,
|
||||
/turf/simulated/floor/tiled{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"Tf" = (
|
||||
/obj/structure/grille,
|
||||
@@ -1016,7 +1172,11 @@
|
||||
/obj/effect/floor_decal/corner/blue/border{
|
||||
dir = 6
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/turf/simulated/floor/tiled{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"Vl" = (
|
||||
/obj/effect/floor_decal/borderfloorblack{
|
||||
@@ -1039,7 +1199,11 @@
|
||||
/obj/item/device/radio,
|
||||
/obj/item/weapon/storage/mre/random,
|
||||
/obj/item/device/binoculars,
|
||||
/turf/simulated/floor/wood,
|
||||
/turf/simulated/floor/wood{
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"VX" = (
|
||||
/mob/living/simple_mob/mechanical/viscerator/mercenary,
|
||||
@@ -1076,7 +1240,11 @@
|
||||
/obj/structure/table/woodentable,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sharkmeat,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sharkmeat,
|
||||
/turf/simulated/floor/tiled/hydro,
|
||||
/turf/simulated/floor/tiled/hydro{
|
||||
temperature = 243.15;
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"WY" = (
|
||||
/obj/effect/floor_decal/corner/mauve/diagonal,
|
||||
@@ -1088,7 +1256,11 @@
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/submap/DugOutMercs)
|
||||
"Yg" = (
|
||||
/turf/simulated/floor/wood,
|
||||
/turf/simulated/floor/wood{
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"Yx" = (
|
||||
/obj/effect/floor_decal/borderfloorblack{
|
||||
@@ -1104,7 +1276,11 @@
|
||||
"YD" = (
|
||||
/obj/effect/floor_decal/corner/blue/border,
|
||||
/obj/machinery/portable_atmospherics/canister/empty/oxygen,
|
||||
/turf/simulated/floor/tiled,
|
||||
/turf/simulated/floor/tiled{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"YE" = (
|
||||
/obj/effect/floor_decal/corner/mauve/diagonal,
|
||||
@@ -1116,7 +1292,18 @@
|
||||
dir = 1
|
||||
},
|
||||
/mob/living/simple_mob/humanoid/merc/ranged/technician,
|
||||
/turf/simulated/floor/wood,
|
||||
/turf/simulated/floor/wood{
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"YK" = (
|
||||
/turf/simulated/floor/plating{
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15;
|
||||
nitrogen = 93.7835
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"YW" = (
|
||||
/obj/structure/table/rack/shelf,
|
||||
@@ -1129,13 +1316,21 @@
|
||||
/obj/structure/bed/chair{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/turf/simulated/floor/wood{
|
||||
oxygen = 20.7263;
|
||||
nitrogen = 93.7835;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"Zt" = (
|
||||
/obj/effect/floor_decal/corner/blue/border{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/turf/simulated/floor/tiled{
|
||||
nitrogen = 93.7835;
|
||||
oxygen = 20.7263;
|
||||
temperature = 243.15
|
||||
},
|
||||
/area/submap/DugOutMercs)
|
||||
"ZS" = (
|
||||
/obj/effect/floor_decal/borderfloorblack/corner{
|
||||
@@ -2107,7 +2302,7 @@ Pe
|
||||
Pe
|
||||
Pe
|
||||
uv
|
||||
Qf
|
||||
YK
|
||||
bg
|
||||
"}
|
||||
(24,1,1) = {"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user