This commit is contained in:
Fabian
2021-03-23 20:05:40 +01:00
317 changed files with 8914 additions and 5688 deletions
+1 -1
View File
@@ -20,7 +20,7 @@ jobs:
run: |
~/dmdoc
touch dmdoc/.nojekyll
echo codedocs.tgstation13.org > dmdoc/CNAME
echo codedocs.citadel-station.net > dmdoc/CNAME
- name: Deploy
uses: JamesIves/github-pages-deploy-action@3.7.1
with:
@@ -158,8 +158,8 @@
/area/ruin/powered/beach)
"aF" = (
/obj/machinery/vending/boozeomat{
set_obj_flags = "EMAGGED";
req_access_txt = "0"
req_access_txt = "0";
set_obj_flags = "EMAGGED"
},
/turf/open/floor/wood,
/area/ruin/powered/beach)
@@ -547,8 +547,8 @@
"rV" = (
/obj/effect/turf_decal/sand,
/obj/item/reagent_containers/food/drinks/beer/light{
pixel_y = -3;
pixel_x = -9
pixel_x = -9;
pixel_y = -3
},
/turf/open/floor/plating,
/area/ruin/powered/beach)
@@ -326,8 +326,8 @@
/area/ruin/unpowered/ash_walkers)
"aO" = (
/obj/structure/stone_tile/surrounding/cracked{
icon_state = "cracked_surrounding1";
dir = 1
dir = 1;
icon_state = "cracked_surrounding1"
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
@@ -510,9 +510,7 @@
/obj/structure/stone_tile/cracked{
dir = 4
},
/obj/item/construction/rcd/loaded/upgraded{
},
/obj/item/construction/rcd/loaded/upgraded,
/turf/open/indestructible/boss,
/area/ruin/unpowered/ash_walkers)
"bn" = (
@@ -1019,8 +1017,8 @@
/area/ruin/unpowered/ash_walkers)
"cA" = (
/obj/structure/stone_tile/slab/cracked{
icon_state = "cracked_slab1";
dir = 4
dir = 4;
icon_state = "cracked_slab1"
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
@@ -13,10 +13,10 @@
/area/ruin/unpowered)
"f" = (
/obj/structure/mirror{
broken = 1;
desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!";
icon_state = "mirror_broke";
pixel_x = -28;
broken = 1
pixel_x = -28
},
/obj/item/clothing/suit/hooded/bloated_human,
/obj/effect/decal/cleanable/blood,
@@ -25,10 +25,10 @@
"g" = (
/obj/effect/decal/cleanable/blood/tracks,
/obj/structure/mirror{
broken = 1;
desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!";
icon_state = "mirror_broke";
pixel_x = -28;
broken = 1
pixel_x = -28
},
/turf/open/floor/plating,
/area/ruin/unpowered)
@@ -45,10 +45,10 @@
/area/ruin/unpowered)
"k" = (
/obj/structure/mirror{
broken = 1;
desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!";
icon_state = "mirror_broke";
pixel_x = 28;
broken = 1
pixel_x = 28
},
/turf/open/floor/plating{
icon_state = "panelscorched"
@@ -56,19 +56,19 @@
/area/ruin/unpowered)
"l" = (
/obj/structure/mirror{
broken = 1;
desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!";
icon_state = "mirror_broke";
pixel_x = 28;
broken = 1
pixel_x = 28
},
/turf/open/floor/plating,
/area/ruin/unpowered)
"m" = (
/obj/structure/mirror{
broken = 1;
desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!";
icon_state = "mirror_broke";
pixel_x = -28;
broken = 1
pixel_x = -28
},
/turf/open/floor/plating,
/area/ruin/unpowered)
@@ -79,10 +79,10 @@
/area/ruin/unpowered)
"o" = (
/obj/structure/mirror{
broken = 1;
desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!";
icon_state = "mirror_broke";
pixel_x = -28;
broken = 1
pixel_x = -28
},
/turf/open/floor/plating{
icon_state = "platingdmg1"
@@ -98,10 +98,10 @@
/area/lavaland/surface/outdoors)
"T" = (
/obj/structure/mirror{
broken = 1;
desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!";
icon_state = "mirror_broke";
pixel_y = 28;
broken = 1
pixel_y = 28
},
/obj/item/kitchen/knife/envy,
/turf/open/floor/plating,
@@ -137,8 +137,8 @@
/area/ruin/powered)
"D" = (
/obj/effect/decal/cleanable/blood/footprints{
icon_state = "blood1";
dir = 1
dir = 1;
icon_state = "blood1"
},
/obj/machinery/door/airlock/survival_pod/glass,
/obj/structure/fans/tiny,
@@ -641,4 +641,4 @@ a
a
a
a
"}
"}
@@ -87,8 +87,8 @@
/obj/effect/decal/cleanable/blood,
/obj/effect/decal/cleanable/blood/drip,
/obj/effect/decal/cleanable/blood/footprints{
icon_state = "blood1";
dir = 1
dir = 1;
icon_state = "blood1"
},
/turf/open/floor/pod/dark,
/area/ruin/powered)
@@ -106,24 +106,24 @@
/area/lavaland/surface/outdoors)
"t" = (
/obj/effect/decal/cleanable/blood/footprints{
icon_state = "blood1";
dir = 1
dir = 1;
icon_state = "blood1"
},
/obj/machinery/door/airlock/survival_pod/glass,
/turf/open/floor/pod/dark,
/area/ruin/powered)
"u" = (
/obj/effect/decal/cleanable/blood/footprints{
icon_state = "blood1";
dir = 8
dir = 8;
icon_state = "blood1"
},
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"v" = (
/obj/effect/decal/cleanable/blood/footprints{
icon_state = "blood1";
dir = 8
dir = 8;
icon_state = "blood1"
},
/obj/effect/decal/cleanable/blood/footprints{
icon_state = "blood1"
@@ -139,8 +139,8 @@
"x" = (
/obj/effect/decal/cleanable/blood/drip,
/obj/effect/decal/cleanable/blood/footprints{
icon_state = "blood1";
dir = 1
dir = 1;
icon_state = "blood1"
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
@@ -149,15 +149,15 @@
pixel_y = 32
},
/obj/effect/decal/cleanable/blood/footprints{
icon_state = "blood1";
dir = 8
dir = 8;
icon_state = "blood1"
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"z" = (
/obj/effect/decal/cleanable/blood/footprints{
icon_state = "blood1";
dir = 8
dir = 8;
icon_state = "blood1"
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+2 -2
View File
@@ -2268,9 +2268,9 @@
"hF" = (
/obj/structure/table,
/obj/machinery/computer/pod/old{
id = "derelict_gun";
name = "ProComp IIe";
pixel_y = 7;
id = "derelict_gun"
pixel_y = 7
},
/turf/open/floor/plasteel/chapel,
/area/ruin/space/derelict/medical/chapel)
+14 -14
View File
@@ -66,8 +66,8 @@
/area/ruin/space/has_grav/powered/advancedlab)
"n" = (
/obj/structure/chair/comfy/beige{
icon_state = "comfychair";
dir = 8
dir = 8;
icon_state = "comfychair"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/powered/advancedlab)
@@ -85,10 +85,10 @@
},
/obj/structure/table/glass,
/obj/item/paper{
info = "As of yet, our experiments have seen a fair bit of success. Unfortunately, our business partners have stopped funding us as they realised they utterly hate each other. To whoever finds this place, they are yours. Use them how you will. I leave you with the next generation of greytiding.";
name = "Note to finder";
pixel_x = -1;
pixel_y = 3;
info = "As of yet, our experiments have seen a fair bit of success. Unfortunately, our business partners have stopped funding us as they realised they utterly hate each other. To whoever finds this place, they are yours. Use them how you will. I leave you with the next generation of greytiding."
pixel_y = 3
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/powered/advancedlab)
@@ -112,8 +112,8 @@
/area/ruin/space/has_grav/powered/advancedlab)
"s" = (
/obj/structure/chair/comfy/beige{
icon_state = "comfychair";
dir = 1
dir = 1;
icon_state = "comfychair"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/powered/advancedlab)
@@ -123,8 +123,8 @@
/area/ruin/space/has_grav/powered/advancedlab)
"u" = (
/obj/machinery/light/small{
icon_state = "bulb";
dir = 4
dir = 4;
icon_state = "bulb"
},
/obj/structure/closet,
/obj/item/clothing/suit/hooded/wintercoat/miner,
@@ -132,8 +132,8 @@
/obj/item/clothing/under/pants/classicjeans,
/obj/item/clothing/neck/scarf,
/obj/item/clothing/neck/stripedgreenscarf,
/obj/item/toy/tennis/rainbow,
/obj/item/toy/tennis,
/obj/item/toy/fluff/tennis_poly/tri/squeak/rainbow,
/obj/item/toy/fluff/tennis_poly,
/obj/item/clothing/suit/hooded/wintercoat/miner,
/obj/item/clothing/shoes/sneakers/brown,
/obj/item/clothing/under/pants/classicjeans,
@@ -161,8 +161,8 @@
/area/ruin/space/has_grav/powered/advancedlab)
"y" = (
/obj/machinery/light/small{
icon_state = "bulb";
dir = 1
dir = 1;
icon_state = "bulb"
},
/turf/open/floor/wood,
/area/ruin/space/has_grav/powered/advancedlab)
@@ -268,8 +268,8 @@
/area/ruin/space/has_grav/powered/advancedlab)
"R" = (
/obj/machinery/light/small{
icon_state = "bulb";
dir = 1
dir = 1;
icon_state = "bulb"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/powered/advancedlab)
+2 -2
View File
@@ -57,8 +57,8 @@
dir = 4
},
/mob/living/simple_animal/hostile/gorilla/familiar{
icon_state = "crawling";
dir = 4
dir = 4;
icon_state = "crawling"
},
/turf/open/floor/plating/beach/sand,
/area/ruin/powered)
+108 -108
View File
@@ -65,10 +65,10 @@
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"ao" = (
/obj/machinery/power/apc{
start_charge = 0;
dir = 4;
name = "Cargo Bay APC";
pixel_x = 24
pixel_x = 24;
start_charge = 0
},
/obj/structure/cable{
icon_state = "0-8"
@@ -385,9 +385,9 @@
name = "gelatinous floor"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 9;
icon_state = "trails_1";
dir = 9
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost)
@@ -398,9 +398,9 @@
name = "gelatinous floor"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost)
@@ -415,9 +415,9 @@
pixel_y = 32
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost)
@@ -428,9 +428,9 @@
name = "gelatinous floor"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 5;
icon_state = "trails_1";
dir = 5
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost)
@@ -479,9 +479,9 @@
/area/ruin/space/has_grav/derelictoutpost/dockedship)
"bw" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 5;
icon_state = "trails_1";
dir = 5
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -598,9 +598,9 @@
},
/obj/effect/decal/cleanable/blood/old,
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 1;
icon_state = "trails_1";
dir = 1
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost)
@@ -755,9 +755,9 @@
/area/ruin/space/has_grav/derelictoutpost)
"bU" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/turf/open/floor/plating{
icon_state = "wall_thermite";
@@ -766,17 +766,17 @@
/area/ruin/space/has_grav/derelictoutpost)
"bV" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost)
"bW" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 6;
icon_state = "trails_1";
dir = 6
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost)
@@ -787,9 +787,9 @@
name = "gelatinous floor"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 1;
icon_state = "trails_1";
dir = 1
name = "dried blood trail"
},
/obj/machinery/light{
dir = 4
@@ -813,11 +813,11 @@
/area/ruin/space/has_grav/derelictoutpost/powerstorage)
"ca" = (
/obj/machinery/power/apc{
start_charge = 0;
dir = 4;
name = "Power Storage APC";
pixel_x = 23;
pixel_y = 2
pixel_y = 2;
start_charge = 0
},
/obj/structure/cable{
icon_state = "0-8"
@@ -924,10 +924,10 @@
/area/ruin/space/has_grav/derelictoutpost)
"ck" = (
/obj/machinery/power/apc{
start_charge = 0;
dir = 2;
name = "Tradepost APC";
pixel_y = -24
pixel_y = -24;
start_charge = 0
},
/obj/structure/cable{
icon_state = "0-8"
@@ -942,9 +942,9 @@
},
/obj/structure/glowshroom/single,
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 1;
icon_state = "trails_1";
dir = 1
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost)
@@ -1106,9 +1106,9 @@
name = "gelatinous floor"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 10;
icon_state = "trails_1";
dir = 10
name = "dried blood trail"
},
/mob/living/simple_animal/hostile/netherworld{
desc = "Awh its so sm-OH GOD WHAT THE FUCK.";
@@ -1126,9 +1126,9 @@
name = "gelatinous floor"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/turf/open/floor/plating/asteroid,
/area/ruin/space/has_grav/derelictoutpost)
@@ -1139,9 +1139,9 @@
name = "gelatinous floor"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 5;
icon_state = "trails_1";
dir = 5
name = "dried blood trail"
},
/turf/open/floor/plating/asteroid,
/area/ruin/space/has_grav/derelictoutpost)
@@ -1182,9 +1182,9 @@
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"cK" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 10;
icon_state = "trails_1";
dir = 10
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1198,9 +1198,9 @@
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"cL" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 5;
icon_state = "trails_1";
dir = 5
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1268,9 +1268,9 @@
name = "gelatinous floor"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 1;
icon_state = "trails_1";
dir = 1
name = "dried blood trail"
},
/turf/open/floor/plating/asteroid,
/area/ruin/space/has_grav/derelictoutpost)
@@ -1297,9 +1297,9 @@
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"cX" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 1;
icon_state = "trails_1";
dir = 1
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1325,9 +1325,9 @@
},
/obj/effect/decal/cleanable/blood/old,
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 1;
icon_state = "trails_1";
dir = 1
name = "dried blood trail"
},
/turf/open/floor/plating/asteroid,
/area/ruin/space/has_grav/derelictoutpost)
@@ -1366,25 +1366,25 @@
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"dd" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 10;
icon_state = "trails_1";
dir = 10
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"de" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"df" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1399,9 +1399,9 @@
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"dg" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1415,9 +1415,9 @@
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"dh" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1436,9 +1436,9 @@
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"di" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 5;
icon_state = "trails_1";
dir = 5
name = "dried blood trail"
},
/obj/effect/decal/cleanable/cobweb{
icon_state = "cobweb2"
@@ -1499,9 +1499,9 @@
name = "gelatinous floor"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 8;
icon_state = "trails_1";
dir = 8
name = "dried blood trail"
},
/turf/open/floor/plating/asteroid,
/area/ruin/space/has_grav/derelictoutpost)
@@ -1512,9 +1512,9 @@
name = "gelatinous floor"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 6;
icon_state = "trails_1";
dir = 6
name = "dried blood trail"
},
/turf/open/floor/plating/asteroid,
/area/ruin/space/has_grav/derelictoutpost)
@@ -1574,9 +1574,9 @@
/area/ruin/space/has_grav/derelictoutpost)
"dv" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 9;
icon_state = "trails_1";
dir = 9
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1587,9 +1587,9 @@
/area/ruin/space/has_grav/derelictoutpost)
"dw" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1605,9 +1605,9 @@
/area/ruin/space/has_grav/derelictoutpost)
"dx" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1618,9 +1618,9 @@
/area/ruin/space/has_grav/derelictoutpost)
"dy" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1632,9 +1632,9 @@
/area/ruin/space/has_grav/derelictoutpost)
"dz" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 5;
icon_state = "trails_1";
dir = 5
name = "dried blood trail"
},
/obj/effect/decal/cleanable/cobweb{
icon_state = "cobweb2"
@@ -1648,17 +1648,17 @@
/area/ruin/space/has_grav/derelictoutpost)
"dA" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/turf/open/floor/plating/asteroid,
/area/ruin/space/has_grav/derelictoutpost)
"dB" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 6;
icon_state = "trails_1";
dir = 6
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1706,9 +1706,9 @@
/area/ruin/space/has_grav/derelictoutpost)
"dF" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 10;
icon_state = "trails_1";
dir = 10
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1719,9 +1719,9 @@
/area/ruin/space/has_grav/derelictoutpost)
"dG" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 8;
icon_state = "trails_1";
dir = 8
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1732,9 +1732,9 @@
/area/ruin/space/has_grav/derelictoutpost)
"dH" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 6;
icon_state = "trails_1";
dir = 6
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1779,9 +1779,9 @@
name = "gelatinous floor"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 5;
icon_state = "trails_1";
dir = 5
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/cargobay)
@@ -1795,9 +1795,9 @@
name = "gelatinous floor"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 9;
icon_state = "trails_1";
dir = 9
name = "dried blood trail"
},
/obj/structure/cable{
icon_state = "1-2"
@@ -1806,9 +1806,9 @@
/area/ruin/space/has_grav/derelictoutpost)
"dN" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 8;
icon_state = "trails_1";
dir = 8
name = "dried blood trail"
},
/turf/open/floor/plating{
icon_state = "wall_thermite";
@@ -1823,9 +1823,9 @@
name = "gelatinous membrane"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 8;
icon_state = "trails_1";
dir = 8
name = "dried blood trail"
},
/turf/open/floor/plating{
icon_state = "wall_thermite";
@@ -1840,9 +1840,9 @@
},
/obj/structure/glowshroom/single,
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 8;
icon_state = "trails_1";
dir = 8
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost)
@@ -1853,9 +1853,9 @@
name = "gelatinous floor"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 6;
icon_state = "trails_1";
dir = 6
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost)
@@ -2021,10 +2021,10 @@
/area/ruin/space/has_grav/derelictoutpost/cargostorage)
"el" = (
/obj/machinery/power/apc{
start_charge = 0;
dir = 4;
name = "Cargo Storage APC";
pixel_x = 24
pixel_x = 24;
start_charge = 0
},
/obj/structure/cable{
icon_state = "0-2"
@@ -2099,35 +2099,35 @@
/area/ruin/space/has_grav/derelictoutpost)
"ew" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 8;
icon_state = "trails_1";
dir = 8
name = "dried blood trail"
},
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/cargostorage)
"ex" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 8;
icon_state = "trails_1";
dir = 8
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/cargostorage)
"ey" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 8;
icon_state = "trails_1";
dir = 8
name = "dried blood trail"
},
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/cargostorage)
"ez" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 5;
icon_state = "trails_1";
dir = 5
name = "dried blood trail"
},
/obj/structure/cable{
icon_state = "1-2"
@@ -2188,9 +2188,9 @@
/area/ruin/space/has_grav/derelictoutpost/cargostorage)
"eI" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 10;
icon_state = "trails_1";
dir = 10
name = "dried blood trail"
},
/obj/structure/cable{
icon_state = "1-4"
@@ -2204,9 +2204,9 @@
name = "pried-open airlock"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/obj/structure/cable{
icon_state = "4-8"
@@ -2215,9 +2215,9 @@
/area/ruin/space/has_grav/derelictoutpost/cargostorage)
"eK" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 6;
icon_state = "trails_1";
dir = 6
name = "dried blood trail"
},
/obj/structure/cable{
icon_state = "1-8"
@@ -287,9 +287,9 @@
/area/space/nearstation)
"M" = (
/obj/structure/fluff/broken_flooring{
name = "broken plating";
dir = 8;
icon_state = "plating";
dir = 8
name = "broken plating"
},
/turf/template_noop,
/area/space/nearstation)
+4 -4
View File
@@ -16,8 +16,8 @@
"ag" = (
/obj/machinery/porta_turret{
dir = 8;
set_obj_flags = "EMAGGED";
installation = /obj/item/gun/energy/lasercannon
installation = /obj/item/gun/energy/lasercannon;
set_obj_flags = "EMAGGED"
},
/turf/open/floor/engine,
/area/awaymission/BMPship/Aft)
@@ -2110,8 +2110,8 @@
"gl" = (
/obj/machinery/porta_turret{
dir = 8;
set_obj_flags = "EMAGGED";
installation = /obj/item/gun/energy/lasercannon
installation = /obj/item/gun/energy/lasercannon;
set_obj_flags = "EMAGGED"
},
/turf/open/floor/engine,
/area/awaymission/BMPship/Fore)
+34 -34
View File
@@ -5,8 +5,8 @@
"ab" = (
/obj/structure/lattice,
/obj/structure/fluff/broken_flooring{
icon_state = "singular";
dir = 1
dir = 1;
icon_state = "singular"
},
/turf/template_noop,
/area/space/nearstation)
@@ -27,8 +27,8 @@
/area/space/nearstation)
"af" = (
/obj/structure/fluff/broken_flooring{
icon_state = "pile";
dir = 8
dir = 8;
icon_state = "pile"
},
/turf/template_noop,
/area/template_noop)
@@ -45,8 +45,8 @@
/area/ruin/unpowered)
"aj" = (
/obj/structure/fluff/broken_flooring{
icon_state = "pile";
dir = 4
dir = 4;
icon_state = "pile"
},
/turf/template_noop,
/area/template_noop)
@@ -58,8 +58,8 @@
/area/ruin/unpowered)
"al" = (
/obj/structure/fluff/broken_flooring{
icon_state = "singular";
dir = 4
dir = 4;
icon_state = "singular"
},
/obj/structure/lattice,
/turf/template_noop,
@@ -133,17 +133,17 @@
/area/ruin/unpowered)
"az" = (
/obj/structure/fluff/broken_flooring{
name = "broken plating";
dir = 8;
icon_state = "plating";
dir = 8
name = "broken plating"
},
/obj/structure/lattice,
/turf/template_noop,
/area/ruin/unpowered)
"aA" = (
/obj/structure/fluff/broken_flooring{
icon_state = "pile";
dir = 1
dir = 1;
icon_state = "pile"
},
/turf/template_noop,
/area/template_noop)
@@ -405,8 +405,8 @@
/area/ruin/unpowered)
"bt" = (
/obj/structure/fluff/broken_flooring{
icon_state = "side";
dir = 1
dir = 1;
icon_state = "side"
},
/obj/structure/lattice,
/turf/template_noop,
@@ -424,34 +424,34 @@
"bw" = (
/obj/structure/lattice,
/obj/structure/fluff/broken_flooring{
name = "broken plating";
dir = 1;
icon_state = "plating";
dir = 1
name = "broken plating"
},
/turf/template_noop,
/area/ruin/unpowered)
"bx" = (
/obj/structure/fluff/broken_flooring{
name = "broken plating";
dir = 4;
icon_state = "plating";
dir = 4
name = "broken plating"
},
/obj/structure/lattice,
/turf/template_noop,
/area/ruin/unpowered)
"by" = (
/obj/structure/fluff/broken_flooring{
icon_state = "pile";
dir = 4
dir = 4;
icon_state = "pile"
},
/turf/open/floor/plasteel/airless,
/area/ruin/unpowered)
"bz" = (
/obj/structure/lattice,
/obj/structure/fluff/broken_flooring{
name = "broken plating";
dir = 4;
icon_state = "plating";
dir = 4
name = "broken plating"
},
/turf/template_noop,
/area/ruin/unpowered)
@@ -464,38 +464,38 @@
"bC" = (
/obj/structure/lattice,
/obj/structure/fluff/broken_flooring{
icon_state = "corner";
dir = 1
dir = 1;
icon_state = "corner"
},
/turf/template_noop,
/area/ruin/unpowered)
"bD" = (
/obj/structure/fluff/broken_flooring{
icon_state = "singular";
dir = 4
dir = 4;
icon_state = "singular"
},
/turf/open/floor/plasteel/airless,
/area/ruin/unpowered)
"bE" = (
/obj/structure/lattice,
/obj/structure/fluff/broken_flooring{
icon_state = "corner";
dir = 8
dir = 8;
icon_state = "corner"
},
/turf/template_noop,
/area/ruin/unpowered)
"bF" = (
/obj/structure/lattice,
/obj/structure/fluff/broken_flooring{
icon_state = "side";
dir = 4
dir = 4;
icon_state = "side"
},
/turf/template_noop,
/area/ruin/unpowered)
"bG" = (
/obj/structure/fluff/broken_flooring{
icon_state = "singular";
dir = 4
dir = 4;
icon_state = "singular"
},
/turf/template_noop,
/area/template_noop)
@@ -510,9 +510,9 @@
"bI" = (
/obj/structure/lattice,
/obj/structure/fluff/broken_flooring{
name = "broken plating";
dir = 8;
icon_state = "plating";
dir = 8
name = "broken plating"
},
/turf/template_noop,
/area/ruin/unpowered)
+2 -2
View File
@@ -149,8 +149,8 @@
/area/ruin/space/has_grav/ancientstation/hivebot)
"aF" = (
/obj/structure/shuttle/engine/large{
icon_state = "large_engine";
dir = 4
dir = 4;
icon_state = "large_engine"
},
/turf/closed/wall,
/area/ruin/space/has_grav/ancientstation/hivebot)
@@ -54,15 +54,15 @@
/area/ruin/powered)
"m" = (
/obj/structure/chair/old{
icon_state = "chairold";
dir = 1
dir = 1;
icon_state = "chairold"
},
/turf/open/floor/oldshuttle,
/area/ruin/powered)
"n" = (
/obj/structure/chair/old{
icon_state = "chairold";
dir = 1
dir = 1;
icon_state = "chairold"
},
/obj/item/crowbar/large{
desc = "It's a big crowbar. It doesn't fit in your pockets, because it's big. It feels oddly heavy..";
@@ -73,8 +73,8 @@
/area/ruin/powered)
"o" = (
/obj/structure/chair/old{
icon_state = "chairold";
dir = 1
dir = 1;
icon_state = "chairold"
},
/mob/living/simple_animal/hostile/retaliate/spaceman,
/turf/open/floor/oldshuttle,
File diff suppressed because it is too large Load Diff
+78 -78
View File
@@ -40,8 +40,8 @@
/area/ruin/space/diner/interior)
"ai" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
icon_state = "hrwindow_spawner_end";
dir = 1
dir = 1;
icon_state = "hrwindow_spawner_end"
},
/turf/open/floor/plating,
/area/ruin/space/diner/interior)
@@ -116,8 +116,8 @@
/area/ruin/space/diner)
"aw" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
icon_state = "hrwindow_spawner_end";
dir = 4
dir = 4;
icon_state = "hrwindow_spawner_end"
},
/turf/open/floor/plating/airless,
/area/ruin/space/diner)
@@ -253,8 +253,8 @@
/area/ruin/space/diner/interior)
"aQ" = (
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 10
dir = 10;
icon_state = "pipe11-2"
},
/turf/open/floor/plating,
/area/ruin/space/diner/interior)
@@ -438,8 +438,8 @@
},
/obj/machinery/grill,
/obj/machinery/light/small/broken{
icon_state = "bulb-broken";
dir = 1
dir = 1;
icon_state = "bulb-broken"
},
/obj/machinery/power/apc/highcap/five_k{
name = "Space Diner APC";
@@ -468,8 +468,8 @@
/area/ruin/space/diner/interior)
"bx" = (
/obj/structure/toilet/secret/low_loot{
icon_state = "toilet00";
dir = 4
dir = 4;
icon_state = "toilet00"
},
/obj/effect/decal/cleanable/cobweb,
/obj/effect/decal/cleanable/dirt,
@@ -509,8 +509,8 @@
/area/ruin/space/diner/interior)
"bB" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
icon_state = "hrwindow_spawner_end";
dir = 8
dir = 8;
icon_state = "hrwindow_spawner_end"
},
/obj/structure/cable{
icon_state = "0-4"
@@ -529,8 +529,8 @@
/area/ruin/space/diner/interior)
"bD" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
icon_state = "hrwindow_spawner_end";
dir = 4
dir = 4;
icon_state = "hrwindow_spawner_end"
},
/obj/structure/cable{
icon_state = "0-8"
@@ -568,8 +568,8 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 4
dir = 4;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel,
/area/ruin/space/diner/interior)
@@ -579,8 +579,8 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 4
dir = 4;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel,
/area/ruin/space/diner/interior)
@@ -594,8 +594,8 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 4
dir = 4;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel,
/area/ruin/space/diner/interior)
@@ -616,8 +616,8 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 10
dir = 10;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel,
/area/ruin/space/diner/interior)
@@ -662,8 +662,8 @@
/area/ruin/space/diner/interior)
"bP" = (
/obj/structure/toilet/secret/low_loot{
icon_state = "toilet00";
dir = 4
dir = 4;
icon_state = "toilet00"
},
/obj/structure/window/reinforced/spawner/north,
/obj/effect/decal/cleanable/dirt,
@@ -673,8 +673,8 @@
"bQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 6
dir = 6;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel,
/area/ruin/space/diner/interior)
@@ -727,8 +727,8 @@
/area/ruin/space/diner/interior)
"bX" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
icon_state = "hrwindow_spawner_end";
dir = 1
dir = 1;
icon_state = "hrwindow_spawner_end"
},
/obj/structure/cable{
icon_state = "0-2"
@@ -756,24 +756,24 @@
"ca" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/manifold/general/hidden{
icon_state = "manifold-2";
dir = 8
dir = 8;
icon_state = "manifold-2"
},
/turf/open/floor/plasteel,
/area/ruin/space/diner/interior)
"cb" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 4
dir = 4;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel,
/area/ruin/space/diner/interior)
"cc" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 10
dir = 10;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel,
/area/ruin/space/diner/interior)
@@ -962,8 +962,8 @@
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 4
dir = 4;
icon_state = "pipe11-2"
},
/obj/item/beacon,
/turf/open/floor/plasteel/dark,
@@ -973,8 +973,8 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 4
dir = 4;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel/dark,
/area/ruin/space/diner/interior)
@@ -993,8 +993,8 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 4
dir = 4;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel/dark,
/area/ruin/space/diner/interior)
@@ -1105,8 +1105,8 @@
/area/ruin/space/diner/interior)
"cM" = (
/obj/machinery/light/broken{
icon_state = "tube-broken";
dir = 1
dir = 1;
icon_state = "tube-broken"
},
/obj/effect/decal/cleanable/dirt{
desc = "A thin layer of dust coating the floor.";
@@ -1146,8 +1146,8 @@
},
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/machinery/computer/arcade{
icon_state = "arcade";
dir = 8
dir = 8;
icon_state = "arcade"
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
@@ -1161,8 +1161,8 @@
/area/ruin/space/diner/interior)
"cS" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
icon_state = "hrwindow_spawner_end";
dir = 1
dir = 1;
icon_state = "hrwindow_spawner_end"
},
/obj/structure/cable,
/obj/structure/cable{
@@ -1242,8 +1242,8 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 5
dir = 5;
icon_state = "pipe11-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
@@ -1257,8 +1257,8 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 4
dir = 4;
icon_state = "pipe11-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
@@ -1287,8 +1287,8 @@
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 4
dir = 4;
icon_state = "pipe11-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
@@ -1311,8 +1311,8 @@
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 9
dir = 9;
icon_state = "pipe11-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
@@ -1351,8 +1351,8 @@
icon_state = "1-2"
},
/obj/machinery/computer/teleporter{
icon_state = "computer";
dir = 1
dir = 1;
icon_state = "computer"
},
/obj/structure/cable,
/turf/open/floor/plasteel/dark,
@@ -1414,8 +1414,8 @@
"ds" = (
/obj/structure/cable,
/obj/machinery/power/solar_control{
icon_state = "computer";
dir = 4
dir = 4;
icon_state = "computer"
},
/turf/open/floor/plating,
/area/ruin/space/diner/interior)
@@ -1427,8 +1427,8 @@
/area/ruin/space/diner/interior)
"dv" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
icon_state = "hrwindow_spawner_end";
dir = 4
dir = 4;
icon_state = "hrwindow_spawner_end"
},
/obj/structure/cable,
/obj/structure/cable{
@@ -1449,8 +1449,8 @@
dir = 1
},
/obj/machinery/light/broken{
icon_state = "tube-broken";
dir = 8
dir = 8;
icon_state = "tube-broken"
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
@@ -1492,8 +1492,8 @@
name = "dust"
},
/obj/item/chair{
icon_state = "chair_toppled";
dir = 1
dir = 1;
icon_state = "chair_toppled"
},
/turf/open/floor/carpet,
/area/ruin/space/diner/interior)
@@ -1508,8 +1508,8 @@
/area/ruin/space/diner/interior)
"dE" = (
/obj/machinery/light/small/broken{
icon_state = "bulb-broken";
dir = 1
dir = 1;
icon_state = "bulb-broken"
},
/turf/open/floor/engine/airless,
/area/ruin/space/diner)
@@ -1663,8 +1663,8 @@
/area/ruin/space/diner/interior)
"dV" = (
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
icon_state = "hrwindow_spawner_directional";
dir = 10
dir = 10;
icon_state = "hrwindow_spawner_directional"
},
/turf/open/floor/plating,
/area/ruin/space/diner/interior)
@@ -1674,22 +1674,22 @@
/area/ruin/space/diner/interior)
"dX" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
icon_state = "hrwindow_spawner_end";
dir = 4
dir = 4;
icon_state = "hrwindow_spawner_end"
},
/turf/open/floor/plating,
/area/ruin/space/diner/interior)
"dY" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
icon_state = "hrwindow_spawner_end";
dir = 8
dir = 8;
icon_state = "hrwindow_spawner_end"
},
/turf/open/floor/plating,
/area/ruin/space/diner/interior)
"dZ" = (
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
icon_state = "hrwindow_spawner_directional";
dir = 6
dir = 6;
icon_state = "hrwindow_spawner_directional"
},
/turf/open/floor/plating,
/area/ruin/space/diner/interior)
@@ -1728,8 +1728,8 @@
/area/ruin/space/diner)
"ef" = (
/obj/machinery/light/small/broken{
icon_state = "bulb-broken";
dir = 1
dir = 1;
icon_state = "bulb-broken"
},
/obj/machinery/vending/snack,
/obj/effect/turf_decal/bot,
@@ -1737,8 +1737,8 @@
/area/ruin/space/diner)
"eg" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
icon_state = "hrwindow_spawner_end";
dir = 1
dir = 1;
icon_state = "hrwindow_spawner_end"
},
/turf/open/floor/plating/airless,
/area/ruin/space/diner)
+32 -32
View File
@@ -125,8 +125,8 @@
/area/ruin/space/has_grav/hotel/guestroom/room_3)
"ay" = (
/obj/structure/window{
icon_state = "window";
dir = 8
dir = 8;
icon_state = "window"
},
/obj/structure/toilet,
/turf/open/floor/plasteel/showroomfloor,
@@ -166,8 +166,8 @@
/area/ruin/space/has_grav/hotel/guestroom/room_4)
"aG" = (
/obj/structure/window{
icon_state = "window";
dir = 8
dir = 8;
icon_state = "window"
},
/obj/structure/toilet,
/turf/open/floor/plasteel/showroomfloor,
@@ -207,8 +207,8 @@
/area/ruin/space/has_grav/hotel/guestroom/room_5)
"aO" = (
/obj/structure/window{
icon_state = "window";
dir = 8
dir = 8;
icon_state = "window"
},
/obj/structure/toilet,
/turf/open/floor/plasteel/showroomfloor,
@@ -248,8 +248,8 @@
/area/ruin/space/has_grav/hotel/guestroom/room_6)
"aW" = (
/obj/structure/window{
icon_state = "window";
dir = 8
dir = 8;
icon_state = "window"
},
/obj/structure/toilet,
/turf/open/floor/plasteel/showroomfloor,
@@ -287,8 +287,8 @@
/area/ruin/unpowered/no_grav)
"be" = (
/obj/structure/window{
icon_state = "window";
dir = 8
dir = 8;
icon_state = "window"
},
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/hotel/guestroom/room_3)
@@ -319,8 +319,8 @@
/area/ruin/space/has_grav/hotel/guestroom/room_3)
"bk" = (
/obj/structure/window{
icon_state = "window";
dir = 8
dir = 8;
icon_state = "window"
},
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/hotel/guestroom/room_4)
@@ -351,8 +351,8 @@
/area/ruin/space/has_grav/hotel/guestroom/room_4)
"bq" = (
/obj/structure/window{
icon_state = "window";
dir = 8
dir = 8;
icon_state = "window"
},
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/hotel/guestroom/room_5)
@@ -383,8 +383,8 @@
/area/ruin/space/has_grav/hotel/guestroom/room_5)
"bw" = (
/obj/structure/window{
icon_state = "window";
dir = 8
dir = 8;
icon_state = "window"
},
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/hotel/guestroom/room_6)
@@ -1067,8 +1067,8 @@
/area/ruin/space/has_grav/hotel/guestroom/room_2)
"dl" = (
/obj/structure/window{
icon_state = "window";
dir = 8
dir = 8;
icon_state = "window"
},
/obj/structure/toilet,
/turf/open/floor/plasteel/showroomfloor,
@@ -1131,8 +1131,8 @@
/area/ruin/space/has_grav/hotel/guestroom/room_1)
"dt" = (
/obj/structure/window{
icon_state = "window";
dir = 8
dir = 8;
icon_state = "window"
},
/obj/structure/toilet,
/turf/open/floor/plasteel/showroomfloor,
@@ -1230,8 +1230,8 @@
/area/ruin/space/has_grav/hotel/guestroom/room_2)
"dI" = (
/obj/structure/window{
icon_state = "window";
dir = 8
dir = 8;
icon_state = "window"
},
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/hotel/guestroom/room_2)
@@ -1262,8 +1262,8 @@
/area/ruin/space/has_grav/hotel/guestroom/room_1)
"dP" = (
/obj/structure/window{
icon_state = "window";
dir = 8
dir = 8;
icon_state = "window"
},
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/hotel/guestroom/room_1)
@@ -2564,16 +2564,16 @@
/area/ruin/space/has_grav/hotel/workroom)
"hG" = (
/obj/effect/mob_spawn/human/hotel_staff{
icon_state = "sleeper_s";
dir = 1
dir = 1;
icon_state = "sleeper_s"
},
/obj/machinery/light,
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/hotel/workroom)
"hH" = (
/obj/effect/mob_spawn/human/hotel_staff{
icon_state = "sleeper_s";
dir = 1
dir = 1;
icon_state = "sleeper_s"
},
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/hotel/workroom)
@@ -4283,8 +4283,8 @@
/area/ruin/space/has_grav/hotel/security)
"lG" = (
/obj/structure/window{
icon_state = "window";
dir = 1
dir = 1;
icon_state = "window"
},
/obj/machinery/light{
dir = 8
@@ -4307,8 +4307,8 @@
/obj/item/clothing/shoes/sandal,
/obj/item/clothing/shoes/sandal,
/obj/structure/window{
icon_state = "window";
dir = 1
dir = 1;
icon_state = "window"
},
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/hotel/pool)
@@ -9,9 +9,9 @@
dwidth = 11;
height = 22;
id = "whiteship_away";
json_key = "whiteship";
name = "Deep Space";
width = 35;
json_key = "whiteship"
width = 35
},
/turf/open/space,
/area/space)
@@ -336,16 +336,6 @@
"yf" = (
/turf/open/space/basic,
/area/space/nearstation)
"zw" = (
/obj/structure/closet/crate,
/obj/item/stack/sheet/mineral/plasma{
amount = 50
},
/obj/item/stack/sheet/mineral/plasma{
amount = 10
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"zS" = (
/turf/open/space/basic,
/area/space)
@@ -715,12 +705,6 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"WB" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"Ys" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
@@ -1164,15 +1148,15 @@ zS
MP
dw
lG
WB
eP
Jq
WB
eP
UD
Cx
UD
WB
eP
Jq
WB
eP
UD
MP
tw
@@ -1276,15 +1260,15 @@ zS
MP
Cb
AC
WB
eP
mW
WB
eP
Kl
Cx
Kl
WB
eP
mW
WB
eP
Kl
MP
tw
@@ -1505,11 +1489,11 @@ Ok
CH
GI
Ok
zw
zw
zw
zw
zw
gF
gF
gF
gF
gF
MP
tw
yf
@@ -111,26 +111,14 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
"uC" = (
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
/area/space/nearstation)
"wt" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/closet/radiation,
/turf/open/floor/plasteel,
/area/engine/engineering)
"wS" = (
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
/area/space/nearstation)
"yf" = (
/turf/open/space/basic,
/area/space/nearstation)
"yA" = (
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
/area/space/nearstation)
"zS" = (
/turf/open/space/basic,
/area/space)
@@ -224,10 +212,6 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"Le" = (
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
/area/space/nearstation)
"LS" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/turf/open/floor/plating/airless,
@@ -397,17 +381,17 @@ ZT
ZT
ZT
ZT
Le
hK
tw
Le
Le
hK
hK
tw
Le
Le
hK
hK
tw
Le
Le
Le
hK
hK
hK
YZ
Oj
YZ
@@ -453,17 +437,17 @@ ZT
ZT
ZT
ZT
Le
hK
tw
Le
Le
hK
hK
tw
Le
Le
hK
hK
tw
Le
Le
Le
hK
hK
hK
YZ
Oj
YZ
@@ -509,17 +493,17 @@ Ke
EL
Tk
MP
Le
hK
tw
Le
Le
hK
hK
tw
Le
Le
hK
hK
tw
Le
Le
Le
hK
hK
hK
YZ
Oj
YZ
+32 -32
View File
@@ -2411,8 +2411,8 @@
/area/awaymission/snowdin/post/dorm)
"fw" = (
/obj/machinery/sleeper{
icon_state = "sleeper";
dir = 4
dir = 4;
icon_state = "sleeper"
},
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -6704,9 +6704,9 @@
"oo" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4;
piping_layer = 3;
pixel_x = 5;
pixel_y = 5;
piping_layer = 3
pixel_y = 5
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
@@ -6714,9 +6714,9 @@
"op" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4;
piping_layer = 3;
pixel_x = 5;
pixel_y = 5;
piping_layer = 3
pixel_y = 5
},
/turf/open/floor/plasteel,
/area/awaymission/snowdin/post/engineering)
@@ -9707,10 +9707,10 @@
/area/awaymission/snowdin/post/broken_shuttle)
"wc" = (
/obj/machinery/computer{
name = "Shuttle Transist Console";
desc = "A console meant for calling and sending a transit ferry. It seems iced-over and non-functional.";
dir = 1;
icon_screen = null
icon_screen = null;
name = "Shuttle Transist Console"
},
/turf/open/floor/mineral/titanium/blue,
/area/awaymission/snowdin/post/broken_shuttle)
@@ -9799,9 +9799,9 @@
"wm" = (
/obj/machinery/porta_turret/centcom_shuttle/weak{
desc = "A turret built with substandard parts and run down further with age.";
icon_state = "syndie_off";
dir = 9;
faction = list("pirate")
faction = list("pirate");
icon_state = "syndie_off"
},
/turf/open/floor/plating/snowed/smoothed,
/area/awaymission/snowdin/cave)
@@ -9926,8 +9926,8 @@
/area/awaymission/snowdin/outside)
"wC" = (
/obj/vehicle/ridden/atv{
icon_state = "atv";
dir = 4
dir = 4;
icon_state = "atv"
},
/obj/effect/light_emitter{
name = "outdoor light";
@@ -10650,10 +10650,10 @@
/area/awaymission/snowdin/cave)
"yu" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
name = "toxin out";
dir = 8;
frequency = 1442;
id_tag = "snowdin_toxins_mine_1";
frequency = 1442
name = "toxin out"
},
/turf/open/floor/engine/vacuum,
/area/awaymission/snowdin/cave)
@@ -11025,8 +11025,8 @@
/area/awaymission/snowdin/post/minipost)
"zq" = (
/obj/vehicle/ridden/atv{
icon_state = "atv";
dir = 8
dir = 8;
icon_state = "atv"
},
/turf/open/floor/plating,
/area/awaymission/snowdin/post/minipost)
@@ -11939,8 +11939,8 @@
/area/awaymission/snowdin/cave)
"BO" = (
/obj/effect/turf_decal/stripes/end{
icon_state = "warn_end";
dir = 1
dir = 1;
icon_state = "warn_end"
},
/turf/open/floor/plating/snowed/cavern,
/area/awaymission/snowdin/cave/cavern)
@@ -11953,8 +11953,8 @@
/area/awaymission/snowdin/cave/cavern)
"BQ" = (
/obj/effect/turf_decal/stripes/end{
icon_state = "warn_end";
dir = 8
dir = 8;
icon_state = "warn_end"
},
/turf/open/floor/plating/snowed/cavern,
/area/awaymission/snowdin/cave/cavern)
@@ -12268,8 +12268,8 @@
/area/awaymission/snowdin/cave)
"CP" = (
/obj/structure/shuttle/engine/heater{
icon_state = "heater";
dir = 4
dir = 4;
icon_state = "heater"
},
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -12803,8 +12803,8 @@
/area/awaymission/snowdin/cave)
"DU" = (
/obj/structure/shuttle/engine/heater{
icon_state = "heater";
dir = 4
dir = 4;
icon_state = "heater"
},
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -13244,8 +13244,8 @@
/area/awaymission/snowdin/cave)
"EN" = (
/obj/machinery/sleeper/syndie{
icon_state = "sleeper_s";
dir = 1
dir = 1;
icon_state = "sleeper_s"
},
/obj/effect/turf_decal/bot_white,
/turf/open/floor/plasteel/dark,
@@ -13257,8 +13257,8 @@
"EP" = (
/obj/effect/turf_decal/bot_white,
/obj/machinery/sleeper/syndie{
icon_state = "sleeper_s";
dir = 1
dir = 1;
icon_state = "sleeper_s"
},
/turf/open/floor/plasteel/dark,
/area/awaymission/snowdin/cave)
@@ -14452,8 +14452,8 @@
/area/awaymission/snowdin/post/mining_main/mechbay)
"In" = (
/obj/mecha/working/ripley/mining{
icon_state = "ripley";
dir = 1
dir = 1;
icon_state = "ripley"
},
/obj/effect/turf_decal/bot,
/turf/open/floor/mech_bay_recharge_floor,
@@ -14513,8 +14513,8 @@
/area/awaymission/snowdin/post/mining_main)
"Ix" = (
/obj/vehicle/ridden/atv{
icon_state = "atv";
dir = 1
dir = 1;
icon_state = "atv"
},
/obj/effect/decal/cleanable/oil,
/turf/open/floor/plating,
+6 -6
View File
@@ -468,8 +468,8 @@
/area/awaymission/centcomAway/hangar)
"cO" = (
/obj/machinery/sleep_console{
icon_state = "console";
dir = 8
dir = 8;
icon_state = "console"
},
/turf/open/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
@@ -746,8 +746,8 @@
/area/awaymission/centcomAway/general)
"eI" = (
/obj/machinery/sleep_console{
icon_state = "console";
dir = 8
dir = 8;
icon_state = "console"
},
/turf/open/indestructible,
/area/awaymission/centcomAway/general)
@@ -1787,8 +1787,8 @@
/area/awaymission/centcomAway/general)
"kD" = (
/obj/machinery/door/window/northright{
icon_state = "right";
dir = 2
dir = 2;
icon_state = "right"
},
/turf/open/indestructible,
/area/awaymission/centcomAway/general)
+24 -24
View File
@@ -3129,8 +3129,8 @@
/obj/structure/table,
/obj/item/gun/ballistic/revolver/russian/soul,
/turf/open/floor/plasteel/airless{
icon_state = "whitered";
dir = 4
dir = 4;
icon_state = "whitered"
},
/area/awaymission/academy/academyaft)
"iY" = (
@@ -3197,8 +3197,8 @@
icon_state = "4-8"
},
/turf/open/floor/plasteel/airless{
icon_state = "whitered";
dir = 4
dir = 4;
icon_state = "whitered"
},
/area/awaymission/academy/academyaft)
"jh" = (
@@ -3258,8 +3258,8 @@
name = "The preserved brain of Harry Houdini"
},
/turf/open/floor/plasteel/airless{
icon_state = "whitered";
dir = 4
dir = 4;
icon_state = "whitered"
},
/area/awaymission/academy/academyaft)
"jp" = (
@@ -3365,8 +3365,8 @@
/obj/structure/window/reinforced,
/obj/item/batterer,
/turf/open/floor/plasteel/airless{
icon_state = "whitered";
dir = 4
dir = 4;
icon_state = "whitered"
},
/area/awaymission/academy/academyaft)
"jB" = (
@@ -3616,8 +3616,8 @@
/area/awaymission/academy/academygate)
"kw" = (
/turf/closed/indestructible/fakeglass{
icon_state = "fakewindows";
dir = 8
dir = 8;
icon_state = "fakewindows"
},
/area/awaymission/academy/headmaster)
"kx" = (
@@ -3671,8 +3671,8 @@
/area/awaymission/academy/academyaft)
"kF" = (
/turf/closed/indestructible/fakeglass{
icon_state = "fakewindows2";
dir = 8
dir = 8;
icon_state = "fakewindows2"
},
/area/awaymission/academy/headmaster)
"kG" = (
@@ -4270,8 +4270,8 @@
/area/awaymission/academy/academycellar)
"mW" = (
/turf/closed/indestructible/fakeglass{
icon_state = "fakewindows";
dir = 4
dir = 4;
icon_state = "fakewindows"
},
/area/awaymission/academy/headmaster)
"mX" = (
@@ -4284,14 +4284,14 @@
/area/space/nearstation)
"mZ" = (
/turf/closed/indestructible/fakeglass{
icon_state = "fakewindows";
dir = 1
dir = 1;
icon_state = "fakewindows"
},
/area/awaymission/academy/headmaster)
"na" = (
/turf/closed/indestructible/fakeglass{
icon_state = "fakewindows2";
dir = 1
dir = 1;
icon_state = "fakewindows2"
},
/area/awaymission/academy/headmaster)
"nb" = (
@@ -4310,20 +4310,20 @@
/area/awaymission/academy/headmaster)
"nd" = (
/turf/closed/indestructible/fakeglass{
icon_state = "fakewindows";
dir = 1
dir = 1;
icon_state = "fakewindows"
},
/area/awaymission/academy/academyengine)
"ne" = (
/turf/closed/indestructible/fakeglass{
icon_state = "fakewindows2";
dir = 1
dir = 1;
icon_state = "fakewindows2"
},
/area/awaymission/academy/academyengine)
"nf" = (
/turf/closed/indestructible/fakeglass{
icon_state = "fakewindows2";
dir = 6
dir = 6;
icon_state = "fakewindows2"
},
/area/awaymission/academy/headmaster)
"ng" = (
+16 -16
View File
@@ -11,8 +11,8 @@
"ad" = (
/turf/open/lava/smooth{
desc = "Looks hot.";
luminosity = 5;
initial_gas_mix = "n2=23;o2=14"
initial_gas_mix = "n2=23;o2=14";
luminosity = 5
},
/area/awaymission/caves/BMP_asteroid/level_four)
"ae" = (
@@ -35,8 +35,8 @@
"ah" = (
/turf/open/lava/smooth{
desc = "Looks hot.";
luminosity = 5;
initial_gas_mix = "n2=23;o2=14"
initial_gas_mix = "n2=23;o2=14";
luminosity = 5
},
/area/awaymission/caves/BMP_asteroid/level_three)
"ai" = (
@@ -305,8 +305,8 @@
/obj/effect/forcefield/cult,
/turf/open/lava/smooth{
desc = "Looks hot.";
luminosity = 5;
initial_gas_mix = "n2=23;o2=14"
initial_gas_mix = "n2=23;o2=14";
luminosity = 5
},
/area/awaymission/caves/BMP_asteroid/level_four)
"aW" = (
@@ -540,8 +540,8 @@
"bM" = (
/turf/open/lava/smooth{
desc = "Looks hot.";
luminosity = 5;
initial_gas_mix = "n2=23;o2=14"
initial_gas_mix = "n2=23;o2=14";
luminosity = 5
},
/area/awaymission/caves/BMP_asteroid)
"bN" = (
@@ -550,8 +550,8 @@
"bO" = (
/turf/open/lava/smooth{
desc = "Looks hot.";
luminosity = 5;
initial_gas_mix = "n2=23;o2=14"
initial_gas_mix = "n2=23;o2=14";
luminosity = 5
},
/area/awaymission/caves/BMP_asteroid/level_two)
"bP" = (
@@ -1818,8 +1818,8 @@
/area/awaymission/caves/BMP_asteroid)
"fQ" = (
/turf/open/floor/plasteel/elevatorshaft{
name = "elevator flooring";
initial_gas_mix = "n2=23;o2=14"
initial_gas_mix = "n2=23;o2=14";
name = "elevator flooring"
},
/area/awaymission/caves/BMP_asteroid)
"fR" = (
@@ -1843,8 +1843,8 @@
"fU" = (
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/elevatorshaft{
name = "elevator flooring";
initial_gas_mix = "n2=23;o2=14"
initial_gas_mix = "n2=23;o2=14";
name = "elevator flooring"
},
/area/awaymission/caves/BMP_asteroid)
"fW" = (
@@ -2169,8 +2169,8 @@
/obj/effect/baseturf_helper/lava,
/turf/open/lava/smooth{
desc = "Looks hot.";
luminosity = 5;
initial_gas_mix = "n2=23;o2=14"
initial_gas_mix = "n2=23;o2=14";
luminosity = 5
},
/area/awaymission/caves/BMP_asteroid/level_four)
"gZ" = (
@@ -208,8 +208,8 @@
"aX" = (
/obj/machinery/porta_turret{
dir = 8;
set_obj_flags = "EMAGGED";
installation = /obj/item/gun/energy/lasercannon
installation = /obj/item/gun/energy/lasercannon;
set_obj_flags = "EMAGGED"
},
/turf/open/floor/plating/airless,
/area/awaymission/challenge/main)
@@ -354,8 +354,8 @@
"bq" = (
/obj/machinery/porta_turret{
dir = 8;
set_obj_flags = "EMAGGED";
installation = /obj/item/gun/energy/lasercannon
installation = /obj/item/gun/energy/lasercannon;
set_obj_flags = "EMAGGED"
},
/turf/open/floor/plating,
/area/awaymission/challenge/main)
File diff suppressed because it is too large Load Diff
+14 -14
View File
@@ -3162,10 +3162,10 @@
/obj/effect/mob_spawn/human/doctor{
brute_damage = 145;
id_job = "Geneticist";
name = "Geneticist";
oxy_damage = 55;
suit = /obj/item/clothing/suit/toggle/labcoat/genetics;
uniform = /obj/item/clothing/under/rank/medical/geneticist;
name = "Geneticist"
uniform = /obj/item/clothing/under/rank/medical/geneticist
},
/obj/effect/decal/cleanable/blood,
/obj/effect/turf_decal/tile/purple{
@@ -4276,10 +4276,10 @@
/obj/effect/mob_spawn/human/doctor{
brute_damage = 145;
id_job = "Geneticist";
name = "Geneticist";
oxy_damage = 55;
suit = /obj/item/clothing/suit/toggle/labcoat/genetics;
uniform = /obj/item/clothing/under/rank/medical/geneticist;
name = "Geneticist"
uniform = /obj/item/clothing/under/rank/medical/geneticist
},
/obj/effect/decal/cleanable/blood,
/obj/effect/turf_decal/tile/purple{
@@ -4724,11 +4724,11 @@
"jp" = (
/obj/structure/barricade/wooden{
desc = "A wooden table hastily flipped over for cover.";
obj_integrity = 55;
icon = 'icons/obj/smooth_structures/wood_table.dmi';
icon_state = "wood_table";
max_integrity = 55;
name = "flipped table"
name = "flipped table";
obj_integrity = 55
},
/turf/open/floor/plasteel/yellowsiding{
dir = 1
@@ -4874,11 +4874,11 @@
"jG" = (
/obj/structure/barricade/wooden{
desc = "A wooden table hastily flipped over for cover.";
obj_integrity = 55;
icon = 'icons/obj/smooth_structures/wood_table.dmi';
icon_state = "wood_table";
max_integrity = 55;
name = "flipped table"
name = "flipped table";
obj_integrity = 55
},
/turf/open/floor/plasteel,
/area/awaymission/research/interior/dorm)
@@ -5051,11 +5051,11 @@
"kb" = (
/obj/structure/barricade/wooden{
desc = "A wooden table hastily flipped over for cover.";
obj_integrity = 55;
icon = 'icons/obj/smooth_structures/wood_table.dmi';
icon_state = "wood_table";
max_integrity = 55;
name = "flipped table"
name = "flipped table";
obj_integrity = 55
},
/turf/open/floor/plasteel/yellowsiding,
/area/awaymission/research/interior/dorm)
@@ -5126,10 +5126,10 @@
/obj/effect/mob_spawn/human/doctor{
brute_damage = 145;
id_job = "Geneticist";
name = "Geneticist";
oxy_damage = 55;
suit = /obj/item/clothing/suit/toggle/labcoat/genetics;
uniform = /obj/item/clothing/under/rank/medical/geneticist;
name = "Geneticist"
uniform = /obj/item/clothing/under/rank/medical/geneticist
},
/obj/effect/decal/cleanable/blood,
/obj/effect/turf_decal/tile/blue{
@@ -6000,10 +6000,10 @@
/obj/effect/mob_spawn/human/doctor{
brute_damage = 145;
id_job = "Geneticist";
name = "Geneticist";
oxy_damage = 55;
suit = /obj/item/clothing/suit/toggle/labcoat/genetics;
uniform = /obj/item/clothing/under/rank/medical/geneticist;
name = "Geneticist"
uniform = /obj/item/clothing/under/rank/medical/geneticist
},
/turf/open/floor/mineral/titanium/blue,
/area/awaymission/research/exterior)
+8 -8
View File
@@ -6699,9 +6699,9 @@
"oo" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4;
piping_layer = 3;
pixel_x = 5;
pixel_y = 5;
piping_layer = 3
pixel_y = 5
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
@@ -6709,9 +6709,9 @@
"op" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4;
piping_layer = 3;
pixel_x = 5;
pixel_y = 5;
piping_layer = 3
pixel_y = 5
},
/turf/open/floor/plasteel,
/area/awaymission/snowdin/post/engineering)
@@ -9713,10 +9713,10 @@
/area/awaymission/snowdin/post/broken_shuttle)
"wc" = (
/obj/machinery/computer{
name = "Shuttle Transist Console";
desc = "A console meant for calling and sending a transit ferry. It seems iced-over and non-functional.";
dir = 1;
icon_screen = null
icon_screen = null;
name = "Shuttle Transist Console"
},
/turf/open/floor/mineral/titanium/blue,
/area/awaymission/snowdin/post/broken_shuttle)
@@ -10657,10 +10657,10 @@
/area/awaymission/snowdin/cave)
"yu" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
name = "toxin out";
dir = 8;
frequency = 1442;
id_tag = "snowdin_toxins_mine_1";
frequency = 1442
name = "toxin out"
},
/turf/open/floor/engine/vacuum,
/area/awaymission/snowdin/cave)
@@ -813,16 +813,16 @@
"bW" = (
/obj/structure/glowshroom/single,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 351.9
},
/area/awaymission/undergroundoutpost45/caves)
"bX" = (
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 351.9
},
@@ -2261,8 +2261,8 @@
/area/awaymission/undergroundoutpost45/central)
"eJ" = (
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -2632,8 +2632,8 @@
dir = 8
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -2868,8 +2868,8 @@
dir = 1
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -3047,8 +3047,8 @@
"gf" = (
/obj/structure/glowshroom/single,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -3195,8 +3195,8 @@
"gB" = (
/obj/machinery/light/small,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -3409,8 +3409,8 @@
dir = 8
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -3420,8 +3420,8 @@
dir = 4
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -3452,8 +3452,8 @@
dir = 8
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -4787,8 +4787,8 @@
"jL" = (
/obj/machinery/light/small,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -4821,8 +4821,8 @@
"jP" = (
/obj/machinery/light/small,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -6604,8 +6604,8 @@
dir = 1
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -8354,8 +8354,8 @@
dir = 6
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -8365,8 +8365,8 @@
dir = 4
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -8377,8 +8377,8 @@
dir = 4
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -8470,8 +8470,8 @@
name = "air out"
},
/turf/open/floor/engine{
name = "air floor";
initial_gas_mix = "n2=10580;o2=2644"
initial_gas_mix = "n2=10580;o2=2644";
name = "air floor"
},
/area/awaymission/undergroundoutpost45/engineering)
"pF" = (
@@ -8668,8 +8668,8 @@
"qa" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -8743,8 +8743,8 @@
dir = 10
},
/turf/open/floor/plasteel/dark{
name = "Server Walkway";
initial_gas_mix = "n2=500,TEMP=80"
initial_gas_mix = "n2=500,TEMP=80";
name = "Server Walkway"
},
/area/awaymission/undergroundoutpost45/research)
"qj" = (
@@ -8900,8 +8900,8 @@
dir = 4
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -8911,8 +8911,8 @@
dir = 1
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -8922,8 +8922,8 @@
dir = 9
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -9126,8 +9126,8 @@
dir = 8
},
/turf/open/floor/plasteel/dark{
name = "Server Walkway";
initial_gas_mix = "n2=500,TEMP=80"
initial_gas_mix = "n2=500,TEMP=80";
name = "Server Walkway"
},
/area/awaymission/undergroundoutpost45/research)
"qR" = (
@@ -9545,8 +9545,8 @@
dir = 9
},
/turf/open/floor/plasteel/dark{
name = "Server Walkway";
initial_gas_mix = "n2=500,TEMP=80"
initial_gas_mix = "n2=500,TEMP=80";
name = "Server Walkway"
},
/area/awaymission/undergroundoutpost45/research)
"rA" = (
@@ -11104,8 +11104,8 @@
dir = 1
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -11750,8 +11750,8 @@
dir = 4
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -11976,8 +11976,8 @@
dir = 1
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -12262,8 +12262,8 @@
dir = 8
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13481,8 +13481,8 @@
dir = 1
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13490,8 +13490,8 @@
"yh" = (
/obj/structure/ore_box,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13499,8 +13499,8 @@
"yi" = (
/obj/structure/closet/crate,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13510,8 +13510,8 @@
/obj/structure/bed/nest,
/obj/effect/mob_spawn/human,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13520,8 +13520,8 @@
/obj/structure/alien/weeds,
/obj/structure/bed/nest,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13531,8 +13531,8 @@
/obj/structure/glowshroom/single,
/obj/effect/decal/cleanable/blood/gibs/down,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13541,8 +13541,8 @@
/obj/structure/alien/weeds,
/obj/effect/decal/cleanable/blood/gibs/core,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13550,8 +13550,8 @@
"yn" = (
/obj/structure/alien/weeds,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13560,8 +13560,8 @@
/obj/structure/alien/weeds,
/obj/structure/alien/resin/wall,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13570,8 +13570,8 @@
/obj/structure/alien/weeds,
/obj/effect/mob_spawn/human,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13579,8 +13579,8 @@
"yq" = (
/obj/effect/decal/cleanable/blood/splatter,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13588,8 +13588,8 @@
"yr" = (
/obj/effect/decal/cleanable/blood/gibs/up,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13598,8 +13598,8 @@
/obj/structure/alien/weeds,
/obj/structure/glowshroom/single,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13608,8 +13608,8 @@
/obj/structure/alien/resin/wall,
/obj/structure/alien/weeds,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13618,8 +13618,8 @@
/obj/structure/alien/weeds,
/obj/effect/decal/cleanable/blood/splatter,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13627,8 +13627,8 @@
"yz" = (
/obj/structure/alien/resin/membrane,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13637,8 +13637,8 @@
/obj/structure/alien/weeds,
/obj/effect/decal/cleanable/blood/gibs/down,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13646,8 +13646,8 @@
"yB" = (
/obj/effect/decal/cleanable/blood/gibs/limb,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13656,8 +13656,8 @@
/obj/effect/decal/cleanable/blood/splatter,
/obj/effect/mob_spawn/human,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13667,8 +13667,8 @@
/obj/effect/decal/cleanable/blood/splatter,
/obj/effect/mob_spawn/human,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13678,8 +13678,8 @@
/obj/effect/decal/cleanable/blood/gibs/down,
/obj/effect/mob_spawn/human,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
File diff suppressed because it is too large Load Diff
+20 -18
View File
@@ -1000,7 +1000,7 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/hos)
"act" = (
/obj/machinery/holopad,
/obj/machinery/holopad/secure,
/turf/open/floor/carpet,
/area/crew_quarters/heads/hos)
"acu" = (
@@ -3551,7 +3551,7 @@
/turf/open/floor/plasteel,
/area/security/brig)
"agU" = (
/obj/machinery/holopad,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"agV" = (
@@ -19903,7 +19903,6 @@
/turf/open/floor/plasteel,
/area/bridge)
"aVk" = (
/obj/machinery/holopad,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -19913,6 +19912,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/holopad,
/turf/open/floor/plasteel,
/area/bridge)
"aVl" = (
@@ -22726,10 +22726,10 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai_upload)
"bcf" = (
/obj/machinery/holopad,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai_upload)
"bcg" = (
@@ -23322,10 +23322,10 @@
/turf/open/floor/mineral/titanium/blue,
/area/crew_quarters/toilet/locker)
"bdK" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/holopad/secure,
/turf/open/floor/carpet,
/area/bridge/meeting_room)
"bdL" = (
@@ -24223,6 +24223,7 @@
/obj/effect/turf_decal/tile/purple{
dir = 8
},
/obj/machinery/lapvend,
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
"bgb" = (
@@ -24557,10 +24558,10 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/holopad,
/obj/structure/cable{
icon_state = "2-8"
},
/obj/machinery/holopad/secure,
/turf/open/floor/wood,
/area/crew_quarters/heads/captain)
"bgX" = (
@@ -28662,7 +28663,7 @@
/turf/open/floor/plasteel,
/area/crew_quarters/heads/hop)
"bqB" = (
/obj/machinery/holopad,
/obj/machinery/holopad/secure,
/turf/open/floor/carpet,
/area/crew_quarters/heads/hop)
"bqC" = (
@@ -30845,6 +30846,7 @@
/area/science)
"bvF" = (
/obj/machinery/requests_console{
announcementConsole = 1;
department = "Cargo Bay";
departmentType = 2;
pixel_x = -30
@@ -32044,7 +32046,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/heads/hor)
"byr" = (
/obj/machinery/holopad,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/white,
/area/crew_quarters/heads/hor)
"bys" = (
@@ -32134,13 +32136,13 @@
/turf/open/floor/plasteel,
/area/quartermaster/qm)
"byC" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/tile/brown{
dir = 1
},
/obj/effect/turf_decal/tile/brown{
dir = 4
},
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel,
/area/quartermaster/qm)
"byD" = (
@@ -35875,13 +35877,13 @@
/turf/open/floor/engine,
/area/science/storage)
"bGZ" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/heads/cmo)
"bHa" = (
@@ -40808,8 +40810,8 @@
/turf/open/floor/plasteel,
/area/security/checkpoint/engineering)
"bTI" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel,
/area/tcommsat/computer)
"bTJ" = (
@@ -45386,7 +45388,6 @@
name = "Privacy Shutters Control";
pixel_y = 26
},
/obj/machinery/holopad,
/obj/machinery/light{
dir = 1
},
@@ -45400,6 +45401,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/chief)
"cfI" = (
@@ -49627,12 +49629,12 @@
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"ctJ" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable{
icon_state = "2-8"
},
/obj/effect/landmark/start/cyborg,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"ctK" = (
@@ -50017,9 +50019,9 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/atmos)
"cuC" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/landmark/start/cyborg,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/atmos)
"cuD" = (
@@ -50074,12 +50076,12 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/effect/landmark/start/cyborg,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"cuH" = (
@@ -50105,10 +50107,10 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/service)
"cuJ" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/service)
"cuK" = (
@@ -50675,8 +50677,8 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/hallway)
"cvU" = (
@@ -50931,10 +50933,10 @@
/obj/structure/cable{
icon_state = "2-8"
},
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai)
"cwB" = (
File diff suppressed because it is too large Load Diff
+30 -30
View File
@@ -2425,8 +2425,8 @@
"go" = (
/obj/machinery/camera/autoname,
/obj/structure/railing{
icon_state = "railing";
dir = 8
dir = 8;
icon_state = "railing"
},
/turf/open/floor/grass,
/area/hydroponics/garden/monastery)
@@ -2572,8 +2572,8 @@
"gO" = (
/obj/machinery/space_heater,
/obj/structure/railing/corner{
icon_state = "railing_corner";
dir = 8
dir = 8;
icon_state = "railing_corner"
},
/turf/open/floor/plating,
/area/maintenance/central)
@@ -5594,8 +5594,8 @@
/area/maintenance/solars/starboard)
"oy" = (
/obj/structure/railing{
icon_state = "railing";
dir = 4
dir = 4;
icon_state = "railing"
},
/turf/open/floor/plating,
/area/maintenance/central)
@@ -7058,8 +7058,8 @@
/area/hydroponics)
"sn" = (
/obj/structure/railing/corner{
icon_state = "railing_corner";
dir = 8
dir = 8;
icon_state = "railing_corner"
},
/turf/open/floor/plating,
/area/maintenance/central)
@@ -7083,8 +7083,8 @@
/area/asteroid/nearstation)
"sr" = (
/obj/structure/railing/corner{
icon_state = "railing_corner";
dir = 4
dir = 4;
icon_state = "railing_corner"
},
/turf/open/floor/grass,
/area/hydroponics/garden/monastery)
@@ -12130,8 +12130,8 @@
/area/hallway/secondary/service)
"Fw" = (
/obj/structure/railing{
icon_state = "railing";
dir = 8
dir = 8;
icon_state = "railing"
},
/turf/open/floor/plating,
/area/maintenance/central)
@@ -13656,8 +13656,8 @@
/area/janitor)
"IY" = (
/obj/structure/railing{
icon_state = "railing";
dir = 8
dir = 8;
icon_state = "railing"
},
/obj/structure/cable{
icon_state = "1-2"
@@ -14004,8 +14004,8 @@
/area/vacant_room/commissary)
"JT" = (
/obj/docking_port/stationary/public_mining_dock{
icon_state = "pinonfar";
dir = 2
dir = 2;
icon_state = "pinonfar"
},
/turf/open/floor/plating,
/area/construction/mining/aux_base)
@@ -14423,8 +14423,8 @@
/area/crew_quarters/kitchen)
"KX" = (
/obj/structure/railing/corner{
icon_state = "railing_corner";
dir = 1
dir = 1;
icon_state = "railing_corner"
},
/turf/open/floor/grass,
/area/hydroponics/garden/monastery)
@@ -14469,8 +14469,8 @@
/area/hallway/secondary/service)
"Le" = (
/obj/structure/railing{
icon_state = "railing";
dir = 5
dir = 5;
icon_state = "railing"
},
/turf/open/floor/grass,
/area/hydroponics/garden/monastery)
@@ -14493,8 +14493,8 @@
/area/crew_quarters/fitness/recreation)
"Lg" = (
/obj/structure/railing{
icon_state = "railing";
dir = 8
dir = 8;
icon_state = "railing"
},
/obj/machinery/power/apc{
areastring = "/area/hallway/secondary/construction";
@@ -15478,8 +15478,8 @@
/area/maintenance/department/crew_quarters/dorms)
"NG" = (
/obj/structure/railing{
icon_state = "railing";
dir = 9
dir = 9;
icon_state = "railing"
},
/turf/open/floor/grass,
/area/hydroponics/garden/monastery)
@@ -16723,8 +16723,8 @@
/area/crew_quarters/fitness/recreation)
"QT" = (
/obj/structure/railing{
icon_state = "railing";
dir = 8
dir = 8;
icon_state = "railing"
},
/turf/open/floor/grass,
/area/hydroponics/garden/monastery)
@@ -16896,8 +16896,8 @@
/area/gateway)
"Rx" = (
/obj/structure/railing/corner{
icon_state = "railing_corner";
dir = 8
dir = 8;
icon_state = "railing_corner"
},
/turf/open/floor/grass,
/area/hydroponics/garden/monastery)
@@ -16929,8 +16929,8 @@
/area/gateway)
"RA" = (
/obj/structure/railing{
icon_state = "railing";
dir = 4
dir = 4;
icon_state = "railing"
},
/turf/open/floor/grass,
/area/hydroponics/garden/monastery)
+66 -66
View File
@@ -61,16 +61,16 @@
"n" = (
/obj/effect/landmark/mafia,
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 9
dir = 9;
icon_state = "trimline_fill"
},
/obj/effect/turf_decal/trimline/brown/filled/corner,
/turf/open/floor/plasteel,
/area/mafia)
"o" = (
/obj/effect/turf_decal/trimline/brown/filled/end{
icon_state = "trimline_end_fill";
dir = 4
dir = 4;
icon_state = "trimline_end_fill"
},
/obj/structure/closet{
desc = "It's a storage unit. For mining stuff. Y'know.";
@@ -94,8 +94,8 @@
/area/mafia)
"r" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 9
dir = 9;
icon_state = "trimline_fill"
},
/obj/structure/closet{
desc = "It's a storage unit. For mining stuff. Y'know.";
@@ -107,8 +107,8 @@
/area/mafia)
"s" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 9
dir = 9;
icon_state = "trimline_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
@@ -134,31 +134,31 @@
/area/mafia)
"w" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 1
dir = 1;
icon_state = "trimline_fill"
},
/obj/effect/turf_decal/trimline/brown/filled/corner,
/turf/open/floor/plasteel,
/area/mafia)
"x" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 1
dir = 1;
icon_state = "trimline_fill"
},
/obj/effect/turf_decal/trimline/brown/filled/line,
/turf/open/floor/plasteel,
/area/mafia)
"y" = (
/obj/effect/turf_decal/trimline/brown/filled/end{
icon_state = "trimline_end_fill";
dir = 4
dir = 4;
icon_state = "trimline_end_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"z" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 5
dir = 5;
icon_state = "trimline_fill"
},
/obj/structure/closet{
desc = "It's a storage unit. For mining stuff. Y'know.";
@@ -171,70 +171,70 @@
"A" = (
/obj/effect/landmark/mafia,
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 6
dir = 6;
icon_state = "trimline_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"B" = (
/obj/effect/turf_decal/trimline/brown/filled/end{
icon_state = "trimline_end_fill";
dir = 1
dir = 1;
icon_state = "trimline_end_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"C" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 4
dir = 4;
icon_state = "trimline_fill"
},
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 8
dir = 8;
icon_state = "trimline_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"D" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 10
dir = 10;
icon_state = "trimline_fill"
},
/obj/effect/turf_decal/trimline/brown/filled/corner{
icon_state = "trimline_corner_fill";
dir = 4
dir = 4;
icon_state = "trimline_corner_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"E" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 1
dir = 1;
icon_state = "trimline_fill"
},
/obj/effect/turf_decal/trimline/brown/filled/corner{
icon_state = "trimline_corner_fill";
dir = 8
dir = 8;
icon_state = "trimline_corner_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"F" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 5
dir = 5;
icon_state = "trimline_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"G" = (
/obj/effect/landmark/mafia,
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 10
dir = 10;
icon_state = "trimline_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"H" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 10
dir = 10;
icon_state = "trimline_fill"
},
/obj/structure/closet{
desc = "It's a storage unit. For mining stuff. Y'know.";
@@ -246,8 +246,8 @@
/area/mafia)
"I" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 6
dir = 6;
icon_state = "trimline_fill"
},
/obj/structure/closet{
desc = "It's a storage unit. For mining stuff. Y'know.";
@@ -260,19 +260,19 @@
"J" = (
/obj/effect/landmark/mafia,
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 6
dir = 6;
icon_state = "trimline_fill"
},
/obj/effect/turf_decal/trimline/brown/filled/corner{
icon_state = "trimline_corner_fill";
dir = 1
dir = 1;
icon_state = "trimline_corner_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"K" = (
/obj/effect/turf_decal/trimline/brown/filled/end{
icon_state = "trimline_end_fill";
dir = 8
dir = 8;
icon_state = "trimline_end_fill"
},
/obj/structure/closet{
desc = "It's a storage unit. For mining stuff. Y'know.";
@@ -285,34 +285,34 @@
"L" = (
/obj/effect/landmark/mafia,
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 5
dir = 5;
icon_state = "trimline_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"M" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 10
dir = 10;
icon_state = "trimline_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"N" = (
/obj/effect/turf_decal/trimline/brown/filled/line,
/obj/effect/turf_decal/trimline/brown/filled/corner{
icon_state = "trimline_corner_fill";
dir = 4
dir = 4;
icon_state = "trimline_corner_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"O" = (
/obj/effect/turf_decal/trimline/brown/filled/corner{
icon_state = "trimline_corner_fill";
dir = 8
dir = 8;
icon_state = "trimline_corner_fill"
},
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 5
dir = 5;
icon_state = "trimline_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
@@ -323,8 +323,8 @@
"Q" = (
/obj/effect/landmark/mafia,
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 9
dir = 9;
icon_state = "trimline_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
@@ -345,31 +345,31 @@
/area/mafia)
"S" = (
/obj/effect/turf_decal/trimline/brown/filled/end{
icon_state = "trimline_end_fill";
dir = 8
dir = 8;
icon_state = "trimline_end_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"T" = (
/obj/effect/turf_decal/trimline/brown/filled/line,
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 1
dir = 1;
icon_state = "trimline_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"U" = (
/obj/effect/turf_decal/trimline/brown/filled/line,
/obj/effect/turf_decal/trimline/brown/filled/corner{
icon_state = "trimline_corner_fill";
dir = 1
dir = 1;
icon_state = "trimline_corner_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"V" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 6
dir = 6;
icon_state = "trimline_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
+2 -2
View File
@@ -62,8 +62,8 @@
/area/mafia)
"n" = (
/obj/structure/chair/brass{
icon_state = "brass_chair";
dir = 1
dir = 1;
icon_state = "brass_chair"
},
/turf/open/floor/clockwork/reebe,
/area/mafia)
+74 -129
View File
@@ -3710,7 +3710,6 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"agS" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -3721,6 +3720,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"agT" = (
@@ -3795,11 +3795,11 @@
/turf/open/floor/carpet,
/area/crew_quarters/heads/hos)
"agZ" = (
/obj/machinery/holopad,
/obj/structure/chair{
dir = 1
},
/obj/effect/landmark/start/head_of_security,
/obj/machinery/holopad/secure,
/turf/open/floor/carpet,
/area/crew_quarters/heads/hos)
"aha" = (
@@ -9617,8 +9617,8 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
/obj/machinery/holopad,
/obj/effect/turf_decal/stripes/line,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"arR" = (
@@ -13304,13 +13304,6 @@
/obj/structure/lattice/catwalk,
/turf/open/space,
/area/space/nearstation)
"aze" = (
/obj/item/kirbyplants{
icon_state = "plant-22"
},
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/wood,
/area/library)
"azg" = (
/obj/item/stack/cable_coil,
/turf/open/floor/plating/airless,
@@ -14062,18 +14055,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall/r_wall,
/area/engine/engineering)
"aAz" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
/obj/machinery/computer/security/telescreen/entertainment{
pixel_y = 30
},
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/plasteel/cult,
/area/library)
"aAA" = (
/obj/docking_port/stationary{
dir = 8;
@@ -14907,6 +14888,12 @@
},
/turf/open/floor/plasteel/dark,
/area/security/nuke_storage)
"aCi" = (
/obj/structure/sign/painting/library{
pixel_y = 32
},
/turf/open/floor/wood,
/area/library)
"aCj" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security/glass{
@@ -16576,14 +16563,17 @@
/turf/open/floor/engine,
/area/engine/engineering)
"aFE" = (
/obj/structure/table/wood,
/obj/machinery/newscaster{
pixel_y = 32
/obj/structure/table/wood/fancy/blue,
/obj/structure/table/wood/fancy/royalblue,
/obj/structure/sign/painting/library_secure{
pixel_x = 32
},
/obj/item/folder,
/obj/item/folder,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plasteel/cult,
/obj/machinery/door/window{
dir = 8;
name = "Secure Art Exhibition";
req_access_txt = "37"
},
/turf/open/floor/wood,
/area/library)
"aFF" = (
/obj/structure/table,
@@ -20575,7 +20565,7 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai_upload)
"aOc" = (
/obj/machinery/holopad,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai_upload)
"aOd" = (
@@ -21700,7 +21690,7 @@
/area/quartermaster/qm)
"aQs" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/holopad,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel,
/area/quartermaster/qm)
"aQt" = (
@@ -25578,7 +25568,7 @@
dir = 1;
pixel_y = 1
},
/obj/machinery/holopad,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/aisat)
"aYe" = (
@@ -27503,7 +27493,6 @@
/turf/open/floor/plasteel,
/area/crew_quarters/heads/chief)
"bbv" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -27514,6 +27503,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel,
/area/crew_quarters/heads/chief)
"bbw" = (
@@ -30698,7 +30688,6 @@
/obj/structure/window/reinforced{
dir = 8
},
/obj/machinery/holopad,
/turf/open/floor/wood,
/area/crew_quarters/heads/captain/private)
"bhz" = (
@@ -31161,8 +31150,8 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai)
"bip" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai)
"biq" = (
@@ -33899,12 +33888,12 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"bnC" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/effect/landmark/start/cyborg,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"bnD" = (
@@ -34887,11 +34876,11 @@
/turf/open/floor/plasteel/dark,
/area/aisat)
"bpF" = (
/obj/machinery/holopad,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/aisat)
"bpG" = (
@@ -34937,8 +34926,8 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/holopad,
/obj/item/beacon,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/foyer)
"bpL" = (
@@ -36523,16 +36512,6 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"bsI" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/structure/extinguisher_cabinet{
pixel_y = -30
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"bsJ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -37489,9 +37468,9 @@
/turf/open/floor/wood,
/area/crew_quarters/heads/captain/private)
"buG" = (
/obj/machinery/holopad{
pixel_x = 9;
pixel_y = -9
/obj/machinery/holopad/secure{
pixel_x = 15;
pixel_y = -15
},
/turf/open/floor/carpet,
/area/crew_quarters/heads/captain/private)
@@ -38069,32 +38048,12 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/carpet,
/area/library)
"bwe" = (
/obj/structure/chair/comfy/black{
dir = 8
"bwf" = (
/obj/machinery/light{
dir = 1
},
/turf/open/floor/wood,
/area/library)
"bwf" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
/obj/machinery/computer/security/telescreen/entertainment{
pixel_y = 30
},
/turf/open/floor/plasteel/cult,
/area/library)
"bwg" = (
/obj/structure/table/wood,
/obj/machinery/newscaster{
pixel_y = 32
},
/obj/item/folder,
/obj/item/folder,
/turf/open/floor/plasteel/cult,
/area/library)
"bwh" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/extinguisher_cabinet{
@@ -38943,14 +38902,19 @@
/obj/effect/landmark/start/librarian,
/turf/open/floor/wood,
/area/library)
"bxW" = (
/turf/open/floor/plasteel/cult,
/area/library)
"bxX" = (
/obj/structure/chair/comfy/brown{
dir = 1
/obj/structure/table/wood/fancy/blue,
/obj/structure/table/wood/fancy/royalblue,
/obj/structure/sign/painting/library_secure{
pixel_x = 32
},
/turf/open/floor/plasteel/cult,
/obj/machinery/door/window{
dir = 8;
name = "Secure Art Exhibition";
req_access_txt = "37"
},
/obj/structure/window/reinforced/spawner,
/turf/open/floor/wood,
/area/library)
"bxY" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -39670,7 +39634,6 @@
/turf/open/floor/plasteel/grimy,
/area/tcommsat/computer)
"bzq" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -39681,6 +39644,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/grimy,
/area/tcommsat/computer)
"bzr" = (
@@ -39797,18 +39761,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/carpet,
/area/library)
"bzG" = (
/obj/machinery/door/morgue{
name = "Study #1"
},
/turf/open/floor/plasteel/cult,
/area/library)
"bzH" = (
/obj/machinery/door/morgue{
name = "Study #2"
},
/turf/open/floor/plasteel/cult,
/area/library)
"bzI" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/light{
@@ -40511,9 +40463,6 @@
/area/engine/atmos)
"bBu" = (
/obj/machinery/vending/coffee,
/obj/machinery/newscaster{
pixel_y = 32
},
/turf/open/floor/wood,
/area/library)
"bBv" = (
@@ -40525,12 +40474,6 @@
/obj/machinery/bookbinder,
/turf/open/floor/wood,
/area/library)
"bBx" = (
/obj/item/kirbyplants{
icon_state = "plant-22"
},
/turf/open/floor/wood,
/area/library)
"bBy" = (
/obj/structure/sign/directions/command{
dir = 4;
@@ -43456,13 +43399,13 @@
/turf/open/floor/plasteel/dark/telecomms,
/area/tcommsat/server)
"bHE" = (
/obj/machinery/holopad,
/obj/structure/cable/yellow{
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark/telecomms,
/area/tcommsat/server)
"bHF" = (
@@ -58787,7 +58730,7 @@
/area/science/explab)
"cmX" = (
/obj/structure/window/reinforced,
/obj/machinery/holopad,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/aisat)
"cmY" = (
@@ -61251,13 +61194,13 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/holopad,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/heads/cmo)
"crA" = (
@@ -63638,7 +63581,7 @@
},
/area/crew_quarters/heads/hor)
"cvU" = (
/obj/machinery/holopad,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/cafeteria{
dir = 5
},
@@ -75899,9 +75842,6 @@
/obj/machinery/light{
dir = 1
},
/obj/machinery/status_display/evac{
pixel_y = 30
},
/obj/machinery/photocopier{
pixel_y = 3
},
@@ -81614,6 +81554,12 @@
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"iAG" = (
/obj/structure/sign/painting/library{
pixel_y = -32
},
/turf/open/floor/wood,
/area/library)
"iCn" = (
/obj/machinery/vr_sleeper,
/turf/open/floor/plasteel,
@@ -82628,12 +82574,11 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/fitness/recreation)
"qBh" = (
/obj/structure/table,
/obj/item/paicard,
/obj/effect/turf_decal/tile/purple,
/obj/effect/turf_decal/tile/purple{
dir = 8
},
/obj/machinery/lapvend,
/turf/open/floor/plasteel/white,
/area/science/research)
"qBq" = (
@@ -103714,8 +103659,8 @@ bnV
bql
awL
bue
aze
bwe
bzE
bzE
bGv
bHT
bwc
@@ -103971,8 +103916,8 @@ bod
bql
bsG
bue
bue
bue
aCi
iAG
bue
bBu
bwc
@@ -104228,9 +104173,9 @@ boe
bql
bsH
bue
aAz
bxW
bzG
aCi
iAG
bue
bzE
bwc
bEA
@@ -104485,8 +104430,8 @@ bof
bqu
bsz
bue
bwg
bxX
aCi
iAG
bue
bBv
bwc
@@ -104740,10 +104685,10 @@ bku
bml
bog
bqv
bsI
bue
bue
bsz
bue
aCi
iAG
bue
cUT
bwc
@@ -105000,8 +104945,8 @@ bqw
bsx
bue
bwf
bxW
bzH
bzE
bzE
bzE
dCX
bwc
@@ -105258,11 +105203,11 @@ bsx
bue
aFE
bxX
bue
bzE
bzE
bwc
bwc
bBw
bwc
bwc
bBx
bue
bue
bue
@@ -3,9 +3,9 @@
/turf/open/space/basic,
/area/space)
"aab" = (
/obj/machinery/holopad,
/obj/effect/landmark/start/cyborg,
/mob/living/simple_animal/bot/secbot/pingsky,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"aac" = (
@@ -999,7 +999,7 @@
/obj/machinery/power/terminal{
dir = 1
},
/obj/machinery/holopad,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/white,
/area/ai_monitored/turret_protected/ai)
"acs" = (
@@ -11793,7 +11793,7 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/captain)
"aBn" = (
/obj/machinery/holopad,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/captain)
"aBo" = (
@@ -12592,7 +12592,7 @@
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
"aCR" = (
/obj/machinery/holopad,
/obj/machinery/holopad/secure,
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
"aCS" = (
@@ -12995,7 +12995,6 @@
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai_upload)
"aDM" = (
/obj/machinery/holopad,
/obj/machinery/camera/motion{
c_tag = "AI Upload Center";
dir = 1;
@@ -13008,6 +13007,7 @@
name = "Station Intercom (AI Private)";
pixel_y = -28
},
/obj/machinery/holopad/secure,
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai_upload)
"aDN" = (
@@ -37478,11 +37478,10 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bHb" = (
/obj/structure/closet/crate/freezer/surplus_limbs,
/obj/item/reagent_containers/glass/beaker/synthflesh,
/obj/machinery/newscaster/security_unit{
pixel_y = 32
},
/obj/machinery/limbgrower,
/turf/open/floor/plasteel/freezer,
/area/medical/surgery)
"bHc" = (
@@ -38110,6 +38109,8 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/structure/closet/crate/freezer/surplus_limbs,
/obj/item/reagent_containers/glass/beaker/synthflesh,
/turf/open/floor/plasteel/white,
/area/medical/surgery)
"bIq" = (
+30 -30
View File
@@ -435,8 +435,8 @@
/area/engine/atmos)
"bm" = (
/obj/machinery/atmospherics/components/binary/valve/on{
icon_state = "mvalve_map-2";
dir = 4
dir = 4;
icon_state = "mvalve_map-2"
},
/turf/open/floor/plating,
/area/engine/atmos)
@@ -1502,8 +1502,8 @@
/area/engine/storage)
"gK" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
icon_state = "connector_map-2";
dir = 8
dir = 8;
icon_state = "connector_map-2"
},
/obj/machinery/portable_atmospherics/canister/toxins,
/turf/open/floor/plating,
@@ -1514,8 +1514,8 @@
/area/hallway/secondary/service)
"hi" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/on{
icon_state = "inje_map-2";
dir = 4
dir = 4;
icon_state = "inje_map-2"
},
/turf/open/floor/plating,
/area/construction)
@@ -1555,8 +1555,8 @@
/area/hallway/secondary/service)
"jA" = (
/obj/effect/turf_decal/stripes/white/line{
icon_state = "warningline_white";
dir = 8
dir = 8;
icon_state = "warningline_white"
},
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -1567,8 +1567,8 @@
/area/construction)
"jV" = (
/obj/effect/turf_decal/stripes/white/line{
icon_state = "warningline_white";
dir = 6
dir = 6;
icon_state = "warningline_white"
},
/turf/open/floor/plating,
/area/engine/storage)
@@ -1637,8 +1637,8 @@
/area/engine/storage)
"qR" = (
/obj/effect/turf_decal/stripes/white/line{
icon_state = "warningline_white";
dir = 9
dir = 9;
icon_state = "warningline_white"
},
/turf/open/floor/plating,
/area/engine/storage)
@@ -1659,15 +1659,15 @@
/area/construction)
"sE" = (
/obj/effect/turf_decal/stripes/white/line{
icon_state = "warningline_white";
dir = 4
dir = 4;
icon_state = "warningline_white"
},
/turf/open/floor/plating,
/area/engine/storage)
"td" = (
/obj/effect/turf_decal/stripes/white/line{
icon_state = "warningline_white";
dir = 8
dir = 8;
icon_state = "warningline_white"
},
/turf/open/floor/plating,
/area/engine/storage)
@@ -1704,8 +1704,8 @@
/area/construction)
"xB" = (
/obj/effect/turf_decal/stripes/white/line{
icon_state = "warningline_white";
dir = 1
dir = 1;
icon_state = "warningline_white"
},
/turf/open/floor/plating,
/area/engine/storage)
@@ -1720,8 +1720,8 @@
/area/construction)
"zZ" = (
/obj/structure/disposalpipe/trunk{
icon_state = "pipe-t";
dir = 1
dir = 1;
icon_state = "pipe-t"
},
/obj/machinery/disposal/bin,
/turf/open/floor/plating,
@@ -1788,12 +1788,12 @@
/area/construction)
"EH" = (
/obj/effect/turf_decal/stripes/white/line{
icon_state = "warningline_white";
dir = 1
dir = 1;
icon_state = "warningline_white"
},
/obj/effect/turf_decal/stripes/white/line{
icon_state = "warningline_white";
dir = 4
dir = 4;
icon_state = "warningline_white"
},
/turf/open/floor/plating,
/area/engine/storage)
@@ -1804,8 +1804,8 @@
"FL" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/green/hidden{
icon_state = "pipe11-2";
dir = 4
dir = 4;
icon_state = "pipe11-2"
},
/turf/open/floor/plating,
/area/construction)
@@ -1896,8 +1896,8 @@
/area/engine/storage)
"Qo" = (
/obj/structure/disposalpipe/trunk/multiz/down{
icon_state = "pipe-down";
dir = 1
dir = 1;
icon_state = "pipe-down"
},
/turf/open/floor/plating,
/area/hallway/secondary/service)
@@ -1966,8 +1966,8 @@
/area/construction)
"ZQ" = (
/obj/effect/turf_decal/stripes/white/line{
icon_state = "warningline_white";
dir = 5
dir = 5;
icon_state = "warningline_white"
},
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
+6 -6
View File
@@ -1407,8 +1407,8 @@
height = 5;
id = "laborcamp_home";
name = "fore bay 1";
width = 9;
roundstart_template = /datum/map_template/shuttle/labour/box
roundstart_template = /datum/map_template/shuttle/labour/box;
width = 9
},
/turf/open/space/basic,
/area/space)
@@ -1419,8 +1419,8 @@
height = 15;
id = "arrivals_stationary";
name = "arrivals";
width = 7;
roundstart_template = /datum/map_template/shuttle/arrival/box
roundstart_template = /datum/map_template/shuttle/arrival/box;
width = 7
},
/turf/open/space/basic,
/area/space)
@@ -2325,8 +2325,8 @@
height = 5;
id = "mining_home";
name = "mining shuttle bay";
width = 7;
roundstart_template = /datum/map_template/shuttle/mining/box
roundstart_template = /datum/map_template/shuttle/mining/box;
width = 7
},
/turf/open/space/basic,
/area/space)
+7 -26
View File
@@ -80,10 +80,6 @@
},
/turf/open/floor/clockwork/reebe,
/area/reebe/city_of_cogs)
"az" = (
/obj/structure/destructible/clockwork/eminence_spire,
/turf/open/floor/clockwork/reebe,
/area/reebe/city_of_cogs)
"aA" = (
/obj/machinery/door/airlock/clockwork/brass{
name = "Infirmary"
@@ -168,21 +164,6 @@
/obj/effect/clockwork/sigil/transmission,
/turf/open/floor/clockwork/reebe,
/area/reebe/city_of_cogs)
"ew" = (
/obj/structure/table/reinforced/brass,
/obj/item/clockwork/construct_chassis/cogscarab{
pixel_y = 20
},
/obj/item/clockwork/construct_chassis/cogscarab{
pixel_x = -7;
pixel_y = 6
},
/obj/item/clockwork/construct_chassis/cogscarab{
pixel_x = 7;
pixel_y = 6
},
/turf/open/floor/clockwork/reebe,
/area/reebe/city_of_cogs)
"hY" = (
/obj/item/clockwork/alloy_shards/pinion_lock,
/turf/open/floor/clockwork/reebe,
@@ -208,10 +189,6 @@
/obj/item/storage/belt/utility/servant,
/turf/open/floor/clockwork/reebe,
/area/reebe/city_of_cogs)
"vx" = (
/obj/effect/clockwork/sigil/transmission,
/turf/open/floor/clockwork/reebe,
/area/reebe/city_of_cogs)
"wV" = (
/obj/item/clockwork/alloy_shards/large,
/turf/open/indestructible/reebe_void/spawning/lattices,
@@ -244,6 +221,10 @@
/obj/item/clockwork/alloy_shards/small,
/turf/open/indestructible/reebe_void/spawning/lattices,
/area/reebe)
"Ox" = (
/obj/structure/destructible/clockwork/eminence_spire,
/turf/open/floor/clockwork/reebe,
/area/reebe/city_of_cogs)
"OB" = (
/obj/item/clockwork/component/geis_capacitor/fallen_armor,
/turf/open/floor/clockwork/reebe,
@@ -32770,7 +32751,7 @@ ae
ae
ag
ah
ew
aL
aj
aj
aj
@@ -33284,8 +33265,8 @@ ab
ab
ae
ai
az
vx
Ox
aj
aj
aj
aE
+2 -2
View File
@@ -9,9 +9,9 @@
dwidth = 11;
height = 22;
id = "whiteship_away";
json_key = "whiteship";
name = "Deep Space";
width = 35;
json_key = "whiteship"
width = 35
},
/turf/open/space,
/area/space)
+16 -16
View File
@@ -75,8 +75,8 @@
},
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/arrows{
icon_state = "arrows";
dir = 1
dir = 1;
icon_state = "arrows"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -112,8 +112,8 @@
/area/shuttle/arrival)
"n" = (
/obj/structure/shuttle/engine/propulsion/left{
icon_state = "propulsion_l";
dir = 8
dir = 8;
icon_state = "propulsion_l"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -124,8 +124,8 @@
/obj/structure/window/shuttle,
/obj/structure/grille,
/obj/structure/shuttle/engine/heater{
icon_state = "heater";
dir = 8
dir = 8;
icon_state = "heater"
},
/turf/open/floor/plating,
/area/shuttle/arrival)
@@ -143,8 +143,8 @@
},
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/arrows{
icon_state = "arrows";
dir = 1
dir = 1;
icon_state = "arrows"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -157,8 +157,8 @@
},
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/arrows{
icon_state = "arrows";
dir = 1
dir = 1;
icon_state = "arrows"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -194,8 +194,8 @@
/area/shuttle/arrival)
"u" = (
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion";
dir = 8
dir = 8;
icon_state = "propulsion"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -237,8 +237,8 @@
pixel_x = 28
},
/obj/effect/turf_decal/arrows{
icon_state = "arrows";
dir = 1
dir = 1;
icon_state = "arrows"
},
/obj/effect/turf_decal/stripes/corner,
/obj/effect/turf_decal/stripes/corner{
@@ -327,8 +327,8 @@
/area/shuttle/arrival)
"G" = (
/obj/structure/shuttle/engine/propulsion/right{
icon_state = "propulsion_r";
dir = 8
dir = 8;
icon_state = "propulsion_r"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
+2 -2
View File
@@ -198,9 +198,9 @@
dir = 8;
dwidth = 6;
height = 18;
name = "Birdboat emergency escape shuttle";
port_direction = 4;
width = 14;
name = "Birdboat emergency escape shuttle"
width = 14
},
/obj/structure/fans/tiny,
/turf/open/floor/mineral/titanium,
+2 -2
View File
@@ -545,9 +545,9 @@
dwidth = 11;
height = 18;
name = "Delta emergency shuttle";
width = 30;
port_direction = 4;
preferred_direction = 2;
port_direction = 4
width = 30
},
/obj/structure/fans/tiny,
/turf/open/floor/plating,
+3 -3
View File
@@ -19,10 +19,10 @@
name = "Escape Pod Airlock"
},
/obj/docking_port/mobile/pod{
port_direction = 2;
dwidth = 1;
width = 3;
height = 4
height = 4;
port_direction = 2;
width = 3
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
+4 -4
View File
@@ -4,8 +4,8 @@
/area/shuttle/labor)
"b" = (
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion";
dir = 1
dir = 1;
icon_state = "propulsion"
},
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -14,8 +14,8 @@
/area/shuttle/labor)
"c" = (
/obj/structure/shuttle/engine/heater{
icon_state = "heater";
dir = 1
dir = 1;
icon_state = "heater"
},
/obj/structure/window/reinforced,
/obj/effect/turf_decal/stripes/line{
+4 -4
View File
@@ -86,8 +86,8 @@
width = 7
},
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 8
dir = 8;
icon_state = "pipe11-2"
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/mining)
@@ -115,8 +115,8 @@
"p" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 8
dir = 8;
icon_state = "pipe11-2"
},
/obj/effect/turf_decal/stripes/corner{
dir = 8
+2 -1
View File
@@ -13,7 +13,8 @@
#define BLOCK_Z_OUT_UP (1<<10) // Should this object block z uprise from loc?
#define BLOCK_Z_IN_DOWN (1<<11) // Should this object block z falling from above?
#define BLOCK_Z_IN_UP (1<<12) // Should this object block z uprise from below?
#define SHOVABLE_ONTO (1<<13) //called on turf.shove_act() to consider whether an object should have a niche effect (defined in their own shove_act()) when someone is pushed onto it, or do a sanity CanPass() check.
#define SHOVABLE_ONTO (1<<13)//called on turf.shove_act() to consider whether an object should have a niche effect (defined in their own shove_act()) when someone is pushed onto it, or do a sanity CanPass() check.
#define EXAMINE_SKIP (1<<14) /// Makes the Examine proc not read out this item.
/// Integrity defines for clothing (not flags but close enough)
#define CLOTHING_PRISTINE 0 // We have no damage on the clothing
+1
View File
@@ -80,6 +80,7 @@ GLOBAL_LIST_EMPTY(living_heart_cache) //A list of all living hearts in existance
#define PATH_ASH "Ash"
#define PATH_RUST "Rust"
#define PATH_FLESH "Flesh"
#define PATH_VOID "Void"
//Overthrow time to update heads obj
#define OBJECTIVE_UPDATING_TIME 300
+5
View File
@@ -0,0 +1,5 @@
// Shipping methods
#define SHIPPING_METHOD_LTSRBT "LTSRBT" // The BEST way of shipping items: accurate, "undetectable"
#define SHIPPING_METHOD_TELEPORT "Teleport" // Picks a random area to teleport the item to and gives you a minute to get there before it is sent.
#define SHIPPING_METHOD_LAUNCH "Launch" // Throws the item from somewhere at the station.
+3
View File
@@ -462,6 +462,9 @@
#define COMSIG_CLEAR_MOOD_EVENT "clear_mood" //Called when you clear a mood event from anywhere in the code.
#define COMSIG_MODIFY_SANITY "modify_sanity" //Called when you want to increase or decrease sanity from anywhere in the code.
///Mask of Madness
#define COMSIG_VOID_MASK_ACT "void_mask_act"
//NTnet
#define COMSIG_COMPONENT_NTNET_RECEIVE "ntnet_receive" //called on an object by its NTNET connection component on receive. (sending_id(number), sending_netname(text), data(datum/netdata))
+3
View File
@@ -59,6 +59,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
//Human sub-species
#define isabductor(A) (is_species(A, /datum/species/abductor))
#define isgolem(A) (is_species(A, /datum/species/golem))
#define isclockworkgolem(A) (is_species(A, /datum/species/golem/clockwork/no_scrap))
#define islizard(A) (is_species(A, /datum/species/lizard))
#define isplasmaman(A) (is_species(A, /datum/species/plasmaman))
#define ispodperson(A) (is_species(A, /datum/species/pod))
@@ -225,6 +226,8 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
#define isfood(A) (istype(A, /obj/item/reagent_containers/food/snacks))
#define iscontainer(A) (istype(A, /obj/structure/reagent_dispensers))
//Assemblies
#define isassembly(O) (istype(O, /obj/item/assembly))
+1
View File
@@ -42,6 +42,7 @@ require only minor tweaks.
#define ZTRAIT_SNOWSTORM "Weather_Snowstorm"
#define ZTRAIT_ASHSTORM "Weather_Ashstorm"
#define ZTRAIT_ACIDRAIN "Weather_Acidrain"
#define ZTRAIT_VOIDSTORM "Weather_Voidstorm"
// number - bombcap is multiplied by this before being applied to bombs
#define ZTRAIT_BOMBCAP_MULTIPLIER "Bombcap Multiplier"
+8
View File
@@ -205,6 +205,14 @@
#define RULE_OF_THREE(a, b, x) ((a*x)/b)
// )
/// Converts a probability/second chance to probability/delta_time chance
/// For example, if you want an event to happen with a 10% per second chance, but your proc only runs every 5 seconds, do `if(prob(100*DT_PROB_RATE(0.1, 5)))`
#define DT_PROB_RATE(prob_per_second, delta_time) (1 - (1 - (prob_per_second)) ** (delta_time))
/// Like DT_PROB_RATE but easier to use, simply put `if(DT_PROB(10, 5))`
#define DT_PROB(prob_per_second_percent, delta_time) (prob(100*DT_PROB_RATE((prob_per_second_percent)/100, (delta_time))))
// )
#define MANHATTAN_DISTANCE(a, b) (abs(a.x - b.x) + abs(a.y - b.y))
#define LOGISTIC_FUNCTION(L,k,x,x_0) (L/(1+(NUM_E**(-k*(x-x_0)))))
+2 -2
View File
@@ -21,10 +21,10 @@
#define STIMULUM_FIRST_DROP 0.065
#define STIMULUM_SECOND_RISE 0.0009
#define STIMULUM_ABSOLUTE_DROP 0.00000335
#define REACTION_OPPRESSION_THRESHOLD 5
#define REACTION_OPPRESSION_THRESHOLD 10
#define NOBLIUM_FORMATION_ENERGY 2e9 //1 Mole of Noblium takes the planck energy to condense.
//Research point amounts
#define NOBLIUM_RESEARCH_AMOUNT 1000
#define NOBLIUM_RESEARCH_AMOUNT 25
#define BZ_RESEARCH_SCALE 4
#define BZ_RESEARCH_MAX_AMOUNT 400
#define MIASMA_RESEARCH_AMOUNT 6
+1
View File
@@ -45,6 +45,7 @@
//The gamemode specific ones are just so the gamemodes can query whether a player is old enough
//(in game days played) to play that role
GLOBAL_LIST_INIT(special_roles, list(
ROLE_SYNDICATE,
ROLE_TRAITOR = /datum/game_mode/traitor,
ROLE_BROTHER = /datum/game_mode/traitor/bros,
ROLE_OPERATIVE = /datum/game_mode/nuclear,
+4 -1
View File
@@ -87,12 +87,15 @@
//Don't set this very much higher then 1024 unless you like inviting people in to dos your server with message spam
#define MAX_MESSAGE_LEN 4096 //Citadel edit: What's the WORST that could happen?
#define MAX_FLAVOR_LEN 4096
#define MAX_FLAVOR_LEN 4096
#define MAX_TASTE_LEN 40 //lick... vore... ew...
#define MAX_NAME_LEN 42
#define MAX_BROADCAST_LEN 512
#define MAX_CHARTER_LEN 80
// Is something in the IC chat filter? This is config dependent.
#define CHAT_FILTER_CHECK(T) (config.ic_filter_regex && findtext(T, config.ic_filter_regex))
// Audio/Visual Flags. Used to determine what sense are required to notice a message.
#define MSG_VISUAL (1<<0)
#define MSG_AUDIBLE (1<<1)
+9
View File
@@ -106,6 +106,9 @@
#define STATUS_EFFECT_FAKE_VIRUS /datum/status_effect/fake_virus //gives you fluff messages for cough, sneeze, headache, etc but without an actual virus
#define STATUS_EFFECT_NO_COMBAT_MODE /datum/status_effect/no_combat_mode //Wont allow combat mode and will disable it
#define STATUS_EFFECT_STASIS /datum/status_effect/grouped/stasis //Halts biological functions like bleeding, chemical processing, blood regeneration, walking, etc
#define STATUS_EFFECT_MESMERIZE /datum/status_effect/mesmerize //Just reskinned no_combat_mode
#define STATUS_EFFECT_ELECTROSTAFF /datum/status_effect/electrostaff //slows down victim
@@ -138,3 +141,9 @@
#define STATUS_EFFECT_RAINBOWPROTECTION /datum/status_effect/rainbow_protection //Invulnerable and pacifistic
#define STATUS_EFFECT_SLIMESKIN /datum/status_effect/slimeskin //Increased armor
#define STATUS_EFFECT_DNA_MELT /datum/status_effect/dna_melt //usually does something horrible to you when you hit 100 genetic instability
/////////////
// GROUPED //
/////////////
#define STASIS_ASCENSION_EFFECT "heretic_ascension"
+1
View File
@@ -323,6 +323,7 @@
#define ABDUCTOR_ANTAGONIST "abductor-antagonist"
#define MADE_UNCLONEABLE "made-uncloneable"
#define TIMESTOP_TRAIT "timestop"
#define DOMAIN_TRAIT "domain"
#define NUKEOP_TRAIT "nuke-op"
#define CLOWNOP_TRAIT "clown-op"
#define MEGAFAUNA_TRAIT "megafauna"
+21 -8
View File
@@ -153,18 +153,20 @@ GLOBAL_LIST_INIT(ai_core_display_screens, list(
"Yes-Man"
))
/proc/resolve_ai_icon(input)
/proc/resolve_ai_icon(input, radial_preview = FALSE)
if(!input || !(input in GLOB.ai_core_display_screens))
return "ai"
else
if(input == "Random")
input = pick(GLOB.ai_core_display_screens - "Random")
if(input == "Portrait")
var/datum/portrait_picker/tgui = new(usr)//create the datum
tgui.ui_interact(usr)//datum has a tgui component, here we open the window
return "ai-portrait" //just take this until they decide
if(radial_preview)
return "ai-[lowertext(input)]"
if(input == "Random")
input = pick(GLOB.ai_core_display_screens - "Random")
if(input == "Portrait")
var/datum/portrait_picker/tgui = new(usr)//create the datum
tgui.ui_interact(usr)//datum has a tgui component, here we open the window
return "ai-portrait" //just take this until they decide
return "ai-[lowertext(input)]"
GLOBAL_LIST_INIT(security_depts_prefs, list(SEC_DEPT_RANDOM, SEC_DEPT_NONE, SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, SEC_DEPT_SCIENCE, SEC_DEPT_SUPPLY))
//Backpacks
@@ -282,6 +284,17 @@ GLOBAL_LIST_INIT(wisdoms, world.file2list("strings/wisdoms.txt"))
GLOBAL_LIST_INIT(speech_verbs, list("default","says","gibbers", "states", "chitters", "chimpers", "declares", "bellows", "buzzes" ,"beeps", "chirps", "clicks", "hisses" ,"poofs" , "puffs", "rattles", "mewls" ,"barks", "blorbles", "squeaks", "squawks", "flutters", "warbles", "caws", "gekkers", "clucks"))
GLOBAL_LIST_INIT(roundstart_tongues, list("default","human tongue" = /obj/item/organ/tongue, "lizard tongue" = /obj/item/organ/tongue/lizard, "skeleton tongue" = /obj/item/organ/tongue/bone, "fly tongue" = /obj/item/organ/tongue/fly, "ipc tongue" = /obj/item/organ/tongue/robot/ipc, "xeno tongue" = /obj/item/organ/tongue/alien))
/proc/get_roundstart_languages()
var/list/languages = subtypesof(/datum/language)
var/list/roundstart_languages = list("None") //default option for the list
for(var/some_language in languages)
var/datum/language/language = some_language
if(initial(language.chooseable_roundstart))
roundstart_languages[initial(language.name)] = some_language
return roundstart_languages
GLOBAL_LIST_INIT(roundstart_languages, get_roundstart_languages())
//SPECIES BODYPART LISTS
//locked parts are those that your picked species requires to have
//unlocked parts are those that anyone can choose on customisation regardless
+4 -4
View File
@@ -3,7 +3,7 @@
var/obj/screen/blockchance
var/obj/screen/counterchance
/datum/hud/marauder/New(mob/living/simple_animal/hostile/clockwork/marauder/guardian/owner)
/datum/hud/marauder/New(mob/living/simple_animal/hostile/clockwork/guardian/owner)
..()
var/obj/screen/using
@@ -24,7 +24,7 @@
hosthealth = null
return ..()
/mob/living/simple_animal/hostile/clockwork/marauder/guardian/create_mob_hud()
/mob/living/simple_animal/hostile/clockwork/guardian/create_mob_hud()
if(client && !hud_used)
hud_used = new /datum/hud/marauder(src, ui_style2icon(client.prefs.UI_style))
@@ -37,8 +37,8 @@
desc = "Emerge or Return."
/obj/screen/marauder/emerge/Click()
if(istype(usr, /mob/living/simple_animal/hostile/clockwork/marauder/guardian))
var/mob/living/simple_animal/hostile/clockwork/marauder/guardian/G = usr
if(istype(usr, /mob/living/simple_animal/hostile/clockwork/guardian))
var/mob/living/simple_animal/hostile/clockwork/guardian/G = usr
if(G.is_in_host())
G.try_emerge()
else
@@ -22,7 +22,7 @@
var/motd
// var/policy
// var/static/regex/ic_filter_regex
var/static/regex/ic_filter_regex
/datum/controller/configuration/proc/admin_reload()
if(IsAdminAdvancedProcCall())
@@ -53,7 +53,7 @@
loadmaplist(CONFIG_MAPS_FILE)
LoadMOTD()
// LoadPolicy()
// LoadChatFilter()
LoadChatFilter()
if (Master)
Master.OnConfigLoad()
@@ -425,6 +425,7 @@ Example config:
var/list/min_pop = Get(/datum/config_entry/keyed_list/min_pop)
var/list/max_pop = Get(/datum/config_entry/keyed_list/max_pop)
var/list/repeated_mode_adjust = Get(/datum/config_entry/number_list/repeated_mode_adjust)
var/desired_chaos_level = 9 - SSpersistence.get_recent_chaos()
for(var/T in gamemode_cache)
var/datum/game_mode/M = new T()
if(!(M.config_tag in modes))
@@ -449,6 +450,17 @@ Example config:
adjustment += repeated_mode_adjust[recent_round]
recent_round = SSpersistence.saved_modes.Find(M.config_tag,recent_round+1,0)
final_weight *= max(0,((100-adjustment)/100))
if(Get(/datum/config_entry/flag/weigh_by_recent_chaos))
var/chaos_level = M.get_chaos()
var/exponent = Get(/datum/config_entry/number/chaos_exponent)
var/delta = chaos_level - desired_chaos_level
if(desired_chaos_level > 5)
delta = abs(min(delta, 0))
else if(desired_chaos_level < 5)
delta = max(delta, 0)
else
delta = abs(delta)
final_weight /= (delta + 1) ** exponent
runnable_modes[M] = final_weight
return runnable_modes
@@ -474,7 +486,7 @@ Example config:
continue
runnable_modes[M] = probabilities[M.config_tag]
return runnable_modes
/*
/datum/controller/configuration/proc/LoadChatFilter()
var/list/in_character_filter = list()
if(!fexists("[directory]/in_character_filter.txt"))
@@ -487,7 +499,7 @@ Example config:
continue
in_character_filter += REGEX_QUOTE(line)
ic_filter_regex = in_character_filter.len ? regex("\\b([jointext(in_character_filter, "|")])\\b", "i") : null
*/
//Message admins when you can.
/datum/controller/configuration/proc/DelayedMessageAdmins(text)
addtimer(CALLBACK(GLOBAL_PROC, /proc/message_admins, text), 0)
@@ -7,6 +7,13 @@
/datum/config_entry/keyed_list/probability/ValidateListEntry(key_name)
return key_name in config.modes
/datum/config_entry/keyed_list/chaos_level
key_mode = KEY_MODE_TEXT
value_mode = VALUE_MODE_NUM
/datum/config_entry/keyed_list/chaos_level/ValidateListEntry(key_name)
return key_name in config.modes
/datum/config_entry/keyed_list/max_pop
key_mode = KEY_MODE_TEXT
value_mode = VALUE_MODE_NUM
@@ -596,3 +603,8 @@
/// Dirtyness multiplier for making turfs dirty
/datum/config_entry/number/turf_dirty_multiplier
config_entry_value = 1
/datum/config_entry/flag/weigh_by_recent_chaos
/datum/config_entry/number/chaos_exponent
config_entry_value = 1
+89
View File
@@ -0,0 +1,89 @@
SUBSYSTEM_DEF(blackmarket)
name = "Blackmarket"
flags = SS_BACKGROUND
init_order = INIT_ORDER_DEFAULT
// Descriptions for each shipping method.
var/shipping_method_descriptions = list(
SHIPPING_METHOD_LAUNCH="Launches the item at the station from space, cheap but you might not recieve your item at all.",
SHIPPING_METHOD_LTSRBT="Long-To-Short-Range-Bluespace-Transceiver, a machine that recieves items outside the station and then teleports them to the location of the uplink.",
SHIPPING_METHOD_TELEPORT="Teleports the item in a random area in the station, you get 60 seconds to get there first though."
)
var/list/datum/blackmarket_market/markets = list() // List of all existing markets.
var/list/obj/machinery/ltsrbt/telepads = list() // List of existing ltsrbts.
var/list/queued_purchases = list() // Currently queued purchases.
/datum/controller/subsystem/blackmarket/Initialize(timeofday)
for(var/market in subtypesof(/datum/blackmarket_market))
markets[market] += new market
for(var/item in subtypesof(/datum/blackmarket_item))
var/datum/blackmarket_item/I = new item()
if(!I.item)
continue
for(var/M in I.markets)
if(!markets[M])
stack_trace("SSblackmarket: Item [I] available in market that does not exist.")
continue
markets[M].add_item(item)
qdel(I)
. = ..()
/datum/controller/subsystem/blackmarket/fire(resumed)
while(length(queued_purchases))
var/datum/blackmarket_purchase/purchase = queued_purchases[1]
queued_purchases.Cut(1,2)
if(!purchase.uplink || QDELETED(purchase.uplink)) // Uh oh, uplink is gone. We will just keep the money and you will not get your order.
queued_purchases -= purchase
qdel(purchase)
continue
switch(purchase.method)
if(SHIPPING_METHOD_LTSRBT) // Find a ltsrbt pad and make it handle the shipping.
if(!telepads.len)
continue
var/free_pad_found = FALSE // Prioritize pads that don't have a cooldown active.
for(var/obj/machinery/ltsrbt/pad in telepads)
if(pad.recharge_cooldown)
continue
pad.add_to_queue(purchase)
queued_purchases -= purchase
free_pad_found = TRUE
break
if(free_pad_found)
continue
var/obj/machinery/ltsrbt/pad = pick(telepads)
to_chat(recursive_loc_check(purchase.uplink.loc, /mob), "<span class='notice'>[purchase.uplink] flashes a message noting that the order is being processed by [pad].</span>")
queued_purchases -= purchase
pad.add_to_queue(purchase)
if(SHIPPING_METHOD_TELEPORT) // Get random area, throw it somewhere there.
var/turf/targetturf = get_safe_random_station_turf()
if (!targetturf) // This shouldn't happen.
continue
to_chat(recursive_loc_check(purchase.uplink.loc, /mob), "<span class='notice'>[purchase.uplink] flashes a message noting that the order is being teleported to [get_area(targetturf)] in 60 seconds.</span>")
addtimer(CALLBACK(src, /datum/controller/subsystem/blackmarket/proc/fake_teleport, purchase.entry.spawn_item(), targetturf), 60 SECONDS) // do_teleport does not want to teleport items from nullspace, so it just forceMoves and does sparks.
queued_purchases -= purchase
qdel(purchase)
if(SHIPPING_METHOD_LAUNCH) // Get the current location of the uplink if it exists, then throws the item from space at the station from a random direction.
var/startSide = pick(GLOB.cardinals)
var/turf/T = get_turf(purchase.uplink)
var/pickedloc = spaceDebrisStartLoc(startSide, T.z)
var/atom/movable/item = purchase.entry.spawn_item(pickedloc)
item.throw_at(purchase.uplink, 3, 3, spin = FALSE)
to_chat(recursive_loc_check(purchase.uplink.loc, /mob), "<span class='notice'>[purchase.uplink] flashes a message noting the order is being launched at the station from [dir2text(startSide)].</span>")
queued_purchases -= purchase
qdel(purchase)
if(MC_TICK_CHECK)
break
/datum/controller/subsystem/blackmarket/proc/fake_teleport(atom/movable/item, turf/target) // Used to make a teleportation effect as do_teleport does not like moving items from nullspace.
item.forceMove(target)
var/datum/effect_system/spark_spread/sparks = new
sparks.set_up(5, 1, target)
sparks.attach(item)
sparks.start()
/datum/controller/subsystem/blackmarket/proc/queue_item(datum/blackmarket_purchase/P) // Used to add /datum/blackmarket_purchase to queued_purchases var. Returns TRUE when queued.
if(P.method == SHIPPING_METHOD_LTSRBT && !telepads.len)
return FALSE
queued_purchases += P
return TRUE
+21 -34
View File
@@ -490,42 +490,29 @@ SUBSYSTEM_DEF(job)
job.after_spawn(H, M, joined_late) // note: this happens before the mob has a key! M will always have a client, H might not.
equip_loadout(N, H, TRUE)//CIT CHANGE - makes players spawn with in-backpack loadout items properly. A little hacky but it works
if(ishuman(H) && H.client && N)
if(H.client && H.client.prefs && length(H.client.prefs.tcg_cards))
var/obj/item/tcgcard_binder/binder = new(get_turf(H))
H.equip_to_slot_if_possible(binder, SLOT_IN_BACKPACK, disable_warning = TRUE, bypass_equip_delay_self = TRUE)
for(var/card_type in H.client.prefs.tcg_cards)
if(card_type)
if(islist(H.client.prefs.tcg_cards[card_type]))
for(var/duplicate in H.client.prefs.tcg_cards[card_type])
var/obj/item/tcg_card/card = new(get_turf(H), card_type, duplicate)
card.forceMove(binder)
binder.cards.Add(card)
else
var/obj/item/tcg_card/card = new(get_turf(H), card_type, H.client.prefs.tcg_cards[card_type])
var/list/tcg_cards
if(ishuman(H))
if(length(H.client?.prefs?.tcg_cards))
tcg_cards = H.client.prefs.tcg_cards
else if(length(N?.client?.prefs?.tcg_cards))
tcg_cards = N.client.prefs.tcg_cards
if(tcg_cards)
var/obj/item/tcgcard_binder/binder = new(get_turf(H))
H.equip_to_slot_if_possible(binder, SLOT_IN_BACKPACK, disable_warning = TRUE, bypass_equip_delay_self = TRUE)
for(var/card_type in N.client.prefs.tcg_cards)
if(card_type)
if(islist(H.client.prefs.tcg_cards[card_type]))
for(var/duplicate in N.client.prefs.tcg_cards[card_type])
var/obj/item/tcg_card/card = new(get_turf(H), card_type, duplicate)
card.forceMove(binder)
binder.cards.Add(card)
binder.check_for_exodia()
if(length(H.client.prefs.tcg_decks))
binder.decks = H.client.prefs.tcg_decks
else
if(H && N.client.prefs && length(N.client.prefs.tcg_cards))
var/obj/item/tcgcard_binder/binder = new(get_turf(H))
H.equip_to_slot_if_possible(binder, SLOT_IN_BACKPACK, disable_warning = TRUE, bypass_equip_delay_self = TRUE)
for(var/card_type in N.client.prefs.tcg_cards)
if(card_type)
if(islist(H.client.prefs.tcg_cards[card_type]))
for(var/duplicate in N.client.prefs.tcg_cards[card_type])
var/obj/item/tcg_card/card = new(get_turf(H), card_type, duplicate)
card.forceMove(binder)
binder.cards.Add(card)
else
var/obj/item/tcg_card/card = new(get_turf(H), card_type, N.client.prefs.tcg_cards[card_type])
card.forceMove(binder)
binder.cards.Add(card)
binder.check_for_exodia()
if(length(N.client.prefs.tcg_decks))
binder.decks = N.client.prefs.tcg_decks
else
var/obj/item/tcg_card/card = new(get_turf(H), card_type, N.client.prefs.tcg_cards[card_type])
card.forceMove(binder)
binder.cards.Add(card)
binder.check_for_exodia()
if(length(N.client.prefs.tcg_decks))
binder.decks = N.client.prefs.tcg_decks
return H
/*
@@ -3,6 +3,7 @@
*/
/datum/controller/subsystem/persistence
var/list/saved_modes = list(1,2,3)
var/list/saved_chaos = list(5,5,5)
var/list/saved_dynamic_rules = list(list(),list(),list())
var/list/saved_storytellers = list("foo","bar","baz")
var/list/average_dynamic_threat = 50
@@ -20,6 +21,7 @@
/datum/controller/subsystem/persistence/LoadServerPersistence()
. = ..()
LoadRecentModes()
LoadRecentChaos()
LoadRecentStorytellers()
LoadRecentRulesets()
LoadRecentMaps()
@@ -33,6 +35,14 @@
file_data["data"] = saved_modes
fdel(json_file)
WRITE_FILE(json_file, json_encode(file_data))
saved_chaos[3] = saved_chaos[2]
saved_chaos[2] = saved_chaos[1]
saved_chaos[1] = SSticker.mode.get_chaos()
json_file = file("data/RecentChaos.json")
file_data = list()
file_data["data"] = saved_chaos
fdel(json_file)
WRITE_FILE(json_file, json_encode(file_data))
/datum/controller/subsystem/persistence/proc/CollectStoryteller(var/datum/game_mode/dynamic/mode)
saved_storytellers.len = 3
@@ -76,6 +86,15 @@
return
saved_modes = json["data"]
/datum/controller/subsystem/persistence/proc/LoadRecentChaos()
var/json_file = file("data/RecentChaos.json")
if(!fexists(json_file))
return
var/list/json = json_decode(file2text(json_file))
if(!json)
return
saved_chaos = json["data"]
/datum/controller/subsystem/persistence/proc/LoadRecentRulesets()
var/json_file = file("data/RecentRulesets.json")
if(!fexists(json_file))
@@ -105,3 +124,9 @@
if(!json)
return
saved_maps = json["maps"]
/datum/controller/subsystem/persistence/proc/get_recent_chaos()
var/sum = 0
for(var/n in saved_chaos)
sum += n
return sum/length(saved_chaos)
@@ -47,5 +47,5 @@ SUBSYSTEM_DEF(processing)
* If you override this do not call parent, as it will return PROCESS_KILL. This is done to prevent objects that dont override process() from staying in the processing list
*/
/datum/proc/process(delta_time)
set waitfor = FALSE
// SHOULD_NOT_SLEEP(TRUE)
return PROCESS_KILL
+2 -2
View File
@@ -609,9 +609,9 @@ SUBSYSTEM_DEF(ticker)
var/list/ded = SSblackbox.first_death
if(ded.len)
var/last_words = ded["last_words"] ? " Their last words were: \"[ded["last_words"]]\"" : ""
news_message += " NT Sanctioned Psykers picked up faint traces of someone near the station, allegedly having had died. Their name was: [ded["name"]], [ded["role"]], at [ded["area"]].[last_words]"
news_message += "\nNT Sanctioned Psykers picked up faint traces of someone near the station, allegedly having had died. Their name was: [ded["name"]], [ded["role"]], at [ded["area"]].[last_words]"
else
news_message += " NT Sanctioned Psykers proudly confirm reports that nobody died this shift!"
news_message += "\nNT Sanctioned Psykers proudly confirm reports that nobody died this shift!"
if(news_message)
send2otherserver(news_source, news_message,"News_Report")
@@ -336,6 +336,18 @@
subcategory = CAT_TOOL
category = CAT_MISC
/datum/crafting_recipe/blackmarket_uplink
name = "Black Market Uplink"
result = /obj/item/blackmarket_uplink
time = 20
tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
reqs = list(/obj/item/stock_parts/subspace/amplifier = 1,
/obj/item/stack/cable_coil = 15,
/obj/item/radio = 1,
/obj/item/analyzer = 1)
subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
/datum/crafting_recipe/heretic/codex
name = "Codex Cicatrix"
result = /obj/item/forbidden_book
+6
View File
@@ -33,6 +33,8 @@
RegisterSignal(parent, COMSIG_LIVING_REVIVE, .proc/on_revive)
RegisterSignal(parent, COMSIG_MOB_HUD_CREATED, .proc/modify_hud)
RegisterSignal(parent, COMSIG_MOB_DEATH, .proc/stop_processing)
RegisterSignal(parent, COMSIG_VOID_MASK_ACT, .proc/direct_sanity_drain)
if(owner.hud_used)
modify_hud()
@@ -377,6 +379,10 @@
remove_temp_moods()
setSanity(initial(sanity))
///Causes direct drain of someone's sanity, call it with a numerical value corresponding how badly you want to hurt their sanity
/datum/component/mood/proc/direct_sanity_drain(datum/source, amount)
setSanity(sanity + amount)
#undef ECSTATIC_SANITY_PEN
#undef SLIGHT_INSANITY_PEN
#undef MINOR_INSANITY_PEN
@@ -97,3 +97,11 @@
. = ..()
can_hold = typecacheof(list(/obj/item/reagent_containers/glass/bottle,
/obj/item/ammo_box/a762))
/datum/component/storage/concrete/pockets/void_cloak
quickdraw = TRUE
max_items = 3
/datum/component/storage/concrete/pockets/void_cloak/Initialize()
. = ..()
var/static/list/exception_cache = typecacheof(list(/obj/item/living_heart,/obj/item/forbidden_book))
+9
View File
@@ -45,3 +45,12 @@
start_length = 130
end_sound = 'sound/weather/ashstorm/inside/weak_end.ogg'
volume = 30
/datum/looping_sound/void_loop
mid_sounds = list('sound/ambience/VoidsEmbrace.ogg'=1)
mid_length = 1669 // exact length of the music in ticks
volume = 100
extra_range = 30
/datum/looping_sound/void_loop/start(atom/add_thing)
. = ..()
+5 -6
View File
@@ -204,12 +204,11 @@
// first 10 minutes only
return world.time - SSticker.round_start_time < 6000
// this is broken and does not work. Thanks TG
// /datum/map_template/shuttle/emergency/airless/post_load()
// . = ..()
// //enable buying engines from cargo
// var/datum/supply_pack/P = SSshuttle.supply_packs[/datum/supply_pack/engineering/shuttle_engine]
// P.special_enabled = TRUE
/datum/map_template/shuttle/emergency/construction/post_load()
. = ..()
//enable buying engines from cargo
var/datum/supply_pack/P = SSshuttle.supply_packs[/datum/supply_pack/engineering/shuttle_engine]
P.special_enabled = TRUE
/datum/map_template/shuttle/emergency/asteroid
+3
View File
@@ -34,3 +34,6 @@
/datum/skill_modifier/job/level/wiring/basic
level_mod = JOB_SKILL_BASIC
/datum/skill_modifier/job/level/dwarfy/blacksmithing
target_skills = /datum/skill/level/dwarfy/blacksmithing
+95
View File
@@ -768,3 +768,98 @@
M.dna.species.punchdamagelow -= damageboost
M.dna.species.punchwoundbonus -= woundboost
to_chat(M, "<span class='notice'>You calm yourself, and your unnatural strength dissipates.</span>")
/datum/status_effect/crucible_soul
id = "Blessing of Crucible Soul"
status_type = STATUS_EFFECT_REFRESH
duration = 15 SECONDS
examine_text = "<span class='notice'>They don't seem to be all here.</span>"
alert_type = /obj/screen/alert/status_effect/crucible_soul
var/turf/location
/datum/status_effect/crucible_soul/on_apply()
. = ..()
to_chat(owner,"<span class='notice'>You phase through reality, nothing is out of bounds!</span>")
owner.alpha = 180
owner.pass_flags |= PASSCLOSEDTURF | PASSGLASS | PASSGRILLE | PASSTABLE | PASSMOB
location = get_turf(owner)
/datum/status_effect/crucible_soul/on_remove()
to_chat(owner,"<span class='notice'>You regain your physicality, returning you to your original location...</span>")
owner.alpha = initial(owner.alpha)
owner.pass_flags &= ~(PASSCLOSEDTURF | PASSGLASS | PASSGRILLE | PASSTABLE | PASSMOB)
owner.forceMove(location)
location = null
return ..()
/datum/status_effect/duskndawn
id = "Blessing of Dusk and Dawn"
status_type = STATUS_EFFECT_REFRESH
duration = 60 SECONDS
alert_type =/obj/screen/alert/status_effect/duskndawn
/datum/status_effect/duskndawn/on_apply()
. = ..()
ADD_TRAIT(owner,TRAIT_XRAY_VISION,type)
owner.update_sight()
/datum/status_effect/duskndawn/on_remove()
REMOVE_TRAIT(owner,TRAIT_XRAY_VISION,type)
owner.update_sight()
return ..()
/datum/status_effect/marshal
id = "Blessing of Wounded Soldier"
status_type = STATUS_EFFECT_REFRESH
duration = 60 SECONDS
tick_interval = 1 SECONDS
alert_type = /obj/screen/alert/status_effect/marshal
/datum/status_effect/marshal/on_apply()
. = ..()
ADD_TRAIT(owner,TRAIT_IGNOREDAMAGESLOWDOWN,type)
/datum/status_effect/marshal/on_remove()
. = ..()
REMOVE_TRAIT(owner,TRAIT_IGNOREDAMAGESLOWDOWN,type)
/datum/status_effect/marshal/tick()
. = ..()
if(!iscarbon(owner))
return
var/mob/living/carbon/carbie = owner
for(var/BP in carbie.bodyparts)
var/obj/item/bodypart/part = BP
for(var/W in part.wounds)
var/datum/wound/wound = W
var/heal_amt = 0
switch(wound.severity)
if(WOUND_SEVERITY_MODERATE)
heal_amt = 1
if(WOUND_SEVERITY_SEVERE)
heal_amt = 3
if(WOUND_SEVERITY_CRITICAL)
heal_amt = 6
if(wound.wound_type == WOUND_BURN)
carbie.adjustFireLoss(-heal_amt)
else
carbie.adjustBruteLoss(-heal_amt)
carbie.blood_volume += carbie.blood_volume >= BLOOD_VOLUME_NORMAL ? 0 : heal_amt*3
/obj/screen/alert/status_effect/crucible_soul
name = "Blessing of Crucible Soul"
desc = "You phased through the reality, you are halfway to your final destination..."
icon_state = "crucible"
/obj/screen/alert/status_effect/duskndawn
name = "Blessing of Dusk and Dawn"
desc = "Many things hide beyond the horizon, with Owl's help i managed to slip past sun's guard and moon's watch."
icon_state = "duskndawn"
/obj/screen/alert/status_effect/marshal
name = "Blessing of Wounded Soldier"
desc = "Some people seek power through redemption, one thing many people don't know is that battle is the ultimate redemption and wounds let you bask in eternal glory."
icon_state = "wounded_soldier"
+34 -2
View File
@@ -117,6 +117,12 @@
desc = "You've fallen asleep. Wait a bit and you should wake up. Unless you don't, considering how helpless you are."
icon_state = "asleep"
/datum/status_effect/grouped/stasis
id = "stasis"
duration = -1
tick_interval = 10
var/last_dead_time
/datum/status_effect/no_combat_mode
id = "no_combat_mode"
alert_type = null
@@ -498,6 +504,32 @@
I.take_damage(100)
return ..()
/datum/status_effect/eldritch/void
id = "void_mark"
effect_sprite = "emark4"
/datum/status_effect/eldritch/void/on_effect()
var/turf/open/turfie = get_turf(owner)
turfie.TakeTemperature(-40)
owner.adjust_bodytemperature(-60)
return ..()
/datum/status_effect/domain
id = "domain"
alert_type = null
var/movespeed_mod = /datum/movespeed_modifier/status_effect/domain
/datum/status_effect/domain/on_creation(mob/living/new_owner, set_duration)
if(isliving(owner))
var/mob/living/carbon/C = owner
C.add_movespeed_modifier(movespeed_mod)
/datum/status_effect/electrode/on_remove()
if(isliving(owner))
var/mob/living/carbon/C = owner
C.remove_movespeed_modifier(movespeed_mod)
. = ..()
/datum/status_effect/corrosion_curse
id = "corrosion_curse"
status_type = STATUS_EFFECT_REPLACE
@@ -506,7 +538,7 @@
/datum/status_effect/corrosion_curse/on_creation(mob/living/new_owner, ...)
. = ..()
to_chat(owner, "<span class='danger'>Your feel your body starting to break apart...</span>")
to_chat(owner, "<span class='danger'>You feel your body starting to break apart...</span>")
/datum/status_effect/corrosion_curse/tick()
. = ..()
@@ -577,7 +609,7 @@
/datum/status_effect/amok/on_apply(mob/living/afflicted)
. = ..()
to_chat(owner, "<span class='boldwarning'>Your feel filled with a rage that is not your own!</span>")
to_chat(owner, "<span class='boldwarning'>You feel filled with a rage that is not your own!</span>")
/datum/status_effect/amok/tick()
. = ..()
-16
View File
@@ -219,19 +219,3 @@
/datum/quirk/night_vision/on_spawn()
var/mob/living/carbon/human/H = quirk_holder
H.update_sight()
/datum/quirk/multilingual
name = "Multi-Lingual"
desc = "You spent a portion of your life learning to understand an additional language. You may or may not be able to speak it based on your anatomy."
value = 1
mob_trait = TRAIT_MULTILINGUAL
gain_text = "You've learned an extra language!"
lose_text = "You've forgotten your extra language."
/datum/quirk/multilingual/post_add()
var/mob/living/carbon/human/H = quirk_holder
H.grant_language(H.client.prefs.language, TRUE, TRUE, LANGUAGE_MULTILINGUAL)
/datum/quirk/multilingual/remove()
var/mob/living/carbon/human/H = quirk_holder
H.remove_language(H.client.prefs.language, TRUE, TRUE, LANGUAGE_MULTILINGUAL)
+1 -1
View File
@@ -153,7 +153,7 @@ GLOBAL_LIST_EMPTY(family_heirlooms)
name = "Light Sensitivity"
desc = "Bright lights irritate you. Your eyes start to water, your skin feels itchy against the photon radiation, and your hair gets dry and frizzy. Maybe it's a medical condition. If only Nanotrasen was more considerate of your needs..."
value = -1
gain_text = "<span class='danger'>The safty of light feels off...</span>"
gain_text = "<span class='danger'>Bright lights seem irritating.</span>"
lose_text = "<span class='notice'>Enlightening.</span>"
medical_record_text = "Despite my warnings, the patient refuses turn on the lights, only to end up rolling down a full flight of stairs and into the cellar."
+8 -5
View File
@@ -58,13 +58,13 @@
/// The list of z-levels that this weather is actively affecting
var/impacted_z_levels
/// Since it's above everything else, this is the layer used by default. TURF_LAYER is below mobs and walls if you need to use that.
var/overlay_layer = AREA_LAYER
/// Since it's above everything else, this is the layer used by default. TURF_LAYER is below mobs and walls if you need to use that.
var/overlay_layer = AREA_LAYER
/// Plane for the overlay
var/overlay_plane = BLACKNESS_PLANE
/// If the weather has no purpose but aesthetics.
/// If the weather has no purpose but aesthetics.
var/aesthetic = FALSE
/// Used by mobs to prevent them from being affected by the weather
/// Used by mobs to prevent them from being affected by the weather
var/immunity_type = "storm"
/// The stage of the weather, from 1-4
@@ -79,6 +79,8 @@
var/barometer_predictable = FALSE
/// For barometers to know when the next storm will hit
var/next_hit_time = 0
/// This causes the weather to only end if forced to
var/perpetual = FALSE
/datum/weather/New(z_levels)
..()
@@ -140,7 +142,8 @@
to_chat(M, weather_message)
if(weather_sound)
SEND_SOUND(M, sound(weather_sound))
addtimer(CALLBACK(src, .proc/wind_down), weather_duration)
if(!perpetual)
addtimer(CALLBACK(src, .proc/wind_down), weather_duration)
/**
* Weather enters the winding down phase, stops effects
@@ -0,0 +1,31 @@
/datum/weather/void_storm
name = "void storm"
desc = "A rare and highly anomalous event often accompanied by unknown entities shredding spacetime continouum. We'd advise you to start running."
telegraph_duration = 2 SECONDS
telegraph_overlay = "void"
weather_message = "<span class='danger'><i>You feel air around you getting colder... and void's sweet embrace...</i></span>"
weather_overlay = "void_storm"
weather_duration_lower = 60 SECONDS
weather_duration_upper = 120 SECONDS
end_duration = 10 SECONDS
area_type = /area
protect_indoors = FALSE
target_trait = ZTRAIT_VOIDSTORM
immunity_type = "void"
barometer_predictable = FALSE
perpetual = TRUE
/datum/weather/void_storm/weather_act(mob/living/L)
if(IS_HERETIC(L) || IS_HERETIC_MONSTER(L))
return
L.adjustOxyLoss(rand(1,3))
L.adjustFireLoss(rand(1,3))
L.adjust_blurriness(rand(0,1))
L.adjust_bodytemperature(-rand(5,15))
+1
View File
@@ -331,6 +331,7 @@
return
. = anchored
anchored = anchorvalue
SEND_SIGNAL(src, COMSIG_OBJ_SETANCHORED, anchorvalue)
// SEND_SIGNAL(src, COMSIG_MOVABLE_SET_ANCHORED, anchorvalue)
/atom/movable/proc/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
@@ -24,6 +24,7 @@
traitor_name = "Bloodsucker"
antag_flag = ROLE_BLOODSUCKER
false_report_weight = 1
chaos = 4
restricted_jobs = list("AI","Cyborg")
protected_jobs = list("Chaplain", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
required_players = 20
@@ -6,6 +6,7 @@
name = "traitor+brothers"
config_tag = "traitorbro"
required_players = 25
chaos = 5
restricted_jobs = list("AI", "Cyborg")
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
@@ -10,6 +10,7 @@ GLOBAL_VAR(changeling_team_objective_type) //If this is not null, we hand our th
config_tag = "changeling"
antag_flag = ROLE_CHANGELING
false_report_weight = 10
chaos = 5
restricted_jobs = list("AI", "Cyborg")
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") //citadel change - adds HoP, CE, CMO, and RD to ling role blacklist
required_players = 15
@@ -2,6 +2,7 @@
name = "traitor+changeling"
config_tag = "traitorchan"
false_report_weight = 10
chaos = 6
traitors_possible = 3 //hard limit on traitors if scaling is turned off
restricted_jobs = list("AI", "Cyborg")
required_players = 25
@@ -134,6 +134,7 @@ Credit where due:
config_tag = "clockwork_cult"
antag_flag = ROLE_SERVANT_OF_RATVAR
false_report_weight = 10
chaos = 8
required_players = 24 //Fixing this directly for now since apparently config machine for forcing modes broke.
required_enemies = 3
recommended_enemies = 5
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/game_mode/nuclear/clown_ops
name = "clown ops"
config_tag = "clownops"
chaos = 8
announce_span = "danger"
announce_text = "Clown empire forces are approaching the station in an attempt to HONK it!\n\
<span class='danger'>Operatives</span>: Secure the nuclear authentication disk and use your bananium fission explosive to HONK the station.\n\
+1
View File
@@ -38,6 +38,7 @@
config_tag = "cult"
antag_flag = ROLE_CULTIST
false_report_weight = 10
chaos = 8
restricted_jobs = list("AI", "Cyborg")
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
required_players = 30
@@ -1,6 +1,7 @@
/datum/game_mode/devil/devil_agents
name = "Devil Agents"
config_tag = "devil_agents"
chaos = 5
required_players = 25
required_enemies = 3
recommended_enemies = 8
@@ -3,6 +3,7 @@
config_tag = "devil"
antag_flag = ROLE_DEVIL
false_report_weight = 1
chaos = 3
protected_jobs = list("Lawyer", "Curator", "Chaplain", "Head of Security", "Captain", "AI")
required_players = 0
required_enemies = 1
@@ -3,6 +3,7 @@
config_tag = "heresy"
antag_flag = ROLE_HERETIC
false_report_weight = 5
chaos = 5
restricted_jobs = list("AI", "Cyborg")
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") //citadel change - adds HoP, CE, CMO, and RD to heretic role blacklist
required_players = 15
+1
View File
@@ -3,6 +3,7 @@
config_tag = "secret_extended"
false_report_weight = 5
required_players = 0
chaos = 0
announce_span = "notice"
announce_text = "Just have fun and enjoy the game!"
+9 -1
View File
@@ -17,6 +17,7 @@
var/config_tag = null
var/votable = 1
var/probability = 0
var/chaos = 5 // 0-9, used for weighting round-to-round
var/false_report_weight = 0 //How often will this show up incorrectly in a centcom report?
var/station_was_nuked = 0 //see nuclearbomb.dm and malfunction.dm
var/nuke_off_station = 0 //Used for tracking where the nuke hit
@@ -419,7 +420,7 @@
for(var/mob/dead/new_player/player in players)
if(player.client && player.ready == PLAYER_READY_TO_PLAY)
if(role in player.client.prefs.be_special)
if((role in player.client.prefs.be_special) && (ROLE_SYNDICATE in player.client.prefs.be_special))
if(!jobban_isbanned(player, ROLE_SYNDICATE) && !QDELETED(player) && !jobban_isbanned(player, role) && !QDELETED(player)) //Nodrak/Carn: Antag Job-bans
if(age_check(player.client)) //Must be older than the minimum age
candidates += player.mind // Get a list of all the people who want to be the antagonist for this round
@@ -623,3 +624,10 @@
/// Mode specific info for ghost game_info
/datum/game_mode/proc/ghost_info()
return
/datum/game_mode/proc/get_chaos()
var/chaos_levels = CONFIG_GET(keyed_list/chaos_level)
if(config_tag in chaos_levels)
return chaos_levels[config_tag]
else
return chaos
+1
View File
@@ -6,6 +6,7 @@ GLOBAL_LIST_EMPTY(gangs)
name = "gang war"
config_tag = "gang"
antag_flag = ROLE_GANG
chaos = 9
restricted_jobs = list("AI", "Cyborg")
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
required_players = 15
+1
View File
@@ -2,6 +2,7 @@
name = "meteor"
config_tag = "meteor"
false_report_weight = 1
chaos = 9
var/meteordelay = 2000
var/nometeors = 0
var/rampupdelta = 5
+1
View File
@@ -11,6 +11,7 @@
required_players = 20
required_enemies = 1
recommended_enemies = 1
chaos = 9
restricted_jobs = list("Cyborg", "AI")
+1
View File
@@ -2,6 +2,7 @@
name = "nuclear emergency"
config_tag = "nuclear"
false_report_weight = 10
chaos = 9
required_players = 28 // 30 players - 3 players to be the nuke ops = 25 players remaining
required_enemies = 2
recommended_enemies = 5
@@ -3,6 +3,7 @@
name = "overthrow"
config_tag = "overthrow"
antag_flag = ROLE_OVERTHROW
chaos = 5
restricted_jobs = list("AI", "Cyborg")
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
required_players = 20 // the core idea is of a swift, bloodless coup, so it shouldn't be as chaotic as revs.

Some files were not shown because too many files have changed in this diff Show More