mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-27 06:54:18 +01:00
Adhomian Mapping Tweaks (merge conflicts resolved) (#15939)
* First set of mapping changes * Further mapping changes * quick fix * Create connorjg1.yml * Fix CL * Update raskara_okon.dmm * NKA base * force fix merge * Update adhomai_hunting.dmm * Update nka_base.dmm * Update nka_base.dmm * fix PSIS outpost * outpost fix * move cyberdogs * Update psis_outpost.dmm * icelance for PSIS * Epistol * sink! * Fix the hunting oversight * fix map bot * map-bot you gonk * floor decal fix * shovel fix * hopefully final fixes * PSIS force spawn * Update psis_outpost.dm * Update srandmarr.dm * Update badlands.dm * big final sweep of bugs * Update adhomai_raskariim_hideout.dmm * Update adhomai_raskariim_hideout.dmm * NKA base fix * Update psis_outpost.dmm * Update pra_base.dmm * Update ala_base.dmm * Hopefully final test for venting fix * The final fixes to put things back
This commit is contained in:
connorjg1
@@ -65,7 +65,7 @@
|
||||
return "[rand(6, 12)] hours"
|
||||
|
||||
/datum/space_sector/srandmarr/generate_system_name()
|
||||
return "S'rand'marr, and nearby points of interest"
|
||||
return "S'rand'marr, and nearby points of interest"
|
||||
|
||||
/datum/space_sector/nrrahrahul
|
||||
name = SECTOR_NRRAHRAHUL
|
||||
@@ -93,4 +93,4 @@
|
||||
Moghes is currently experiencing immense environmental degradation following a global nuclear war in the 2430's."
|
||||
starlight_color = COLOR_WHITE
|
||||
starlight_power = 5
|
||||
starlight_range = 1
|
||||
starlight_range = 1
|
||||
|
||||
@@ -125,7 +125,7 @@
|
||||
plant_colors = null
|
||||
possible_themes = list(/datum/exoplanet_theme/mountains/adhomai)
|
||||
map_generators = list(/datum/random_map/noise/exoplanet/snow/adhomai, /datum/random_map/noise/ore/rich)
|
||||
features_budget = 4
|
||||
features_budget = 8
|
||||
surface_color = "#e8faff"
|
||||
water_color = "#b5dfeb"
|
||||
generated_name = FALSE
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
################################
|
||||
# Example Changelog File
|
||||
#
|
||||
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||
#
|
||||
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||
# When it is, any changes listed below will disappear.
|
||||
#
|
||||
# Valid Prefixes:
|
||||
# bugfix
|
||||
# wip (For works in progress)
|
||||
# tweak
|
||||
# soundadd
|
||||
# sounddel
|
||||
# rscadd (general adding of nice things)
|
||||
# rscdel (general deleting of nice things)
|
||||
# imageadd
|
||||
# imagedel
|
||||
# maptweak
|
||||
# spellcheck (typo fixes)
|
||||
# experiment
|
||||
# balance
|
||||
# admin
|
||||
# backend
|
||||
# security
|
||||
# refactor
|
||||
#################################
|
||||
|
||||
# Your name.
|
||||
author: Connorjg1
|
||||
|
||||
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||
delete-after: True
|
||||
|
||||
# Any changes you've made. See valid prefix list above.
|
||||
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||
# SCREW THIS UP AND IT WON'T WORK.
|
||||
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||
changes:
|
||||
- maptweak: "Tweaks several of the Adhomai maps and Headmaster vessel primarily to include medical supplies and extra fluff."
|
||||
|
||||
@@ -26,8 +26,7 @@
|
||||
/area/headmaster_ship/commissar_quarters)
|
||||
"ae" = (
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 9;
|
||||
icon_state = "corner_white"
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 6
|
||||
@@ -952,15 +951,6 @@
|
||||
temperature = 278.15
|
||||
},
|
||||
/area/headmaster_ship/mess_hall)
|
||||
"cP" = (
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 5;
|
||||
icon_state = "corner_white"
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark{
|
||||
temperature = 278.15
|
||||
},
|
||||
/area/headmaster_ship)
|
||||
"cQ" = (
|
||||
/obj/effect/landmark/entry_point/port{
|
||||
name = "port, barracks"
|
||||
@@ -1009,8 +999,7 @@
|
||||
req_access = list(209)
|
||||
},
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4;
|
||||
icon_state = "rwindow"
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark{
|
||||
temperature = 278.15
|
||||
@@ -1021,8 +1010,7 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
|
||||
dir = 8;
|
||||
icon_state = "map-scrubbers"
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
@@ -1084,8 +1072,7 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
|
||||
dir = 1;
|
||||
icon_state = "map-supply"
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 4;
|
||||
@@ -1161,8 +1148,7 @@
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 6;
|
||||
icon_state = "corner_white"
|
||||
dir = 6
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark{
|
||||
temperature = 278.15
|
||||
@@ -1179,9 +1165,7 @@
|
||||
},
|
||||
/area/headmaster_ship/hangar)
|
||||
"dn" = (
|
||||
/obj/machinery/computer/ship/helm{
|
||||
req_access = null
|
||||
},
|
||||
/obj/machinery/computer/ship/helm,
|
||||
/turf/simulated/floor/shuttle/black{
|
||||
temperature = 278.15
|
||||
},
|
||||
@@ -1205,18 +1189,26 @@
|
||||
/area/headmaster_ship/gun_deck)
|
||||
"ds" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/pen/fountain,
|
||||
/obj/structure/sign/painting_frame/hadii{
|
||||
pixel_x = -32
|
||||
},
|
||||
/obj/item/stamp{
|
||||
name = "people's republic of adhomai stamp";
|
||||
icon_state = "stamp-zavod";
|
||||
pixel_x = 6;
|
||||
pixel_y = 10
|
||||
},
|
||||
/obj/item/stamp/denied{
|
||||
pixel_x = -6;
|
||||
pixel_y = 10
|
||||
},
|
||||
/turf/simulated/floor/wood{
|
||||
temperature = 278.15
|
||||
},
|
||||
/area/headmaster_ship/commissar_quarters)
|
||||
"du" = (
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 5;
|
||||
icon_state = "corner_white"
|
||||
dir = 5
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
@@ -1269,8 +1261,7 @@
|
||||
/area/headmaster_ship)
|
||||
"dE" = (
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 10;
|
||||
icon_state = "corner_white"
|
||||
dir = 10
|
||||
},
|
||||
/obj/machinery/light,
|
||||
/turf/simulated/floor/tiled/dark{
|
||||
@@ -1282,8 +1273,7 @@
|
||||
/area/headmaster_ship/hangar)
|
||||
"dG" = (
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 10;
|
||||
icon_state = "corner_white"
|
||||
dir = 10
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark{
|
||||
temperature = 278.15
|
||||
@@ -1291,8 +1281,7 @@
|
||||
/area/headmaster_ship)
|
||||
"dH" = (
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 10;
|
||||
icon_state = "corner_white"
|
||||
dir = 10
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on{
|
||||
dir = 1
|
||||
@@ -1512,8 +1501,7 @@
|
||||
},
|
||||
/obj/structure/filingcabinet/chestdrawer,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4;
|
||||
icon_state = "rwindow"
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark{
|
||||
temperature = 278.15
|
||||
@@ -1629,8 +1617,7 @@
|
||||
/area/headmaster_ship/hangar)
|
||||
"eQ" = (
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 9;
|
||||
icon_state = "corner_white"
|
||||
dir = 9
|
||||
},
|
||||
/obj/structure/sign/flag/pra{
|
||||
pixel_x = -32
|
||||
@@ -1639,15 +1626,6 @@
|
||||
temperature = 278.15
|
||||
},
|
||||
/area/headmaster_ship)
|
||||
"eU" = (
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 6;
|
||||
icon_state = "corner_white"
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark{
|
||||
temperature = 278.15
|
||||
},
|
||||
/area/headmaster_ship)
|
||||
"eZ" = (
|
||||
/obj/machinery/iff_beacon,
|
||||
/obj/structure/railing/mapped{
|
||||
@@ -1712,8 +1690,7 @@
|
||||
"ff" = (
|
||||
/obj/structure/bed/stool/chair/office/bridge/generic,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4;
|
||||
icon_state = "rwindow"
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark{
|
||||
temperature = 278.15
|
||||
@@ -1735,8 +1712,7 @@
|
||||
/area/headmaster_ship/barracks)
|
||||
"fo" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 6;
|
||||
pixel_y = 0
|
||||
dir = 6
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 6
|
||||
@@ -1791,8 +1767,7 @@
|
||||
/area/headmaster_ship/barracks)
|
||||
"fy" = (
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 9;
|
||||
icon_state = "corner_white"
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/door/firedoor,
|
||||
/turf/simulated/floor/tiled/dark{
|
||||
@@ -1823,8 +1798,7 @@
|
||||
/area/headmaster_ship/captain_quarters)
|
||||
"fD" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 8;
|
||||
icon_state = "warning"
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor{
|
||||
temperature = 278.15
|
||||
@@ -1908,8 +1882,7 @@
|
||||
/area/headmaster_ship/mess_hall)
|
||||
"fL" = (
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 9;
|
||||
icon_state = "corner_white"
|
||||
dir = 9
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark{
|
||||
temperature = 278.15
|
||||
@@ -2026,8 +1999,7 @@
|
||||
/area/headmaster_ship/mess_hall)
|
||||
"gg" = (
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 6;
|
||||
icon_state = "corner_white"
|
||||
dir = 6
|
||||
},
|
||||
/obj/structure/sign/flag/pra{
|
||||
pixel_x = 32
|
||||
@@ -2282,8 +2254,7 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
|
||||
dir = 4;
|
||||
icon_state = "map-scrubbers"
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
@@ -2302,8 +2273,7 @@
|
||||
"hk" = (
|
||||
/obj/effect/floor_decal/industrial/warning,
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 4;
|
||||
icon_state = "warning"
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/visible/red,
|
||||
/turf/simulated/floor/plating{
|
||||
@@ -2408,8 +2378,7 @@
|
||||
/area/headmaster_ship/armory)
|
||||
"hI" = (
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 9;
|
||||
icon_state = "corner_white"
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on{
|
||||
dir = 4
|
||||
@@ -2549,8 +2518,7 @@
|
||||
},
|
||||
/obj/item/device/flashlight/lamp,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4;
|
||||
icon_state = "rwindow"
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/window/reinforced,
|
||||
/turf/simulated/floor/tiled/dark{
|
||||
@@ -2632,8 +2600,7 @@
|
||||
/area/headmaster_ship/mess_hall)
|
||||
"ii" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 4;
|
||||
icon_state = "warning"
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 4;
|
||||
@@ -2744,8 +2711,7 @@
|
||||
/obj/item/pen/fountain,
|
||||
/obj/item/device/hand_labeler,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4;
|
||||
icon_state = "rwindow"
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/window/reinforced,
|
||||
/turf/simulated/floor/tiled/dark{
|
||||
@@ -2793,8 +2759,7 @@
|
||||
dir = 6
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 10;
|
||||
pixel_y = 0
|
||||
dir = 10
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark{
|
||||
temperature = 278.15
|
||||
@@ -2822,8 +2787,7 @@
|
||||
/area/headmaster_ship/gun_deck)
|
||||
"iO" = (
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 6;
|
||||
icon_state = "corner_white"
|
||||
dir = 6
|
||||
},
|
||||
/obj/machinery/door/firedoor,
|
||||
/turf/simulated/floor/tiled/dark{
|
||||
@@ -3005,8 +2969,7 @@
|
||||
req_one_access = "112"
|
||||
},
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4;
|
||||
icon_state = "rwindow"
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/window/reinforced,
|
||||
/obj/structure/window/reinforced{
|
||||
@@ -3016,18 +2979,6 @@
|
||||
temperature = 278.15
|
||||
},
|
||||
/area/headmaster_ship/hangar)
|
||||
"jo" = (
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 6;
|
||||
icon_state = "corner_white"
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark{
|
||||
temperature = 278.15
|
||||
},
|
||||
/area/headmaster_ship)
|
||||
"jt" = (
|
||||
/obj/effect/floor_decal/spline/fancy/wood{
|
||||
dir = 8
|
||||
@@ -3131,8 +3082,7 @@
|
||||
/obj/machinery/light,
|
||||
/obj/structure/closet/emcloset,
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 10;
|
||||
icon_state = "corner_white"
|
||||
dir = 10
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
@@ -3378,8 +3328,7 @@
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 1;
|
||||
icon_state = "rwindow"
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/sign/nosmoking_1{
|
||||
pixel_y = 32
|
||||
@@ -3412,8 +3361,7 @@
|
||||
/area/headmaster_ship/hangar)
|
||||
"kE" = (
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 9;
|
||||
icon_state = "corner_white"
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
@@ -3507,8 +3455,7 @@
|
||||
/area/headmaster_ship/barracks)
|
||||
"kV" = (
|
||||
/obj/machinery/computer/ship/helm{
|
||||
dir = 1;
|
||||
req_access = null
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 10
|
||||
@@ -3595,8 +3542,7 @@
|
||||
/area/space)
|
||||
"lp" = (
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 6;
|
||||
icon_state = "corner_white"
|
||||
dir = 6
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber/on{
|
||||
dir = 8
|
||||
@@ -3641,8 +3587,7 @@
|
||||
/area/headmaster_ship/commissar_quarters)
|
||||
"lu" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 10;
|
||||
pixel_y = 0
|
||||
dir = 10
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 4;
|
||||
@@ -3815,8 +3760,7 @@
|
||||
/area/headmaster_ship/engineering)
|
||||
"lZ" = (
|
||||
/obj/machinery/power/terminal{
|
||||
dir = 1;
|
||||
icon_state = "term"
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d2 = 8;
|
||||
@@ -3835,8 +3779,7 @@
|
||||
},
|
||||
/obj/structure/window/reinforced,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4;
|
||||
icon_state = "rwindow"
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark{
|
||||
temperature = 278.15
|
||||
@@ -3850,6 +3793,7 @@
|
||||
dir = 4;
|
||||
pixel_x = -32
|
||||
},
|
||||
/obj/item/pen/fountain,
|
||||
/turf/simulated/floor/wood{
|
||||
temperature = 278.15
|
||||
},
|
||||
@@ -4028,8 +3972,7 @@
|
||||
/area/shuttle/headmaster_shuttle)
|
||||
"mU" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 10;
|
||||
pixel_y = 0
|
||||
dir = 10
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 10
|
||||
@@ -4077,8 +4020,7 @@
|
||||
/obj/item/paper_bin,
|
||||
/obj/item/pen/fountain,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4;
|
||||
icon_state = "rwindow"
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark{
|
||||
temperature = 278.15
|
||||
@@ -4176,8 +4118,7 @@
|
||||
},
|
||||
/obj/item/device/flashlight/lamp,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4;
|
||||
icon_state = "rwindow"
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/window/reinforced,
|
||||
/turf/simulated/floor/tiled/dark{
|
||||
@@ -4240,8 +4181,7 @@
|
||||
"ou" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
|
||||
dir = 8;
|
||||
icon_state = "map-scrubbers"
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
@@ -4371,8 +4311,7 @@
|
||||
req_access = list(209)
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 9;
|
||||
pixel_y = 0
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/structure/cable/green,
|
||||
@@ -4550,8 +4489,7 @@
|
||||
/area/headmaster_ship/engineering)
|
||||
"sC" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 10;
|
||||
pixel_y = 0
|
||||
dir = 10
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark{
|
||||
temperature = 278.15
|
||||
@@ -4571,8 +4509,7 @@
|
||||
/area/headmaster_ship/hangar)
|
||||
"sW" = (
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 6;
|
||||
icon_state = "corner_white"
|
||||
dir = 6
|
||||
},
|
||||
/obj/machinery/alarm/cold{
|
||||
req_one_access = list(209);
|
||||
@@ -4626,8 +4563,7 @@
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 9;
|
||||
icon_state = "corner_white"
|
||||
dir = 9
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark{
|
||||
temperature = 278.15
|
||||
@@ -4643,8 +4579,7 @@
|
||||
name = "accepted stamp"
|
||||
},
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4;
|
||||
icon_state = "rwindow"
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/window/reinforced,
|
||||
/turf/simulated/floor/tiled/dark{
|
||||
@@ -4653,8 +4588,7 @@
|
||||
/area/headmaster_ship/bridge)
|
||||
"ty" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 10;
|
||||
pixel_y = 0
|
||||
dir = 10
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
|
||||
dir = 1
|
||||
@@ -4874,8 +4808,7 @@
|
||||
/area/headmaster_ship/engineering)
|
||||
"xB" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 4;
|
||||
icon_state = "warning"
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/red,
|
||||
/turf/simulated/floor/plating{
|
||||
@@ -4903,8 +4836,7 @@
|
||||
/area/headmaster_ship/bridge)
|
||||
"xM" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 8;
|
||||
icon_state = "warning"
|
||||
dir = 8
|
||||
},
|
||||
/obj/item/clothing/head/cone,
|
||||
/turf/simulated/floor{
|
||||
@@ -5073,8 +5005,7 @@
|
||||
/area/headmaster_ship/bridge)
|
||||
"Aa" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 9;
|
||||
icon_state = "warning"
|
||||
dir = 9
|
||||
},
|
||||
/turf/simulated/floor{
|
||||
temperature = 278.15
|
||||
@@ -5244,8 +5175,7 @@
|
||||
/obj/structure/table/rack,
|
||||
/obj/effect/floor_decal/industrial/outline/yellow,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4;
|
||||
icon_state = "rwindow"
|
||||
dir = 4
|
||||
},
|
||||
/obj/item/device/multitool,
|
||||
/obj/item/device/multitool,
|
||||
@@ -5271,8 +5201,7 @@
|
||||
/area/space)
|
||||
"Ea" = (
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 6;
|
||||
icon_state = "corner_white"
|
||||
dir = 6
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber/on{
|
||||
dir = 8
|
||||
@@ -5382,8 +5311,7 @@
|
||||
/area/shuttle/headmaster_shuttle)
|
||||
"Fy" = (
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 9;
|
||||
icon_state = "corner_white"
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/alarm/cold{
|
||||
req_one_access = list(209);
|
||||
@@ -5408,8 +5336,7 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 9;
|
||||
icon_state = "corner_white"
|
||||
dir = 9
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark{
|
||||
temperature = 278.15
|
||||
@@ -5417,8 +5344,7 @@
|
||||
/area/headmaster_ship)
|
||||
"FU" = (
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 10;
|
||||
icon_state = "corner_white"
|
||||
dir = 10
|
||||
},
|
||||
/obj/machinery/power/apc/high{
|
||||
name = "south bump";
|
||||
@@ -5440,12 +5366,10 @@
|
||||
dir = 5
|
||||
},
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4;
|
||||
icon_state = "rwindow"
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 1;
|
||||
icon_state = "rwindow"
|
||||
dir = 1
|
||||
},
|
||||
/obj/item/ship_ammunition/grauwolf_bundle,
|
||||
/obj/item/ship_ammunition/grauwolf_bundle,
|
||||
@@ -5560,8 +5484,7 @@
|
||||
/area/headmaster_ship/engine)
|
||||
"HS" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
|
||||
dir = 1;
|
||||
icon_state = "map-supply"
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
|
||||
dir = 4
|
||||
@@ -5747,8 +5670,7 @@
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 10;
|
||||
icon_state = "corner_white"
|
||||
dir = 10
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark{
|
||||
temperature = 278.15
|
||||
@@ -5886,8 +5808,7 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
|
||||
dir = 4;
|
||||
icon_state = "map-scrubbers"
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
@@ -6046,8 +5967,7 @@
|
||||
/area/headmaster_ship/mess_hall)
|
||||
"OJ" = (
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 5;
|
||||
icon_state = "corner_white"
|
||||
dir = 5
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber/on,
|
||||
/turf/simulated/floor/tiled/dark{
|
||||
@@ -6102,8 +6022,7 @@
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 6;
|
||||
icon_state = "corner_white"
|
||||
dir = 6
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark{
|
||||
temperature = 278.15
|
||||
@@ -6122,8 +6041,7 @@
|
||||
/area/shuttle/headmaster_shuttle)
|
||||
"Pg" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 9;
|
||||
pixel_y = 0
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/structure/cable/green{
|
||||
@@ -6158,8 +6076,7 @@
|
||||
/area/headmaster_ship/engineering)
|
||||
"PO" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 10;
|
||||
pixel_y = 0
|
||||
dir = 10
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 10
|
||||
@@ -6200,8 +6117,7 @@
|
||||
/area/headmaster_ship/mess_hall)
|
||||
"QA" = (
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 5;
|
||||
icon_state = "corner_white"
|
||||
dir = 5
|
||||
},
|
||||
/obj/machinery/alarm/cold{
|
||||
req_one_access = list(209);
|
||||
@@ -6280,8 +6196,7 @@
|
||||
/area/headmaster_ship/captain_quarters)
|
||||
"RS" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 8;
|
||||
icon_state = "warning"
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/shuttle_landmark/headmaster_shuttle/hangar,
|
||||
/turf/simulated/floor{
|
||||
@@ -6357,8 +6272,7 @@
|
||||
dir = 9
|
||||
},
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 1;
|
||||
icon_state = "rwindow"
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 8
|
||||
@@ -17880,34 +17794,34 @@ Up
|
||||
Up
|
||||
Up
|
||||
UM
|
||||
jo
|
||||
Af
|
||||
gg
|
||||
eU
|
||||
eU
|
||||
ME
|
||||
ME
|
||||
lp
|
||||
cx
|
||||
dh
|
||||
dD
|
||||
iO
|
||||
eU
|
||||
eU
|
||||
eU
|
||||
eU
|
||||
ME
|
||||
ME
|
||||
ME
|
||||
ME
|
||||
gg
|
||||
jo
|
||||
eU
|
||||
eU
|
||||
Af
|
||||
ME
|
||||
ME
|
||||
sW
|
||||
OU
|
||||
jo
|
||||
eU
|
||||
eU
|
||||
eU
|
||||
Af
|
||||
ME
|
||||
ME
|
||||
ME
|
||||
iO
|
||||
jo
|
||||
eU
|
||||
Af
|
||||
ME
|
||||
Ea
|
||||
eU
|
||||
ME
|
||||
OU
|
||||
Af
|
||||
ME
|
||||
@@ -18209,7 +18123,7 @@ lh
|
||||
Xf
|
||||
cW
|
||||
xP
|
||||
cP
|
||||
cs
|
||||
ea
|
||||
KT
|
||||
hZ
|
||||
@@ -18371,7 +18285,7 @@ cq
|
||||
cq
|
||||
uy
|
||||
xP
|
||||
cP
|
||||
cs
|
||||
dh
|
||||
dG
|
||||
Fm
|
||||
@@ -18695,7 +18609,7 @@ cq
|
||||
cg
|
||||
co
|
||||
xP
|
||||
cP
|
||||
cs
|
||||
dh
|
||||
dG
|
||||
Fm
|
||||
@@ -19019,7 +18933,7 @@ xP
|
||||
ch
|
||||
cq
|
||||
xP
|
||||
cP
|
||||
cs
|
||||
dh
|
||||
dG
|
||||
Fm
|
||||
@@ -19181,7 +19095,7 @@ xP
|
||||
kw
|
||||
cq
|
||||
xP
|
||||
cP
|
||||
cs
|
||||
df
|
||||
dH
|
||||
Fm
|
||||
@@ -19343,7 +19257,7 @@ xP
|
||||
lW
|
||||
JX
|
||||
xP
|
||||
cP
|
||||
cs
|
||||
dh
|
||||
dG
|
||||
Fm
|
||||
@@ -19505,7 +19419,7 @@ tY
|
||||
tY
|
||||
tY
|
||||
tY
|
||||
cP
|
||||
cs
|
||||
dh
|
||||
dG
|
||||
Fm
|
||||
@@ -19829,7 +19743,7 @@ ek
|
||||
GY
|
||||
lt
|
||||
tY
|
||||
cP
|
||||
cs
|
||||
dh
|
||||
dG
|
||||
tB
|
||||
|
||||
@@ -136,6 +136,9 @@
|
||||
/obj/item/storage/toolbox/mechanical,
|
||||
/obj/item/storage/toolbox/mechanical,
|
||||
/obj/item/storage/toolbox/mechanical,
|
||||
/obj/item/storage/firstaid/regular,
|
||||
/obj/item/storage/firstaid/regular,
|
||||
/obj/item/stack/medical/splint/full,
|
||||
/turf/simulated/floor/carpet/rubber{
|
||||
temperature = 268.15
|
||||
},
|
||||
|
||||
@@ -940,6 +940,7 @@
|
||||
/obj/item/flame/lighter/adhomai,
|
||||
/obj/item/material/knife/trench,
|
||||
/obj/item/storage/box/fancy/candle_box,
|
||||
/obj/item/storage/box/fancy/candle_box,
|
||||
/turf/simulated/floor/wood{
|
||||
temperature = 268.15
|
||||
},
|
||||
@@ -1255,6 +1256,14 @@
|
||||
dir = 9
|
||||
},
|
||||
/obj/structure/table/wood,
|
||||
/obj/structure/closet/walllocker/medical{
|
||||
pixel_y = 30
|
||||
},
|
||||
/obj/item/stack/medical/bruise_pack/full,
|
||||
/obj/item/stack/medical/bruise_pack/full,
|
||||
/obj/item/stack/medical/splint/full,
|
||||
/obj/item/stack/medical/ointment/full,
|
||||
/obj/item/stack/medical/ointment/full,
|
||||
/turf/simulated/floor/lino/grey{
|
||||
temperature = 268.15
|
||||
},
|
||||
@@ -1820,7 +1829,7 @@ eS
|
||||
eS
|
||||
zA
|
||||
Zm
|
||||
Zc
|
||||
WR
|
||||
zA
|
||||
eS
|
||||
eS
|
||||
@@ -2030,7 +2039,7 @@ nR
|
||||
nR
|
||||
Xv
|
||||
sv
|
||||
eS
|
||||
mH
|
||||
Dn
|
||||
Xv
|
||||
pr
|
||||
@@ -2209,7 +2218,7 @@ yR
|
||||
zA
|
||||
eS
|
||||
zA
|
||||
Zc
|
||||
WR
|
||||
yR
|
||||
zA
|
||||
eS
|
||||
@@ -2243,7 +2252,7 @@ Xv
|
||||
zA
|
||||
eS
|
||||
zA
|
||||
Zc
|
||||
WR
|
||||
Zc
|
||||
zA
|
||||
eS
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -16,6 +16,15 @@
|
||||
temperature = 268.15
|
||||
},
|
||||
/area/exoplanet/adhomai)
|
||||
"bE" = (
|
||||
/obj/structure/closet/crate/bin,
|
||||
/obj/item/clothing/accessory/tajaran/charm/steel,
|
||||
/obj/item/trash/plate,
|
||||
/obj/item/trash/plate,
|
||||
/turf/simulated/floor/wood{
|
||||
temperature = 268.15
|
||||
},
|
||||
/area/adhomai_raskariim_hideout)
|
||||
"ch" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/pocketwatch/adhomai,
|
||||
@@ -31,6 +40,13 @@
|
||||
/area/adhomai_raskariim_hideout)
|
||||
"cy" = (
|
||||
/obj/structure/closet/cabinet,
|
||||
/obj/item/clothing/suit/storage/toggle/tajaran/wool,
|
||||
/obj/item/clothing/under/tajaran,
|
||||
/obj/item/clothing/under/tajaran,
|
||||
/obj/item/clothing/under/tajaran/nka_noble{
|
||||
name = "tattered noble adhomian clothes";
|
||||
desc = "Clothes frequently worn by the New Kingdom's nobles. Whilst most are hand-me-downs this one clearly is, dotted by large holes and torn fabric."
|
||||
},
|
||||
/turf/simulated/floor/wood{
|
||||
temperature = 268.15
|
||||
},
|
||||
@@ -63,6 +79,14 @@
|
||||
temperature = 268.15
|
||||
},
|
||||
/area/exoplanet/adhomai)
|
||||
"dg" = (
|
||||
/obj/item/stack/material/woodlog,
|
||||
/obj/item/stack/material/woodlog,
|
||||
/obj/item/stack/material/woodlog,
|
||||
/turf/simulated/floor/exoplanet/snow{
|
||||
temperature = 268.15
|
||||
},
|
||||
/area/exoplanet/adhomai)
|
||||
"ds" = (
|
||||
/obj/structure/flora/bush/adhomai,
|
||||
/turf/simulated/floor/exoplanet/snow{
|
||||
@@ -127,6 +151,22 @@
|
||||
temperature = 278.15
|
||||
},
|
||||
/area/adhomai_raskariim_hideout)
|
||||
"kM" = (
|
||||
/obj/structure/bookcase,
|
||||
/turf/simulated/floor/wood{
|
||||
temperature = 268.15
|
||||
},
|
||||
/area/adhomai_raskariim_hideout)
|
||||
"kX" = (
|
||||
/obj/effect/floor_decal/corner/grey/diagonal,
|
||||
/obj/structure/reagent_dispensers/keg/mead{
|
||||
reagents_to_add = list(/singleton/reagent/water=1000);
|
||||
name = "water barrel"
|
||||
},
|
||||
/turf/simulated/floor/tiled/white{
|
||||
temperature = 278.15
|
||||
},
|
||||
/area/adhomai_raskariim_hideout)
|
||||
"lj" = (
|
||||
/obj/structure/mirror{
|
||||
pixel_y = 32
|
||||
@@ -151,6 +191,16 @@
|
||||
temperature = 278.15
|
||||
},
|
||||
/area/adhomai_raskariim_hideout)
|
||||
"nm" = (
|
||||
/obj/effect/floor_decal/corner/grey/diagonal,
|
||||
/obj/machinery/light/small{
|
||||
brightness_color = "#FA8282";
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/white{
|
||||
temperature = 278.15
|
||||
},
|
||||
/area/adhomai_raskariim_hideout)
|
||||
"or" = (
|
||||
/obj/item/reagent_containers/pill/happy{
|
||||
pixel_y = -5;
|
||||
@@ -183,6 +233,10 @@
|
||||
pixel_y = 1
|
||||
},
|
||||
/obj/effect/floor_decal/corner/grey/diagonal,
|
||||
/obj/item/reagent_containers/glass/rag{
|
||||
pixel_x = -7;
|
||||
pixel_y = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/white{
|
||||
temperature = 278.15
|
||||
},
|
||||
@@ -200,7 +254,7 @@
|
||||
},
|
||||
/area/adhomai_raskariim_hideout)
|
||||
"rw" = (
|
||||
/obj/structure/bed/stool/chair/sofa/left/beige{
|
||||
/obj/structure/bed/stool/chair/sofa/left/black{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/wood{
|
||||
@@ -290,6 +344,13 @@
|
||||
"vA" = (
|
||||
/obj/item/surgery/scalpel,
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/reagent_containers/glass/bucket/wood{
|
||||
pixel_x = -4;
|
||||
pixel_y = 9
|
||||
},
|
||||
/obj/machinery/light/small{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/wood{
|
||||
temperature = 268.15
|
||||
},
|
||||
@@ -304,10 +365,20 @@
|
||||
/area/adhomai_raskariim_hideout)
|
||||
"vI" = (
|
||||
/obj/item/clothing/shoes/tajara/footwraps{
|
||||
pixel_x = 9
|
||||
pixel_x = 9;
|
||||
pixel_y = 14
|
||||
},
|
||||
/obj/item/clothing/shoes/tajara/footwraps{
|
||||
pixel_x = -5
|
||||
pixel_x = -5;
|
||||
pixel_y = 13
|
||||
},
|
||||
/obj/item/clothing/shoes/tajara/winter{
|
||||
pixel_x = -11;
|
||||
pixel_y = -7
|
||||
},
|
||||
/obj/item/clothing/shoes/tajara/winter{
|
||||
pixel_x = 7;
|
||||
pixel_y = -7
|
||||
},
|
||||
/turf/simulated/floor/wood{
|
||||
temperature = 268.15
|
||||
@@ -315,6 +386,29 @@
|
||||
/area/adhomai_raskariim_hideout)
|
||||
"wq" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/gun/projectile/revolver/adhomian{
|
||||
pixel_y = -2
|
||||
},
|
||||
/obj/item/ammo_casing/c38{
|
||||
pixel_x = -6;
|
||||
pixel_y = 8
|
||||
},
|
||||
/obj/item/ammo_casing/c38{
|
||||
pixel_x = 7;
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/item/ammo_casing/c38{
|
||||
pixel_x = 1;
|
||||
pixel_y = 7
|
||||
},
|
||||
/obj/item/ammo_casing/c38{
|
||||
pixel_x = 4;
|
||||
pixel_y = -4
|
||||
},
|
||||
/obj/item/reagent_containers/food/drinks/drinkingglass{
|
||||
pixel_x = -5;
|
||||
pixel_y = 12
|
||||
},
|
||||
/turf/simulated/floor/carpet/art{
|
||||
temperature = 278.15
|
||||
},
|
||||
@@ -327,6 +421,47 @@
|
||||
temperature = 268.15
|
||||
},
|
||||
/area/adhomai_raskariim_hideout)
|
||||
"xe" = (
|
||||
/obj/effect/floor_decal/corner/grey/diagonal,
|
||||
/obj/structure/table/stone/marble,
|
||||
/obj/item/reagent_containers/cooking_container/pot{
|
||||
pixel_y = 11;
|
||||
pixel_x = 9
|
||||
},
|
||||
/obj/item/reagent_containers/cooking_container/saucepan{
|
||||
pixel_y = -2;
|
||||
pixel_x = -11
|
||||
},
|
||||
/obj/effect/decal/cleanable/blood/drip,
|
||||
/obj/effect/decal/cleanable/blood/drip{
|
||||
pixel_y = 20;
|
||||
pixel_x = -15
|
||||
},
|
||||
/obj/item/reagent_containers/glass/bucket/wood{
|
||||
pixel_x = 11
|
||||
},
|
||||
/turf/simulated/floor/tiled/white{
|
||||
temperature = 278.15
|
||||
},
|
||||
/area/adhomai_raskariim_hideout)
|
||||
"xo" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/flame/candle/waxcandles{
|
||||
pixel_x = -4;
|
||||
pixel_y = 16
|
||||
},
|
||||
/turf/simulated/floor/wood{
|
||||
temperature = 268.15
|
||||
},
|
||||
/area/adhomai_raskariim_hideout)
|
||||
"xs" = (
|
||||
/obj/structure/bonfire/fireplace{
|
||||
density = 0
|
||||
},
|
||||
/turf/simulated/floor/wood{
|
||||
temperature = 268.15
|
||||
},
|
||||
/area/adhomai_raskariim_hideout)
|
||||
"xK" = (
|
||||
/obj/effect/floor_decal/corner/grey/diagonal,
|
||||
/obj/structure/table/stone/marble,
|
||||
@@ -337,10 +472,29 @@
|
||||
/obj/machinery/light/small{
|
||||
dir = 4
|
||||
},
|
||||
/obj/item/reagent_containers/food/drinks/drinkingglass{
|
||||
pixel_y = 9;
|
||||
pixel_x = -7
|
||||
},
|
||||
/obj/item/reagent_containers/food/drinks/drinkingglass{
|
||||
pixel_y = 3;
|
||||
pixel_x = -7
|
||||
},
|
||||
/obj/item/material/kitchen/utensil/knife,
|
||||
/turf/simulated/floor/tiled/white{
|
||||
temperature = 278.15
|
||||
},
|
||||
/area/adhomai_raskariim_hideout)
|
||||
"zd" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/device/flashlight/lamp{
|
||||
pixel_y = 6;
|
||||
pixel_x = 5
|
||||
},
|
||||
/turf/simulated/floor/wood{
|
||||
temperature = 268.15
|
||||
},
|
||||
/area/adhomai_raskariim_hideout)
|
||||
"zn" = (
|
||||
/turf/simulated/floor/carpet/art{
|
||||
temperature = 278.15
|
||||
@@ -393,8 +547,13 @@
|
||||
/obj/item/storage/toolbox/mechanical{
|
||||
pixel_y = -5
|
||||
},
|
||||
/obj/item/flame/lighter/adhomai,
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/storage/firstaid,
|
||||
/obj/item/storage/box/fancy/candle_box,
|
||||
/obj/item/storage/box/fancy/candle_box,
|
||||
/obj/item/storage/box/fancy/candle_box,
|
||||
/obj/item/storage/box/fancy/candle_box,
|
||||
/obj/item/flame/lighter/adhomai,
|
||||
/turf/simulated/floor/wood{
|
||||
temperature = 268.15
|
||||
},
|
||||
@@ -437,7 +596,8 @@
|
||||
/area/adhomai_raskariim_hideout)
|
||||
"HE" = (
|
||||
/obj/item/handcuffs/cable/random,
|
||||
/obj/machinery/light/small/red,
|
||||
/obj/item/handcuffs/cable/random,
|
||||
/obj/machinery/light/small,
|
||||
/turf/simulated/floor/wood{
|
||||
temperature = 268.15
|
||||
},
|
||||
@@ -446,6 +606,13 @@
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/material/ashtray/bronze,
|
||||
/obj/item/trash/cigbutt,
|
||||
/obj/item/storage/box/fancy/cigarettes/dpra{
|
||||
pixel_y = -2;
|
||||
pixel_x = -7
|
||||
},
|
||||
/obj/machinery/light/small{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/wood{
|
||||
temperature = 268.15
|
||||
},
|
||||
@@ -458,6 +625,18 @@
|
||||
temperature = 278.15
|
||||
},
|
||||
/area/adhomai_raskariim_hideout)
|
||||
"Io" = (
|
||||
/obj/structure/closet/crate/bin,
|
||||
/obj/item/paper/crumpled/bloody,
|
||||
/obj/item/paper/crumpled/bloody,
|
||||
/obj/item/trash/candle,
|
||||
/obj/item/trash/plate,
|
||||
/obj/item/trash/plate,
|
||||
/obj/item/trash/plate,
|
||||
/turf/simulated/floor/wood{
|
||||
temperature = 268.15
|
||||
},
|
||||
/area/adhomai_raskariim_hideout)
|
||||
"IW" = (
|
||||
/obj/structure/closet/cabinet,
|
||||
/obj/item/clothing/suit/storage/tajaran/raskara,
|
||||
@@ -495,6 +674,9 @@
|
||||
pixel_x = 7
|
||||
},
|
||||
/obj/item/material/kitchen/utensil/knife,
|
||||
/obj/machinery/light/small{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/wood{
|
||||
temperature = 268.15
|
||||
},
|
||||
@@ -571,6 +753,10 @@
|
||||
/area/adhomai_raskariim_hideout)
|
||||
"Ol" = (
|
||||
/obj/structure/coatrack,
|
||||
/obj/item/clothing/accessory/poncho/tajarancloak/winter,
|
||||
/obj/item/clothing/accessory/poncho/tajarancloak/winter,
|
||||
/obj/item/clothing/head/tajaran/fur,
|
||||
/obj/item/clothing/head/tajaran/fur,
|
||||
/turf/simulated/floor/wood{
|
||||
temperature = 268.15
|
||||
},
|
||||
@@ -591,6 +777,8 @@
|
||||
/obj/structure/noose,
|
||||
/obj/structure/bed/stool/bar/padded/red,
|
||||
/obj/effect/decal/cleanable/blood/splatter,
|
||||
/obj/item/poppet,
|
||||
/obj/machinery/light/small,
|
||||
/turf/simulated/floor/wood{
|
||||
temperature = 268.15
|
||||
},
|
||||
@@ -654,11 +842,18 @@
|
||||
"WO" = (
|
||||
/turf/simulated/wall/wood,
|
||||
/area/adhomai_raskariim_hideout)
|
||||
"XF" = (
|
||||
/obj/item/storage/box/fancy/candle_box,
|
||||
/turf/simulated/floor/wood{
|
||||
temperature = 268.15
|
||||
},
|
||||
/area/adhomai_raskariim_hideout)
|
||||
"Yu" = (
|
||||
/obj/effect/ghostspawpoint{
|
||||
identifier = "raskariim_hideout";
|
||||
name = "igs - raskariim_hideout"
|
||||
},
|
||||
/obj/item/flame/candle,
|
||||
/turf/simulated/floor/wood{
|
||||
temperature = 268.15
|
||||
},
|
||||
@@ -785,7 +980,7 @@ SE
|
||||
SE
|
||||
SE
|
||||
WO
|
||||
SE
|
||||
kM
|
||||
zn
|
||||
zn
|
||||
vD
|
||||
@@ -881,7 +1076,7 @@ jX
|
||||
ez
|
||||
ka
|
||||
WO
|
||||
SE
|
||||
xs
|
||||
zn
|
||||
zn
|
||||
rw
|
||||
@@ -943,7 +1138,7 @@ CS
|
||||
WM
|
||||
WO
|
||||
Jq
|
||||
SE
|
||||
XF
|
||||
SE
|
||||
Ew
|
||||
SE
|
||||
@@ -972,15 +1167,15 @@ ri
|
||||
WO
|
||||
WO
|
||||
WO
|
||||
SE
|
||||
Io
|
||||
SE
|
||||
SE
|
||||
SE
|
||||
WO
|
||||
bE
|
||||
SE
|
||||
SE
|
||||
SE
|
||||
ez
|
||||
zd
|
||||
WO
|
||||
WO
|
||||
WO
|
||||
@@ -988,7 +1183,7 @@ WO
|
||||
"}
|
||||
(14,1,1) = {"
|
||||
CS
|
||||
WM
|
||||
dg
|
||||
WO
|
||||
ch
|
||||
SE
|
||||
@@ -1027,7 +1222,7 @@ Hn
|
||||
Hn
|
||||
Hn
|
||||
Hn
|
||||
Hn
|
||||
kX
|
||||
WO
|
||||
WM
|
||||
WM
|
||||
@@ -1038,7 +1233,7 @@ MZ
|
||||
CS
|
||||
WM
|
||||
WO
|
||||
ez
|
||||
xo
|
||||
zn
|
||||
zn
|
||||
zn
|
||||
@@ -1046,12 +1241,12 @@ zn
|
||||
SE
|
||||
DD
|
||||
WO
|
||||
nm
|
||||
Hn
|
||||
Hn
|
||||
Hn
|
||||
Hn
|
||||
Hn
|
||||
Hn
|
||||
xe
|
||||
WO
|
||||
WM
|
||||
WM
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -32,7 +32,7 @@
|
||||
max_count = 3
|
||||
|
||||
extra_languages = list(LANGUAGE_SIIK_MAAS)
|
||||
outfit = /datum/outfit/admin/
|
||||
outfit = /datum/outfit/admin/nka_base
|
||||
possible_species = list(SPECIES_TAJARA,SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN)
|
||||
allow_appearance_change = APPEARANCE_PLASTICSURGERY
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -63,4 +63,4 @@
|
||||
l_pocket = /obj/item/device/radio
|
||||
|
||||
/datum/outfit/admin/psis_outpost/get_id_access()
|
||||
return list(access_pra)
|
||||
return list(access_pra)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -551,15 +551,13 @@
|
||||
/area/raskara_okon/observatory)
|
||||
"ht" = (
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 9;
|
||||
icon_state = "corner_white"
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
|
||||
dir = 8;
|
||||
icon_state = "map-scrubbers"
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
@@ -611,6 +609,16 @@
|
||||
temperature = 278.15
|
||||
},
|
||||
/area/raskara_okon/eva)
|
||||
"is" = (
|
||||
/obj/structure/table/stone/marble,
|
||||
/obj/effect/floor_decal/corner/grey/diagonal,
|
||||
/obj/machinery/reagentgrinder{
|
||||
pixel_y = 6
|
||||
},
|
||||
/turf/simulated/floor/tiled/white{
|
||||
temperature = 278.15
|
||||
},
|
||||
/area/raskara_okon/mess_hall)
|
||||
"ix" = (
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 5
|
||||
@@ -645,6 +653,13 @@
|
||||
temperature = 278.15
|
||||
},
|
||||
/area/raskara_okon/eva)
|
||||
"iP" = (
|
||||
/obj/effect/floor_decal/corner/grey/diagonal,
|
||||
/obj/machinery/appliance/cooker/oven,
|
||||
/turf/simulated/floor/tiled/white{
|
||||
temperature = 278.15
|
||||
},
|
||||
/area/raskara_okon/mess_hall)
|
||||
"iS" = (
|
||||
/turf/simulated/floor{
|
||||
temperature = 278.15
|
||||
@@ -944,8 +959,7 @@
|
||||
"lr" = (
|
||||
/obj/effect/floor_decal/corner/brown/diagonal,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 6;
|
||||
pixel_y = 0
|
||||
dir = 6
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 4;
|
||||
@@ -1192,8 +1206,7 @@
|
||||
/area/raskara_okon/eva)
|
||||
"pD" = (
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 9;
|
||||
icon_state = "corner_white"
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
@@ -1286,8 +1299,7 @@
|
||||
/area/raskara_okon/laboratory)
|
||||
"qm" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 9;
|
||||
pixel_y = 0
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 4
|
||||
@@ -1467,8 +1479,7 @@
|
||||
/area/raskara_okon/mess_hall)
|
||||
"td" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 6;
|
||||
pixel_y = 0
|
||||
dir = 6
|
||||
},
|
||||
/obj/machinery/meter,
|
||||
/obj/structure/cable/green{
|
||||
@@ -1548,6 +1559,7 @@
|
||||
/obj/structure/toilet{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/curtain/open/shower,
|
||||
/turf/simulated/floor/tiled/freezer{
|
||||
temperature = 278.15
|
||||
},
|
||||
@@ -1711,8 +1723,7 @@
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
|
||||
dir = 1;
|
||||
icon_state = "map-supply"
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 4
|
||||
@@ -1948,8 +1959,7 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 8;
|
||||
icon_state = "warning"
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/plasticflaps/mining,
|
||||
/obj/machinery/conveyor{
|
||||
@@ -2149,8 +2159,7 @@
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 6;
|
||||
pixel_y = 0
|
||||
dir = 6
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 6
|
||||
@@ -2636,6 +2645,8 @@
|
||||
/obj/item/reagent_containers/food/drinks/carton/fatshouters,
|
||||
/obj/item/reagent_containers/food/drinks/carton/fatshouters,
|
||||
/obj/item/reagent_containers/food/drinks/carton/fatshouters,
|
||||
/obj/item/storage/box/fancy/egg_box,
|
||||
/obj/item/storage/box/fancy/egg_box,
|
||||
/turf/simulated/floor/tiled/white{
|
||||
temperature = 278.15
|
||||
},
|
||||
@@ -2697,8 +2708,7 @@
|
||||
/area/raskara_okon/observatory)
|
||||
"JM" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 10;
|
||||
pixel_y = 0
|
||||
dir = 10
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 6
|
||||
@@ -3625,8 +3635,7 @@
|
||||
/area/raskara_okon/observatory)
|
||||
"Wh" = (
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 9;
|
||||
icon_state = "corner_white"
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
@@ -3674,8 +3683,7 @@
|
||||
/area/raskara_okon/laboratory)
|
||||
"WE" = (
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
dir = 9;
|
||||
icon_state = "corner_white"
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
|
||||
dir = 8
|
||||
@@ -3692,8 +3700,7 @@
|
||||
/area/raskara_okon/entry)
|
||||
"WG" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 6;
|
||||
pixel_y = 0
|
||||
dir = 6
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel{
|
||||
temperature = 278.15
|
||||
@@ -4075,12 +4082,12 @@ HX
|
||||
HX
|
||||
HX
|
||||
Ag
|
||||
XM
|
||||
iP
|
||||
Lk
|
||||
Cc
|
||||
Ze
|
||||
Ic
|
||||
wx
|
||||
is
|
||||
fq
|
||||
ef
|
||||
Ag
|
||||
@@ -4147,7 +4154,7 @@ Oa
|
||||
Oa
|
||||
Oa
|
||||
Oa
|
||||
Oa
|
||||
XM
|
||||
wx
|
||||
eS
|
||||
Ql
|
||||
|
||||
Reference in New Issue
Block a user