cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 05:57:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Port over Lavaland mobs and turfs (not finished)

Browse Source
This commit is contained in:
Mark van Alphen
2019-03-29 23:45:36 +01:00
parent 78e8ca9147
commit fb337f2825
58 changed files with 1351 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/MetaStation/z4.dmm
+3 -3
View File
@@ -4196,7 +4196,7 @@
/obj/item/shard{
icon_state = "small"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/space)
"lF" = (
/obj/structure/window/basic{
@@ -4222,7 +4222,7 @@
/obj/structure/chair{
dir = 8
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/space)
"lJ" = (
/obj/machinery/vending/sovietsoda,
@@ -5375,7 +5375,7 @@
/turf/simulated/mineral/random,
/area/space)
"ps" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/space)
(1,1,1) = {"
_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm
+6 -6
View File
@@ -81,11 +81,11 @@
/turf/simulated/mineral,
/area/ruin/unpowered)
"ai" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/unpowered)
"aj" = (
/obj/structure/flora/rock,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/unpowered)
"ak" = (
/obj/structure/grille,
@@ -123,7 +123,7 @@
/mob/living/simple_animal/hostile/asteroid/goldgrub{
will_burrow = 0
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/unpowered)
"aq" = (
/obj/structure/flora/ausbushes/grassybush,
@@ -131,11 +131,11 @@
/area/ruin/unpowered)
"ar" = (
/obj/structure/flora/rock/pile,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/unpowered)
"as" = (
/mob/living/simple_animal/hostile/asteroid/basilisk,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/unpowered)
"at" = (
/turf/simulated/wall/r_wall,
@@ -152,7 +152,7 @@
"aw" = (
/obj/structure/flora/rock,
/obj/machinery/light,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/unpowered)
"ax" = (
/obj/structure/table/reinforced,
_maps/map_files/RandomRuins/SpaceRuins/asteroid1.dmm
+1 -1
View File
@@ -3,7 +3,7 @@
/turf/space,
/area/space)
"b" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/unpowered)
"c" = (
/turf/simulated/mineral/random/high_chance,
_maps/map_files/RandomRuins/SpaceRuins/asteroid2.dmm
+1 -1
View File
@@ -3,7 +3,7 @@
/turf/space,
/area/space)
"b" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/unpowered)
"c" = (
/turf/simulated/mineral,
_maps/map_files/RandomRuins/SpaceRuins/asteroid3.dmm
+3 -3
View File
@@ -3,7 +3,7 @@
/turf/space,
/area/space)
"b" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/unpowered)
"c" = (
/turf/simulated/mineral,
@@ -13,11 +13,11 @@
/area/ruin/unpowered)
"e" = (
/obj/effect/decal/remains/human,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/unpowered)
"f" = (
/obj/item/pickaxe/diamond,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/unpowered)
(1,1,1) = {"
_maps/map_files/RandomRuins/SpaceRuins/asteroid4.dmm
+1 -1
View File
@@ -9,7 +9,7 @@
/turf/simulated/mineral/random/high_chance,
/area/ruin/unpowered)
"d" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/unpowered)
"e" = (
/turf/simulated/mineral/clown,
_maps/map_files/RandomRuins/SpaceRuins/asteroid5.dmm
+1 -1
View File
@@ -9,7 +9,7 @@
/turf/simulated/mineral/random/high_chance,
/area/ruin/unpowered)
"d" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/unpowered)
(1,1,1) = {"
_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
+1 -1
View File
@@ -868,7 +868,7 @@
/turf/simulated/floor/plating,
/area/ruin/unpowered)
"ce" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/unpowered)
(1,1,1) = {"
_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm
+1 -1
View File
@@ -6,7 +6,7 @@
/turf/simulated/mineral,
/area/ruin/unpowered)
"c" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/unpowered)
"d" = (
/turf/simulated/mineral/random/high_chance,
_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
+3 -3
View File
@@ -9,7 +9,7 @@
/turf/simulated/mineral,
/area/space)
"d" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/unpowered)
"e" = (
/turf/simulated/wall,
@@ -58,14 +58,14 @@
"p" = (
/obj/structure/barricade/wooden,
/obj/machinery/door/airlock/external,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/unpowered)
"q" = (
/obj/machinery/door/airlock/external,
/turf/simulated/floor/plating,
/area/ruin/unpowered)
"r" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/space)
(1,1,1) = {"
_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm
+2 -2
View File
@@ -9,10 +9,10 @@
/turf/simulated/mineral,
/area/ruin/unpowered)
"d" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/unpowered)
"e" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/powered)
"f" = (
/turf/simulated/wall/r_wall,
_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
+7 -7
View File
@@ -6,7 +6,7 @@
/turf/simulated/mineral,
/area/space)
"ac" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/space)
"ad" = (
/obj/structure/grille,
@@ -22,18 +22,18 @@
/turf/simulated/floor/plating,
/area/ruin/powered)
"ag" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/powered)
"ah" = (
/obj/structure/grille,
/obj/structure/window/full/reinforced,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/powered)
"ai" = (
/turf/simulated/mineral,
/area/ruin/powered)
"aj" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/turf/simulated/shuttle/wall{
icon_state = "swall_f6";
dir = 2
@@ -45,7 +45,7 @@
/turf/simulated/floor/plating,
/area/ruin/powered)
"al" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/turf/simulated/shuttle/wall{
dir = 2;
icon_state = "swall_f10";
@@ -443,7 +443,7 @@
/area/ruin/powered)
"bp" = (
/obj/structure/shuttle/engine/propulsion/burst,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/turf/simulated/shuttle/wall{
icon_state = "swall_f5";
dir = 2
@@ -465,7 +465,7 @@
/area/ruin/powered)
"bs" = (
/obj/structure/shuttle/engine/propulsion/burst,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/turf/simulated/shuttle/wall{
icon_state = "swall_f9";
dir = 2
_maps/map_files/RandomRuins/SpaceRuins/way_home.dmm
+2 -2
View File
@@ -6,13 +6,13 @@
/turf/simulated/mineral/random,
/area/ruin/unpowered/no_grav/way_home)
"c" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/unpowered/no_grav/way_home)
"d" = (
/obj/structure/signpost{
name = "salvation"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/unpowered/no_grav/way_home)
(1,1,1) = {"
_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm
+1 -1
View File
@@ -3,7 +3,7 @@
/turf/space,
/area/space)
"ab" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/unpowered)
"ac" = (
/turf/simulated/mineral,
_maps/map_files/RandomZLevels/blackmarketpackers.dmm
+6 -6
View File
@@ -6,11 +6,11 @@
/turf/simulated/mineral/random/high_chance,
/area/awaymission)
"ac" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaymission)
"ad" = (
/obj/effect/mob_spawn/human/doctor,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaymission)
"ae" = (
/obj/item/circular_saw,
@@ -3007,7 +3007,7 @@
/turf/simulated/floor/plating/airless,
/area/awaymission/BMPship/Fore)
"hC" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaymission/BMPship/Fore)
"hD" = (
/obj/structure/rack,
@@ -3017,7 +3017,7 @@
/obj/machinery/light/small{
dir = 1
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaymission/BMPship/Fore)
"hF" = (
/turf/simulated/shuttle/wall,
@@ -3174,7 +3174,7 @@
/obj/effect/landmark{
name = "awaystart"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaymission)
"ic" = (
/obj/structure/bed,
@@ -3455,7 +3455,7 @@
/area/awaymission)
"iS" = (
/mob/living/simple_animal/hostile/carp,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaymission)
"iT" = (
/turf/simulated/floor/plating,
_maps/map_files/RandomZLevels/moonoutpost19.dmm
+76 -76
View File
@@ -29,7 +29,7 @@
"ac" = (
/obj/structure/alien/weeds,
/obj/structure/alien/resin/wall,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -44,7 +44,7 @@
icon_state = "weeds1"
},
/obj/structure/alien/resin/wall,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -61,7 +61,7 @@
icon_state = "egg_hatched";
name = "egg"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -76,7 +76,7 @@
icon_state = "weeds2"
},
/obj/structure/alien/resin/wall,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -95,7 +95,7 @@
icon_state = "egg_hatched";
name = "egg"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -107,7 +107,7 @@
})
"ah" = (
/obj/structure/alien/weeds,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -122,7 +122,7 @@
icon_state = "weeds2"
},
/mob/living/simple_animal/hostile/alien,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -135,7 +135,7 @@
"aj" = (
/obj/structure/alien/weeds,
/obj/structure/bed/nest,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -154,7 +154,7 @@
icon_state = "egg_hatched";
name = "egg"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -169,7 +169,7 @@
icon_state = "weeds1"
},
/obj/structure/bed/nest,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -181,7 +181,7 @@
})
"am" = (
/obj/structure/alien/weeds/node,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -196,7 +196,7 @@
icon_state = "weeds2"
},
/obj/structure/bed/nest,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -210,7 +210,7 @@
/obj/structure/alien/weeds{
icon_state = "weeds1"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -233,7 +233,7 @@
color = "red";
icon_state = "gib1_flesh"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -247,7 +247,7 @@
/obj/structure/alien/weeds{
icon_state = "weeds2"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -263,7 +263,7 @@
},
/obj/structure/alien/resin/wall,
/obj/structure/alien/resin/wall,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -287,7 +287,7 @@
color = "red";
icon_state = "gib1_flesh"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -302,7 +302,7 @@
icon_state = "weeds2"
},
/mob/living/simple_animal/hostile/alien/sentinel,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -318,7 +318,7 @@
color = "red";
icon_state = "gib2_flesh"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -333,7 +333,7 @@
/obj/effect/decal/cleanable/blood{
color = "red"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -395,7 +395,7 @@
"aC" = (
/obj/structure/alien/weeds/node,
/obj/structure/alien/resin/wall,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -423,7 +423,7 @@
color = "red";
icon_state = "gibdown1_flesh"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -493,7 +493,7 @@
color = "red";
icon_state = "gib1_flesh"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -511,7 +511,7 @@
color = "red";
icon_state = "gib2_flesh"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -531,7 +531,7 @@
/obj/effect/decal/cleanable/blood{
color = "red"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -546,7 +546,7 @@
/mob/living/simple_animal/hostile/alien/drone{
plants_off = 1
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -619,7 +619,7 @@
pixel_x = 7;
pixel_y = -6
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -638,7 +638,7 @@
pixel_x = -16;
plants_off = 1
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -714,7 +714,7 @@
name = "Syndicate Outpost"
})
"aZ" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -732,7 +732,7 @@
/mob/living/simple_animal/hostile/alien/drone{
plants_off = 1
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -747,7 +747,7 @@
/obj/effect/decal/cleanable/blood{
color = "red"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -838,7 +838,7 @@
/obj/effect/decal/cleanable/blood{
color = "red"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -851,7 +851,7 @@
"bj" = (
/obj/structure/alien/weeds,
/mob/living/simple_animal/hostile/alien/sentinel,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -869,7 +869,7 @@
color = "red";
icon_state = "gib2_flesh"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -1350,7 +1350,7 @@
"bW" = (
/obj/structure/alien/weeds/node,
/mob/living/simple_animal/hostile/alien,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -2150,7 +2150,7 @@
/mob/living/simple_animal/hostile/alien/drone{
plants_off = 1
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -2401,7 +2401,7 @@
pixel_x = -7;
pixel_y = -4
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -2453,7 +2453,7 @@
pixel_x = -3;
pixel_y = 9
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -2525,7 +2525,7 @@
icon = 'icons/effects/blood.dmi';
icon_state = "tracks"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -2542,7 +2542,7 @@
on = 1
},
/obj/effect/decal/cleanable/blood/splatter,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -2562,7 +2562,7 @@
icon = 'icons/effects/blood.dmi';
icon_state = "tracks"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -2586,7 +2586,7 @@
})
"dI" = (
/obj/item/storage/bag/ore,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -2599,7 +2599,7 @@
})
"dJ" = (
/obj/item/pickaxe/drill,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -2644,7 +2644,7 @@
pixel_x = -7;
pixel_y = -4
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -2676,7 +2676,7 @@
icon = 'icons/effects/blood.dmi';
icon_state = "tracks"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -2697,7 +2697,7 @@
icon = 'icons/effects/blood.dmi';
icon_state = "tracks"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -2709,7 +2709,7 @@
})
"dP" = (
/obj/structure/alien/weeds/node,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -2723,7 +2723,7 @@
"dQ" = (
/obj/structure/alien/weeds,
/obj/structure/alien/resin/wall,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -2739,7 +2739,7 @@
icon_state = "weeds2"
},
/obj/structure/alien/resin/wall,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -2760,7 +2760,7 @@
/mob/living/simple_animal/hostile/alien/drone{
plants_off = 1
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
@@ -2772,7 +2772,7 @@
})
"dT" = (
/obj/structure/alien/weeds,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -2786,7 +2786,7 @@
"dU" = (
/obj/structure/alien/weeds/node,
/obj/structure/alien/resin/wall,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -2801,7 +2801,7 @@
/obj/structure/alien/weeds{
icon_state = "weeds2"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -2817,7 +2817,7 @@
icon_state = "weeds1"
},
/obj/structure/alien/resin/wall,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -2832,7 +2832,7 @@
/obj/structure/alien/weeds{
icon_state = "weeds1"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -2845,7 +2845,7 @@
})
"dY" = (
/obj/machinery/light/small,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a2{
has_gravity = 1;
name = "MO19 Research"
@@ -5694,7 +5694,7 @@
})
"hW" = (
/obj/machinery/light/small,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -6443,7 +6443,7 @@
"jb" = (
/obj/item/stack/rods,
/obj/item/shard,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -6762,7 +6762,7 @@
/obj/structure/alien/weeds{
icon_state = "weeds2"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -6778,7 +6778,7 @@
/obj/structure/alien/weeds{
icon_state = "weeds2"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -6794,7 +6794,7 @@
icon_state = "weeds2"
},
/obj/structure/alien/weeds/node,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -7836,7 +7836,7 @@
name = "MO19 Arrivals"
})
"ld" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/turf/simulated/shuttle/wall{
tag = "icon-swall_f6";
icon_state = "swall_f6";
@@ -7856,7 +7856,7 @@
name = "MO19 Arrivals"
})
"lf" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/turf/simulated/shuttle/wall{
dir = 3;
icon_state = "swall_f10";
@@ -7908,7 +7908,7 @@
/obj/machinery/light/small{
dir = 1
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -7918,7 +7918,7 @@
/obj/item/shard{
icon_state = "small"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -8170,7 +8170,7 @@
icon_state = "burst_r";
tag = "icon-burst_r (WEST)"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -8467,7 +8467,7 @@
icon_state = "burst_l";
tag = "icon-burst_l (WEST)"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -8872,7 +8872,7 @@
/obj/machinery/light/small{
dir = 8
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -9045,7 +9045,7 @@
name = "MO19 Arrivals"
})
"ne" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/turf/simulated/shuttle/wall{
icon_state = "swall_f5";
dir = 2
@@ -9226,7 +9226,7 @@
name = "MO19 Arrivals"
})
"nw" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/turf/simulated/shuttle/wall{
icon_state = "swall_f9";
dir = 2
@@ -9323,7 +9323,7 @@
icon = 'icons/effects/blood.dmi';
icon_state = "tracks"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -9641,7 +9641,7 @@
/obj/item/shard{
icon_state = "small"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -9654,7 +9654,7 @@
})
"of" = (
/obj/item/trash/candy,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -9681,7 +9681,7 @@
})
"oh" = (
/obj/item/pickaxe,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -9739,7 +9739,7 @@
/obj/machinery/light/small{
dir = 8
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
@@ -9754,7 +9754,7 @@
/obj/machinery/light/small{
dir = 1
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
always_unpowered = 1;
ambientsounds = list('sound/ambience/ambimine.ogg');
_maps/map_files/RandomZLevels/spacebattle.dmm
+1 -1
View File
@@ -2857,7 +2857,7 @@
/turf/space,
/area/awaymission/spacebattle/syndicate6)
"jc" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/space)
"jd" = (
/turf/simulated/wall/mineral/plasma,
_maps/map_files/RandomZLevels/spacehotel.dmm
+12 -12
View File
@@ -20,7 +20,7 @@
},
/area/awaymission/beach)
"ad" = (
/turf/unsimulated/floor/lava/dense,
/turf/simulated/floor/plating/lava/smooth,
/area/awaymission)
"ae" = (
/turf/unsimulated/wall/metal,
@@ -860,7 +860,7 @@
/turf/unsimulated/beach/sand,
/area/awaymission/beach)
"bD" = (
/turf/unsimulated/floor/lava,
/turf/simulated/floor/plating/lava/smooth,
/area/awaymission)
"bE" = (
/obj/effect/decal{
@@ -1587,7 +1587,7 @@
/turf/unsimulated/beach/coastline/dense,
/area/awaymission/beach)
"cO" = (
/turf/unsimulated/floor/chasm,
/turf/simulated/floor/chasm,
/area/awaymission)
"cP" = (
/obj/effect/decal/snow/sand/edge{
@@ -1828,7 +1828,7 @@
requires_power = 0
})
"dk" = (
/turf/unsimulated/floor/chasm,
/turf/simulated/floor/chasm,
/area/awaymission{
name = "Snowland";
requires_power = 0
@@ -1879,7 +1879,7 @@
icon = 'icons/turf/mining.dmi';
icon_state = "rock_side_w"
},
/turf/unsimulated/floor/chasm,
/turf/simulated/floor/chasm,
/area/awaymission{
name = "Snowland";
requires_power = 0
@@ -1890,7 +1890,7 @@
light_color = "#ffffc0";
light_power = 2
},
/turf/unsimulated/floor/chasm,
/turf/simulated/floor/chasm,
/area/awaymission{
name = "Snowland";
requires_power = 0
@@ -1906,7 +1906,7 @@
icon = 'icons/turf/mining.dmi';
icon_state = "rock_side_e"
},
/turf/unsimulated/floor/chasm,
/turf/simulated/floor/chasm,
/area/awaymission{
name = "Snowland";
requires_power = 0
@@ -1949,7 +1949,7 @@
icon = 'icons/turf/mining.dmi';
icon_state = "rock_side_n"
},
/turf/unsimulated/floor/chasm,
/turf/simulated/floor/chasm,
/area/awaymission{
name = "Snowland";
requires_power = 0
@@ -1965,7 +1965,7 @@
icon = 'icons/turf/mining.dmi';
icon_state = "rock_side_e"
},
/turf/unsimulated/floor/chasm,
/turf/simulated/floor/chasm,
/area/awaymission{
name = "Snowland";
requires_power = 0
@@ -1981,7 +1981,7 @@
icon = 'icons/turf/mining.dmi';
icon_state = "rock_side_n"
},
/turf/unsimulated/floor/chasm,
/turf/simulated/floor/chasm,
/area/awaymission{
name = "Snowland";
requires_power = 0
@@ -2049,7 +2049,7 @@
},
/area/awaymission)
"dF" = (
/turf/unsimulated/floor/lava,
/turf/simulated/floor/plating/lava/smooth,
/area/awaymission{
name = "Snowland";
requires_power = 0
@@ -2063,7 +2063,7 @@
/turf/unsimulated/beach/water/drop/dense,
/area/awaymission/beach)
"dH" = (
/turf/unsimulated/floor/lava/dense,
/turf/simulated/floor/plating/lava/smooth,
/area/awaymission{
name = "Snowland";
requires_power = 0
_maps/map_files/RandomZLevels/terrorspiders.dmm
+3 -3
View File
@@ -11152,7 +11152,7 @@
/turf/simulated/wall,
/area/awaymission/UO71/medical)
"uW" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaymission/UO71/outside)
"uX" = (
/obj/structure/cable{
@@ -11633,7 +11633,7 @@
/obj/structure/disposalpipe/trunk{
dir = 4
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaymission/UO71/outside)
"vV" = (
/obj/machinery/computer/monitor,
@@ -13391,7 +13391,7 @@
/area/awaymission/UO71/loot)
"zr" = (
/obj/structure/glowshroom/single,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaymission/UO71/outside)
"zs" = (
/turf/simulated/floor/carpet,
_maps/map_files/RandomZLevels/undergroundoutpost45.dmm
+55 -55
View File
@@ -1088,7 +1088,7 @@
icon = 'icons/effects/blood.dmi';
icon_state = "tracks"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -1102,7 +1102,7 @@
/obj/structure/alien/weeds,
/obj/structure/bed/nest,
/obj/effect/mob_spawn/human/miner,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -2775,7 +2775,7 @@
"eK" = (
/obj/structure/alien/weeds,
/obj/structure/alien/resin/wall,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -3177,7 +3177,7 @@
name = "UO45 Central Hall"
})
"fo" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -3470,7 +3470,7 @@
icon = 'icons/effects/blood.dmi';
icon_state = "tracks"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -3714,7 +3714,7 @@
})
"gg" = (
/obj/structure/alien/weeds,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -3936,7 +3936,7 @@
"gC" = (
/obj/structure/alien/resin/wall,
/obj/structure/alien/weeds,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -4283,7 +4283,7 @@
})
"he" = (
/obj/structure/glowshroom/single,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -4297,7 +4297,7 @@
/obj/machinery/light/small{
dir = 8
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a1{
has_gravity = 1;
name = "UO45 Central Hall"
@@ -4333,7 +4333,7 @@
/obj/machinery/light/small{
dir = 1
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a1{
has_gravity = 1;
name = "UO45 Central Hall"
@@ -6044,7 +6044,7 @@
})
"jM" = (
/obj/machinery/light/small,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a2{
has_gravity = 1;
name = "UO45 Crew Quarters"
@@ -6086,7 +6086,7 @@
/obj/machinery/light/small{
dir = 8
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
has_gravity = 1;
name = "UO45 Research"
@@ -8325,7 +8325,7 @@
/obj/machinery/light/small{
dir = 4
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a2{
has_gravity = 1;
name = "UO45 Crew Quarters"
@@ -10502,21 +10502,21 @@
/obj/machinery/light/small{
dir = 8
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a2{
has_gravity = 1;
name = "UO45 Crew Quarters"
})
"pw" = (
/obj/machinery/light/small,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a6{
has_gravity = 1;
name = "UO45 Gateway"
})
"px" = (
/obj/machinery/light/small,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
has_gravity = 1;
name = "UO45 Research"
@@ -10896,7 +10896,7 @@
/obj/machinery/light/small{
dir = 1
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a6{
has_gravity = 1;
name = "UO45 Gateway"
@@ -11215,7 +11215,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/purple{
dir = 4
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -11229,7 +11229,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/purple{
dir = 6
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -11243,7 +11243,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/purple{
dir = 4
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
has_gravity = 1;
name = "UO45 Engineering"
@@ -13959,7 +13959,7 @@
})
"uc" = (
/obj/machinery/atmospherics/pipe/simple/hidden/purple,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -14769,7 +14769,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/purple{
dir = 1
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -15093,7 +15093,7 @@
/obj/machinery/atmospherics/unary/outlet_injector/on{
dir = 4
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a3{
has_gravity = 1;
name = "UO45 Engineering"
@@ -15451,7 +15451,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/purple{
dir = 9
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -16674,7 +16674,7 @@
},
/obj/structure/bed/nest,
/obj/effect/mob_spawn/human/miner,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -16693,7 +16693,7 @@
/obj/effect/decal/cleanable/blood/splatter{
color = "red"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -16707,7 +16707,7 @@
/obj/machinery/light/small{
dir = 1
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a2{
has_gravity = 1;
name = "UO45 Crew Quarters"
@@ -16719,7 +16719,7 @@
/obj/structure/disposalpipe/trunk{
dir = 4
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -16733,7 +16733,7 @@
/obj/machinery/light/small{
dir = 1
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a5{
has_gravity = 1;
name = "UO45 Research"
@@ -16742,7 +16742,7 @@
/obj/machinery/light/small{
dir = 8
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a4{
has_gravity = 1;
name = "UO45 Mining"
@@ -16751,14 +16751,14 @@
/obj/machinery/light/small{
dir = 1
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a4{
has_gravity = 1;
name = "UO45 Mining"
})
"ym" = (
/obj/structure/ore_box,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -16770,7 +16770,7 @@
})
"yn" = (
/obj/structure/closet/crate,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -16786,7 +16786,7 @@
icon_state = "weeds1"
},
/obj/effect/mob_spawn/human/miner,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -16802,7 +16802,7 @@
icon_state = "weeds2"
},
/obj/structure/glowshroom/single,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -16818,7 +16818,7 @@
icon_state = "weeds2"
},
/obj/structure/bed/nest,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -16837,7 +16837,7 @@
color = "red";
icon_state = "gib2_flesh"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -16852,7 +16852,7 @@
tag = "icon-weeds2";
icon_state = "weeds2"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -16867,7 +16867,7 @@
color = "red"
},
/obj/effect/mob_spawn/human/miner,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -16883,7 +16883,7 @@
icon_state = "weeds1"
},
/obj/structure/glowshroom/single,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -16896,7 +16896,7 @@
"yv" = (
/obj/structure/alien/weeds,
/obj/structure/bed/nest,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -16917,7 +16917,7 @@
icon = 'icons/effects/blood.dmi';
icon_state = "tracks"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -16932,7 +16932,7 @@
/obj/effect/decal/cleanable/blood/splatter{
color = "red"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -16947,7 +16947,7 @@
tag = "icon-weeds1";
icon_state = "weeds1"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -16959,7 +16959,7 @@
})
"yz" = (
/obj/structure/alien/resin/membrane,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -16978,7 +16978,7 @@
color = "red"
},
/obj/effect/mob_spawn/human/miner,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -16996,7 +16996,7 @@
/obj/effect/decal/cleanable/blood/splatter{
color = "red"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -17011,7 +17011,7 @@
color = "red";
icon_state = "gib1_flesh"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -17033,7 +17033,7 @@
icon_state = "tracks"
},
/obj/effect/mob_spawn/human/miner,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -17046,7 +17046,7 @@
"yE" = (
/obj/structure/alien/weeds,
/obj/effect/mob_spawn/human/miner,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -17061,7 +17061,7 @@
color = "red";
icon_state = "gibdown1_flesh"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -17083,7 +17083,7 @@
icon = 'icons/effects/blood.dmi';
icon_state = "tracks"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -17102,7 +17102,7 @@
icon = 'icons/effects/blood.dmi';
icon_state = "tracks"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -17116,7 +17116,7 @@
/obj/effect/decal/cleanable/blood/splatter{
color = "red"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
@@ -17132,7 +17132,7 @@
color = "red";
icon_state = "gibdown1_flesh"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaycontent/a7{
always_unpowered = 1;
has_gravity = 1;
_maps/map_files/cyberiad/z3.dmm
+1 -1
View File
@@ -357,7 +357,7 @@
/turf/simulated/mineral/random,
/area/mine/dangerous/explored/golem)
"aJ" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/mine/dangerous/explored/golem)
"aK" = (
/turf/simulated/mineral/random/high_chance,
_maps/map_files/cyberiad/z6.dmm
+21 -21
View File
@@ -5361,7 +5361,7 @@
invisibility = 100;
location = "SDNE"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/syndicate_depot/outer)
"lq" = (
/obj/structure/chair/office/light,
@@ -5467,7 +5467,7 @@
name = "Derelict Annex"
})
"lE" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/turf/simulated/shuttle/wall{
icon_state = "swall_f5";
dir = 2
@@ -5495,7 +5495,7 @@
},
/area/syndicate_depot/outer)
"lK" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/syndicate_depot/outer)
"lL" = (
/turf/simulated/floor/plating/airless,
@@ -5624,7 +5624,7 @@
/obj/effect/landmark{
name = "syndi_depot_bot"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/syndicate_depot/outer)
"mc" = (
/obj/machinery/light{
@@ -5652,11 +5652,11 @@
/area/syndicate_depot/outer)
"mf" = (
/obj/effect/spawner/random_spawners/syndicate/turret/external,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/syndicate_depot/outer)
"mg" = (
/obj/machinery/light,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/syndicate_depot/outer)
"mh" = (
/obj/machinery/light{
@@ -5673,7 +5673,7 @@
dir = 4;
icon_state = "tube1"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/syndicate_depot/outer)
"mj" = (
/obj/machinery/navbeacon/invisible{
@@ -5681,7 +5681,7 @@
invisibility = 100;
location = "SDNW"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/syndicate_depot/outer)
"mk" = (
/obj/structure/table,
@@ -5704,7 +5704,7 @@
/obj/machinery/light{
dir = 8
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/syndicate_depot/outer)
"mo" = (
/obj/item/shard,
@@ -5776,7 +5776,7 @@
},
/area/space)
"my" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/turf/simulated/shuttle/wall{
tag = "icon-swall_f9";
icon_state = "swall_f9";
@@ -5856,7 +5856,7 @@
/turf/simulated/mineral,
/area/space)
"mI" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/space)
"mJ" = (
/obj/effect/decal/cleanable/blood,
@@ -5934,7 +5934,7 @@
/area/syndicate_depot/core)
"mT" = (
/obj/item/shard,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/space)
"mU" = (
/obj/structure/closet/crate,
@@ -5984,7 +5984,7 @@
/obj/item/shard{
icon_state = "small"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/space)
"nc" = (
/obj/item/stack/ore/bananium,
@@ -6266,7 +6266,7 @@
/obj/structure/chair{
dir = 8
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/space)
"nO" = (
/obj/effect/mob_spawn/human/clown/corpse{
@@ -6525,7 +6525,7 @@
dir = 1;
on = 1
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/syndicate_depot/outer)
"oy" = (
/obj/structure/cable{
@@ -6782,7 +6782,7 @@
invisibility = 100;
location = "SDSW"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/syndicate_depot/outer)
"pe" = (
/obj/machinery/power/apc/noalarm{
@@ -6817,7 +6817,7 @@
invisibility = 100;
location = "SDSE"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/syndicate_depot/outer)
"pi" = (
/obj/structure/sign/poster/official/obey,
@@ -6870,7 +6870,7 @@
/area/syndicate_depot/core)
"pq" = (
/obj/effect/spawner/random_spawners/blood_maybe,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/syndicate_depot/core)
"pr" = (
/obj/structure/closet/crate/can,
@@ -6936,13 +6936,13 @@
"pw" = (
/obj/item/candle,
/obj/structure/table,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/syndicate_depot/core)
"px" = (
/obj/structure/chair{
dir = 8
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/syndicate_depot/core)
"py" = (
/obj/structure/chair{
@@ -6972,7 +6972,7 @@
/turf/simulated/floor/plasteel,
/area/derelict/crew_quarters)
"pC" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/syndicate_depot/core)
"pD" = (
/obj/structure/falsewall,
_maps/map_files/generic/z5.dmm
+14 -14
View File
@@ -18,7 +18,7 @@
/turf/space,
/area/space)
"ad" = (
/turf/simulated/floor/plating/airless/asteroid/cave,
/turf/simulated/floor/plating/asteroid/airless/cave,
/area/mine/dangerous/unexplored)
"ae" = (
/turf/simulated/mineral/random,
@@ -660,7 +660,7 @@
/turf/simulated/floor/plasteel/airless,
/area/mine/abandoned)
"bV" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/mine/dangerous/explored)
"bW" = (
/obj/structure/alien/weeds{
@@ -981,7 +981,7 @@
/area/mine/dangerous/explored)
"cL" = (
/obj/structure/ore_box,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/mine/dangerous/explored)
"cM" = (
/obj/effect/decal/remains/xeno,
@@ -1121,7 +1121,7 @@
/area/mine/north_outpost)
"dh" = (
/obj/structure/glowshroom,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/mine/dangerous/explored)
"di" = (
/obj/structure/alien/resin/wall,
@@ -1237,7 +1237,7 @@
"ds" = (
/obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap,
/obj/structure/glowshroom,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/mine/dangerous/explored)
"dt" = (
/obj/effect/decal/warning_stripes/north,
@@ -1286,7 +1286,7 @@
/turf/space,
/area/mine/north_outpost)
"dy" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/mine/dangerous/unexplored)
"dz" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden,
@@ -3123,7 +3123,7 @@
/obj/machinery/light/small{
dir = 8
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/mine/west_outpost)
"hA" = (
/obj/machinery/computer/arcade,
@@ -4323,7 +4323,7 @@
/area/space)
"ki" = (
/obj/machinery/light,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/mine/dangerous/explored)
"kj" = (
/obj/structure/disposalpipe/segment{
@@ -4421,21 +4421,21 @@
/area/mine/living_quarters)
"ku" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/mine/dangerous/explored)
"kv" = (
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/mine/dangerous/explored)
"kw" = (
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/mine/dangerous/explored)
"kx" = (
/obj/machinery/access_button{
@@ -4773,7 +4773,7 @@
/turf/simulated/floor/plasteel,
/area/mine/living_quarters)
"ll" = (
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/space)
"lm" = (
/obj/effect/spawner/window/reinforced,
@@ -5341,7 +5341,7 @@
/obj/machinery/light{
dir = 1
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/mine/living_quarters)
"mv" = (
/obj/effect/decal/warning_stripes/northeast,
@@ -5489,7 +5489,7 @@
/obj/effect/decal/remains/human{
desc = "Seems to be all that remains of a poor miner that didn't heed the warning signs."
},
/turf/simulated/floor/plating/airless/asteroid,
/turf/simulated/floor/plating/asteroid/airless,
/area/mine/dangerous/explored)
"mK" = (
/obj/structure/table/reinforced,
_maps/map_files/shuttles/emergency_clown.dmm
+4 -4
View File
@@ -164,7 +164,7 @@
},
/area/shuttle/escape)
"aB" = (
/turf/unsimulated/floor/chasm,
/turf/simulated/floor/chasm,
/area/shuttle/escape)
"aC" = (
/obj/machinery/status_display{
@@ -175,7 +175,7 @@
icon_state = "tube1";
dir = 1
},
/turf/unsimulated/floor/chasm,
/turf/simulated/floor/chasm,
/area/shuttle/escape)
"aD" = (
/obj/structure/bed,
@@ -207,7 +207,7 @@
/obj/structure/closet/walllocker/emerglocker{
pixel_x = -28
},
/turf/unsimulated/floor/chasm,
/turf/simulated/floor/chasm,
/area/shuttle/escape)
"aH" = (
/obj/item/storage/bible{
@@ -246,7 +246,7 @@
name = "station intercom (General)";
pixel_x = 28
},
/turf/unsimulated/floor/chasm,
/turf/simulated/floor/chasm,
/area/shuttle/escape)
"aM" = (
/obj/structure/grille,
code/LINDA/LINDA_turf_tile.dm
+2
View File
@@ -54,6 +54,8 @@
var/atmos_overlay_type = "" //current active overlay
var/planetary_atmos = FALSE //air will revert to initial_gas_mix over time
/turf/simulated/New()
..()
if(!blocks_air)
code/__DEFINES/misc.dm
+8 -1
View File
@@ -394,4 +394,11 @@
// Defib stats
#define DEFIB_TIME_LIMIT 120
#define DEFIB_TIME_LOSS 60
#define DEFIB_TIME_LOSS 60
//different types of atom colorations
#define ADMIN_COLOUR_PRIORITY 1 //only used by rare effects like greentext coloring mobs and when admins varedit color
#define TEMPORARY_COLOUR_PRIORITY 2 //e.g. purple effect of the revenant on a mob, black effect when mob electrocuted
#define WASHABLE_COLOUR_PRIORITY 3 //color splashed onto an atom (e.g. paint on turf)
#define FIXED_COLOUR_PRIORITY 4 //color inherent to the atom (e.g. blob color)
#define COLOUR_PRIORITY_AMOUNT 4 //how many priority levels there are.
code/__HELPERS/icon_smoothing.dm
-4
View File
@@ -121,10 +121,6 @@
A.diagonal_smooth(adjacencies)
else
cardinal_smooth(A, adjacencies)
if(A.smooth & SMOOTH_DIAGONAL)
A.diagonal_smooth(adjacencies)
else
cardinal_smooth(A, adjacencies)
/atom/proc/diagonal_smooth(adjacencies)
switch(adjacencies)
code/game/area/areas/mining.dm
+120
View File
@@ -0,0 +1,120 @@
/**********************Mine areas**************************/
/area/mine
icon_state = "mining"
has_gravity = 1
/area/mine/explored
name = "Mine"
icon_state = "explored"
music = null
always_unpowered = 1
requires_power = 1
poweralm = 0
power_environ = 0
power_equip = 0
power_light = 0
outdoors = 1
ambientsounds = list('sound/ambience/ambimine.ogg')
flags = NONE
/area/mine/unexplored
name = "Mine"
icon_state = "unexplored"
music = null
always_unpowered = 1
requires_power = 1
poweralm = 0
power_environ = 0
power_equip = 0
power_light = 0
outdoors = 1
ambientsounds = list('sound/ambience/ambimine.ogg')
flags = NONE
/area/mine/lobby
name = "Mining Station"
/area/mine/storage
name = "Mining Station Storage"
/area/mine/production
name = "Mining Station Starboard Wing"
icon_state = "mining_production"
/area/mine/abandoned
name = "Abandoned Mining Station"
/area/mine/living_quarters
name = "Mining Station Port Wing"
icon_state = "mining_living"
/area/mine/eva
name = "Mining Station EVA"
icon_state = "mining_eva"
/area/mine/maintenance
name = "Mining Station Communications"
/area/mine/cafeteria
name = "Mining station Cafeteria"
/area/mine/hydroponics
name = "Mining station Hydroponics"
/area/mine/sleeper
name = "Mining station Emergency Sleeper"
/area/mine/north_outpost
name = "North Mining Outpost"
/area/mine/west_outpost
name = "West Mining Outpost"
/area/mine/laborcamp
name = "Labor Camp"
/area/mine/laborcamp/security
name = "Labor Camp Security"
icon_state = "security"
/**********************Lavaland Areas**************************/
/area/lavaland
icon_state = "mining"
has_gravity = 1
/area/lavaland/surface
name = "Lavaland"
icon_state = "explored"
music = null
always_unpowered = 1
poweralm = 0
power_environ = 0
power_equip = 0
power_light = 0
requires_power = 1
ambientsounds = list('sound/ambience/ambilava.ogg')
/area/lavaland/underground
name = "Lavaland Caves"
icon_state = "unexplored"
music = null
always_unpowered = 1
requires_power = 1
poweralm = 0
power_environ = 0
power_equip = 0
power_light = 0
ambientsounds = list('sound/ambience/ambilava.ogg')
/area/lavaland/surface/outdoors
name = "Lavaland Wastes"
outdoors = 1
/area/lavaland/surface/outdoors/explored
name = "Lavaland Labor Camp"
code/game/asteroid.dm
+3 -7
View File
@@ -87,7 +87,7 @@ var/global/max_secret_rooms = 6
if("cavein")
theme = "cavein"
walltypes = list(/turf/simulated/mineral/random/high_chance=1)
floortypes = list(/turf/simulated/floor/plating/airless/asteroid, /turf/simulated/floor/beach/sand)
floortypes = list(/turf/simulated/floor/plating/asteroid/airless, /turf/simulated/floor/beach/sand)
treasureitems = list(/obj/mecha/working/ripley/mining=1, /obj/item/pickaxe/drill/diamonddrill=2,
/obj/item/resonator/upgraded=1, /obj/item/pickaxe/drill/jackhammer=5)
fluffitems = list(/obj/effect/decal/cleanable/blood=3,/obj/effect/decal/remains/human=1,/obj/item/clothing/under/overalls=1,
@@ -96,7 +96,7 @@ var/global/max_secret_rooms = 6
if("xenoden")
theme = "xenoden"
walltypes = list(/turf/simulated/mineral/random/high_chance=1)
floortypes = list(/turf/simulated/floor/plating/airless/asteroid, /turf/simulated/floor/beach/sand)
floortypes = list(/turf/simulated/floor/plating/asteroid/airless, /turf/simulated/floor/beach/sand)
treasureitems = list(/obj/item/clothing/mask/facehugger=1,/obj/item/stack/sheet/animalhide/xeno=2,/obj/item/clothing/suit/xenos=2,/obj/item/clothing/head/xenos=2,/obj/item/guardiancreator/biological/choose=1)
fluffitems = list(/obj/effect/decal/remains/human=1,/obj/effect/decal/cleanable/blood/xeno=5)
@@ -177,7 +177,7 @@ var/global/max_secret_rooms = 6
valid = 0
continue
if(locate(/turf/simulated/floor/plating/airless/asteroid) in range(5,T))//A little less strict than the other checks due to tunnels
if(locate(/turf/simulated/floor/plating/asteroid/airless) in range(5,T))//A little less strict than the other checks due to tunnels
valid = 0
continue
@@ -188,10 +188,6 @@ var/global/max_secret_rooms = 6
if(room)//time to fill it with stuff
var/list/emptyturfs = room["floors"]
for(var/turf/simulated/floor/A in emptyturfs) //remove pls doesn't fix problem
if(istype(A))
spawn(2)
A.fullUpdateMineralOverlays()
T = pick(emptyturfs)
if(T)
new /obj/structure/glowshroom/single(T) //Just to make it a little more visible
code/game/atoms.dm
+57
View File
@@ -47,6 +47,9 @@
var/list/remove_overlays // a very temporary list of overlays to remove
var/list/add_overlays // a very temporary list of overlays to add
var/list/atom_colours //used to store the different colors on an atom
//its inherent color, the colored paint applied on it, special color effect etc...
/atom/New(loc, ...)
if(use_preloader && (src.type == _preloader.target_path))//in case the instanciated atom is creating other atoms in New()
_preloader.load(src)
@@ -80,6 +83,9 @@
stack_trace("Warning: [src]([type]) initialized multiple times!")
initialized = TRUE
if(color)
add_atom_colour(color, FIXED_COLOUR_PRIORITY)
if(light_power && light_range)
update_light()
@@ -721,6 +727,8 @@ var/list/blood_splatter_icons = list()
switch(var_name)
if("light_power", "light_range", "light_color")
update_light()
if("color")
add_atom_colour(color, ADMIN_COLOUR_PRIORITY)
/atom/vv_get_dropdown()
@@ -751,3 +759,52 @@ var/list/blood_splatter_icons = list()
/atom/Exited(atom/movable/AM, atom/newLoc)
SEND_SIGNAL(src, COMSIG_ATOM_EXITED, AM, newLoc)
/*
Adds an instance of colour_type to the atom's atom_colours list
*/
/atom/proc/add_atom_colour(coloration, colour_priority)
if(!atom_colours || !atom_colours.len)
atom_colours = list()
atom_colours.len = COLOUR_PRIORITY_AMOUNT //four priority levels currently.
if(!coloration)
return
if(colour_priority > atom_colours.len)
return
atom_colours[colour_priority] = coloration
update_atom_colour()
/*
Removes an instance of colour_type from the atom's atom_colours list
*/
/atom/proc/remove_atom_colour(colour_priority, coloration)
if(!atom_colours)
atom_colours = list()
atom_colours.len = COLOUR_PRIORITY_AMOUNT //four priority levels currently.
if(colour_priority > atom_colours.len)
return
if(coloration && atom_colours[colour_priority] != coloration)
return //if we don't have the expected color (for a specific priority) to remove, do nothing
atom_colours[colour_priority] = null
update_atom_colour()
/*
Resets the atom's color to null, and then sets it to the highest priority
colour available
*/
/atom/proc/update_atom_colour()
if(!atom_colours)
atom_colours = list()
atom_colours.len = COLOUR_PRIORITY_AMOUNT //four priority levels currently.
color = null
for(var/C in atom_colours)
if(islist(C))
var/list/L = C
if(L.len)
color = L
return
else if(C)
color = C
return
code/game/gamemodes/cult/cult_structures.dm
+2 -2
View File
@@ -169,8 +169,8 @@
var/list/blacklisted_pylon_turfs = typecacheof(list(
/turf/simulated/floor/engine/cult,
/turf/space,
/turf/unsimulated/floor/lava,
/turf/unsimulated/floor/chasm,
/turf/simulated/floor/plating/lava,
/turf/simulated/floor/chasm,
/turf/simulated/wall,
))
code/game/mecha/equipment/tools/mining_tools.dm
+3 -3
View File
@@ -59,12 +59,12 @@
drill.log_message("Drilled through [src]")
drill.move_ores()
/turf/simulated/floor/plating/airless/asteroid/drill_act(obj/item/mecha_parts/mecha_equipment/drill/drill)
/turf/simulated/floor/plating/asteroid/airless/drill_act(obj/item/mecha_parts/mecha_equipment/drill/drill)
if(istype(drill, /obj/item/mecha_parts/mecha_equipment/drill/diamonddrill))
for(var/turf/simulated/floor/plating/airless/asteroid/M in range(1, src))
for(var/turf/simulated/floor/plating/asteroid/airless/M in range(1, src))
M.gets_drilled()
else
for(var/turf/simulated/floor/plating/airless/asteroid/M in range(1, drill.chassis))
for(var/turf/simulated/floor/plating/asteroid/airless/M in range(1, drill.chassis))
if(get_dir(drill.chassis, M) & drill.chassis.dir)
M.gets_drilled()
drill.log_message("Drilled through [src]")
code/game/objects/effects/alien_acid.dm
+1 -1
View File
@@ -53,7 +53,7 @@
if(istype(target, /turf/simulated/mineral))
var/turf/simulated/mineral/M = target
M.ChangeTurf(/turf/simulated/floor/plating/airless/asteroid)
M.ChangeTurf(/turf/simulated/floor/plating/asteroid/airless)
if(istype(target, /turf/simulated/floor))
var/turf/simulated/floor/F = target
code/game/objects/items/stacks/sheets/mineral.dm
+21
View File
@@ -108,6 +108,11 @@ var/global/list/datum/stack_recipe/adamantine_recipes = list(
new /datum/stack_recipe("incomplete servant golem shell", /obj/item/golem_shell/servant, req_amount = 1, res_amount = 1), \
)
var/global/list/datum/stack_recipe/snow_recipes = list(
new/datum/stack_recipe("snowman", /obj/structure/snowman, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("Snowball", /obj/item/snowball, 1)
)
/obj/item/stack/sheet/mineral
force = 5
throwforce = 5
@@ -320,3 +325,19 @@ var/global/list/datum/stack_recipe/plastitanium_recipes = list (
/obj/item/stack/sheet/mineral/adamantine/New(loc, amount = null)
recipes = adamantine_recipes
..()
/*
* Snow
*/
/obj/item/stack/sheet/mineral/snow
name = "snow"
icon_state = "sheet-snow"
item_state = "sheet-snow"
singular_name = "snow block"
force = 1
throwforce = 2
merge_type = /obj/item/stack/sheet/mineral/snow
/obj/item/stack/sheet/mineral/snow/New(loc, amount = null)
recipes = snow_recipes
..()
code/game/objects/structures/mineral_doors.dm
+1 -1
View File
@@ -133,7 +133,7 @@
if(istype(W, /obj/item/pickaxe))
var/obj/item/pickaxe/digTool = W
to_chat(user, "<span class='notice'>You start digging \the [src].</span>")
if(do_after(user, digTool.digspeed * hardness, target = src) && src)
if(do_after(user, 40 * digTool.toolspeed * hardness, target = src) && src)
to_chat(user, "<span class='notice'>You finished digging.</span>")
deconstruct(TRUE)
else if(user.a_intent != INTENT_HARM)
code/game/turfs/simulated/floor/asteroid.dm
+319
View File
@@ -0,0 +1,319 @@
/**********************Asteroid**************************/
/turf/simulated/floor/plating/asteroid
name = "asteroid sand"
baseturf = /turf/simulated/floor/plating/asteroid
icon_state = "asteroid"
icon_plating = "asteroid"
var/environment_type = "asteroid"
var/turf_type = /turf/simulated/floor/plating/asteroid //Because caves do whacky shit to revert to normal
var/dug = 0 //0 = has not yet been dug, 1 = has already been dug
var/sand_type = /obj/item/stack/ore/glass
var/floor_variance = 20 //probability floor has a different icon state
/turf/simulated/floor/plating/asteroid/New()
var/proper_name = name
..()
name = proper_name
if(prob(floor_variance))
icon_state = "[environment_type][rand(0,12)]"
/turf/simulated/floor/plating/asteroid/burn_tile()
return
/turf/simulated/floor/plating/asteroid/ex_act(severity, target)
switch(severity)
if(3.0)
return
if(2.0)
if(prob(20))
gets_dug()
if(1.0)
gets_dug()
return
/turf/simulated/floor/plating/asteroid/attackby(obj/item/W, mob/user, params)
//note that this proc does not call ..()
if(!W || !user)
return 0
if((istype(W, /obj/item/shovel) || istype(W, /obj/item/pickaxe)))
var/turf/T = get_turf(user)
if(!istype(T))
return
if(dug)
to_chat(user, "<span class='warning'>This area has already been dug!</span>")
return
to_chat(user, "<span class='notice'>You start digging...</span>")
playsound(src, W.usesound, 50, 1)
if(do_after(user, 20 * W.toolspeed, target = src))
to_chat(user, "<span class='notice'>You dig a hole.</span>")
gets_dug()
return
if(istype(W,/obj/item/storage/bag/ore))
var/obj/item/storage/bag/ore/S = W
if(S.collection_mode == 1)
for(var/obj/item/stack/ore/O in src.contents)
O.attackby(W,user)
return
if(istype(W, /obj/item/stack/tile))
var/obj/item/stack/tile/Z = W
if(!Z.use(1))
return
ChangeTurf(Z.turf_type)
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
/turf/simulated/floor/plating/asteroid/gets_drilled()
if(!dug)
gets_dug()
else
..()
/turf/simulated/floor/plating/asteroid/proc/gets_dug()
if(dug)
return
for(var/i in 1 to 5)
new sand_type(src)
dug = 1
icon_plating = "[environment_type]_dug"
icon_state = "[environment_type]_dug"
slowdown = 0
return
/turf/simulated/floor/plating/asteroid/singularity_act()
return
/turf/simulated/floor/plating/asteroid/singularity_pull(S, current_size)
return
/turf/simulated/floor/plating/asteroid/basalt
name = "volcanic floor"
baseturf = /turf/simulated/floor/plating/asteroid/basalt
icon = 'icons/turf/floors.dmi'
icon_state = "basalt"
icon_plating = "basalt"
environment_type = "basalt"
sand_type = /obj/item/stack/ore/glass/basalt
floor_variance = 15
/turf/simulated/floor/plating/asteroid/basalt/lava //lava underneath
baseturf = /turf/simulated/floor/plating/lava/smooth
/turf/simulated/floor/plating/asteroid/basalt/airless
temperature = TCMB
oxygen = 0
nitrogen = 0
/turf/simulated/floor/plating/asteroid/basalt/New()
..()
switch(icon_state)
if("basalt1", "basalt2", "basalt3") //5 and 9 are too dark to glow and make the amount of glows in tunnels too high
set_light(1, 1) //this is basically a 3.75% chance that a basalt floor glows
/turf/simulated/floor/plating/asteroid/basalt/gets_dug()
if(!dug)
set_light(0)
..()
///////Surface. The surface is warm, but survivable without a suit. Internals are required. The floors break to chasms, which drop you into the underground.
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface
oxygen = 14
nitrogen = 23
temperature = 300
baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface
/turf/simulated/floor/plating/asteroid/airless
temperature = TCMB
oxygen = 0
nitrogen = 0
turf_type = /turf/simulated/floor/plating/asteroid/airless
#define SPAWN_MEGAFAUNA "MEGAFAUNE"
#define SPAWN_BUBBLEGUM 6
/turf/simulated/floor/plating/asteroid/airless/cave
var/length = 100
var/list/mob_spawn_list
var/list/megafauna_spawn_list
var/list/flora_spawn_list
var/sanity = 1
var/forward_cave_dir = 1
var/backward_cave_dir = 2
var/going_backwards = TRUE
var/has_data = FALSE
var/data_having_type = /turf/simulated/floor/plating/asteroid/airless/cave/has_data
turf_type = /turf/simulated/floor/plating/asteroid/airless
/turf/simulated/floor/plating/asteroid/airless/cave/has_data //subtype for producing a tunnel with given data
has_data = TRUE
/turf/simulated/floor/plating/asteroid/airless/cave/volcanic
mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goliath/beast = 50, /mob/living/simple_animal/hostile/spawner/lavaland/goliath = 3, \
/mob/living/simple_animal/hostile/asteroid/basilisk/watcher = 40, /mob/living/simple_animal/hostile/spawner/lavaland = 2, \
/mob/living/simple_animal/hostile/asteroid/hivelord/legion = 30, /mob/living/simple_animal/hostile/spawner/lavaland/legion = 3, \
SPAWN_MEGAFAUNA = 6, /mob/living/simple_animal/hostile/asteroid/goldgrub = 10)
data_having_type = /turf/simulated/floor/plating/asteroid/airless/cave/volcanic/has_data
turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface
oxygen = 14
nitrogen = 23
temperature = 300
/turf/simulated/floor/plating/asteroid/airless/cave/volcanic/has_data //subtype for producing a tunnel with given data
has_data = TRUE
/turf/simulated/floor/plating/asteroid/airless/cave/New(loc)
if (!mob_spawn_list)
mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goldgrub = 1, /mob/living/simple_animal/hostile/asteroid/goliath = 5, /mob/living/simple_animal/hostile/asteroid/basilisk = 4, /mob/living/simple_animal/hostile/asteroid/hivelord = 3)
if (!megafauna_spawn_list)
megafauna_spawn_list = list(/mob/living/simple_animal/hostile/megafauna/dragon = 4, /mob/living/simple_animal/hostile/megafauna/colossus = 2, /mob/living/simple_animal/hostile/megafauna/bubblegum = SPAWN_BUBBLEGUM)
if (!flora_spawn_list)
flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2)
if(!has_data)
produce_tunnel_from_data()
..()
/turf/simulated/floor/plating/asteroid/airless/cave/proc/get_cave_data(set_length, exclude_dir = -1)
// If set_length (arg1) isn't defined, get a random length; otherwise assign our length to the length arg.
if(!set_length)
length = rand(25, 50)
else
length = set_length
// Get our directiosn
forward_cave_dir = pick(alldirs - exclude_dir)
// Get the opposite direction of our facing direction
backward_cave_dir = angle2dir(dir2angle(forward_cave_dir) + 180)
/turf/simulated/floor/plating/asteroid/airless/cave/proc/produce_tunnel_from_data(tunnel_length, excluded_dir = -1)
get_cave_data(tunnel_length, excluded_dir)
// Make our tunnels
make_tunnel(forward_cave_dir)
if(going_backwards)
make_tunnel(backward_cave_dir)
// Kill ourselves by replacing ourselves with a normal floor.
SpawnFloor(src)
/turf/simulated/floor/plating/asteroid/airless/cave/proc/make_tunnel(dir)
var/turf/simulated/mineral/tunnel = src
var/next_angle = pick(45, -45)
for(var/i = 0; i < length; i++)
if(!sanity)
break
var/list/L = list(45)
if(IsOdd(dir2angle(dir))) // We're going at an angle and we want thick angled tunnels.
L += -45
// Expand the edges of our tunnel
for(var/edge_angle in L)
var/turf/simulated/mineral/edge = get_step(tunnel, angle2dir(dir2angle(dir) + edge_angle))
if(istype(edge))
SpawnFloor(edge)
if(!sanity)
break
// Move our tunnel forward
tunnel = get_step(tunnel, dir)
if(istype(tunnel))
// Small chance to have forks in our tunnel; otherwise dig our tunnel.
if(i > 3 && prob(20))
var/turf/simulated/floor/plating/asteroid/airless/cave/C = tunnel.ChangeTurf(data_having_type,FALSE,TRUE)
C.going_backwards = FALSE
C.produce_tunnel_from_data(rand(10, 15), dir)
else
SpawnFloor(tunnel)
else //if(!istype(tunnel, src.parent)) // We hit space/normal/wall, stop our tunnel.
break
// Chance to change our direction left or right.
if(i > 2 && prob(33))
// We can't go a full loop though
next_angle = -next_angle
setDir(angle2dir(dir2angle(dir) )+ next_angle)
/turf/simulated/floor/plating/asteroid/airless/cave/proc/SpawnFloor(turf/T)
for(var/S in RANGE_TURFS(1, src))
var/turf/NT = S
if(!NT || isspaceturf(NT) || istype(NT.loc, /area/mine/explored) || istype(NT.loc, /area/lavaland/surface/outdoors/explored))
sanity = 0
break
if(!sanity)
return
SpawnFlora(T)
SpawnMonster(T)
T.ChangeTurf(turf_type,FALSE,TRUE)
/turf/simulated/floor/plating/asteroid/airless/cave/proc/SpawnMonster(turf/T)
if(prob(30))
if(istype(loc, /area/mine/explored) || istype(loc, /area/lavaland/surface/outdoors/explored))
return
var/randumb = pickweight(mob_spawn_list)
while(randumb == SPAWN_MEGAFAUNA)
var/maybe_boss = pickweight(megafauna_spawn_list)
if(megafauna_spawn_list[maybe_boss])
randumb = maybe_boss
if(ispath(maybe_boss, /mob/living/simple_animal/hostile/megafauna/bubblegum)) //there can be only one bubblegum, so don't waste spawns on it
megafauna_spawn_list[maybe_boss] = 0
for(var/mob/living/simple_animal/hostile/H in urange(12,T)) //prevents mob clumps
if((ispath(randumb, /mob/living/simple_animal/hostile/megafauna) || ismegafauna(H)) && get_dist(src, H) <= 7)
return //if there's a megafauna within standard view don't spawn anything at all
if(ispath(randumb, /mob/living/simple_animal/hostile/asteroid) || istype(H, /mob/living/simple_animal/hostile/asteroid))
return //if the random is a standard mob, avoid spawning if there's another one within 12 tiles
if((ispath(randumb, /mob/living/simple_animal/hostile/spawner/lavaland) || istype(H, /mob/living/simple_animal/hostile/spawner/lavaland)) && get_dist(src, H) <= 2)
return //prevents tendrils spawning in each other's collapse range
new randumb(T)
return
#undef SPAWN_MEGAFAUNA
#undef SPAWN_BUBBLEGUM
/turf/simulated/floor/plating/asteroid/airless/cave/proc/SpawnFlora(turf/T)
if(prob(12))
if(istype(loc, /area/mine/explored) || istype(loc, /area/lavaland/surface/outdoors/explored))
return
var/randumb = pickweight(flora_spawn_list)
for(var/obj/structure/flora/ash/F in range(4, T)) //Allows for growing patches, but not ridiculous stacks of flora
if(!istype(F, randumb))
return
new randumb(T)
/turf/simulated/floor/plating/asteroid/snow
name = "snow"
desc = "Looks cold."
icon = 'icons/turf/snow.dmi'
baseturf = /turf/simulated/floor/plating/asteroid/snow
icon_state = "snow"
icon_plating = "snow"
temperature = 180
slowdown = 2
environment_type = "snow"
sand_type = /obj/item/stack/sheet/mineral/snow
/turf/simulated/floor/plating/asteroid/snow/airless
temperature = TCMB
oxygen = 0
nitrogen = 0
/turf/simulated/floor/plating/asteroid/snow/temperature
temperature = 255.37
/turf/simulated/floor/plating/asteroid/snow/atmosphere
oxygen = 22
nitrogen = 82
temperature = 180
code/game/turfs/simulated/floor/chasm.dm
+107
View File
@@ -0,0 +1,107 @@
/turf/simulated/floor/chasm
name = "chasm"
desc = "Watch your step."
baseturf = /turf/simulated/floor/chasm
smooth = SMOOTH_TRUE | SMOOTH_BORDER
icon = 'icons/turf/floors/chasms.dmi'
icon_state = "smooth"
var/drop_x = 1
var/drop_y = 1
var/drop_z = 1
/turf/simulated/floor/chasm/Entered(atom/movable/AM)
processing_objects.Add(src)
drop_stuff(AM)
/turf/simulated/floor/chasm/process()
if(!drop_stuff())
processing_objects.Remove(src)
/turf/simulated/floor/chasm/proc/drop_stuff(AM)
. = 0
var/thing_to_check = src
if(AM)
thing_to_check = list(AM)
for(var/thing in thing_to_check)
if(droppable(thing))
. = 1
INVOKE_ASYNC(src, .proc/drop, thing)
/turf/simulated/floor/chasm/proc/droppable(atom/movable/AM)
if(!isliving(AM) && !isobj(AM))
return 0
if(istype(AM, /obj/singularity) || istype(AM, /obj/item/projectile) || AM.throwing)
return 0
if(istype(AM, /obj/effect/portal))
//Portals aren't affected by gravity. Probably.
return 0
//Flies right over the chasm
if(isliving(AM))
var/mob/MM = AM
if(MM.flying)
return 0
return 1
/turf/simulated/floor/chasm/proc/drop(atom/movable/AM)
//Make sure the item is still there after our sleep
if(!AM || QDELETED(AM))
return
var/turf/T = locate(drop_x, drop_y, drop_z)
if(T)
AM.visible_message("<span class='boldwarning'>[AM] falls into [src]!</span>", "<span class='userdanger'>GAH! Ah... where are you?</span>")
T.visible_message("<span class='boldwarning'>[AM] falls from above!</span>")
AM.forceMove(T)
if(isliving(AM))
var/mob/living/L = AM
L.Weaken(5)
L.adjustBruteLoss(30)
/turf/simulated/floor/chasm/straight_down/New()
..()
drop_x = x
drop_y = y
if(z+1 <= world.maxz)
drop_z = z+1
/turf/simulated/floor/chasm/straight_down/lava_land_surface
oxygen = 14
nitrogen = 23
temperature = 300
planetary_atmos = TRUE
baseturf = /turf/simulated/floor/chasm/straight_down/lava_land_surface
/turf/simulated/floor/chasm/straight_down/lava_land_surface/drop(atom/movable/AM)
//Make sure the item is still there after our sleep
if(!AM || QDELETED(AM))
return
AM.visible_message("<span class='boldwarning'>[AM] falls into [src]!</span>", "<span class='userdanger'>You stumble and stare into an abyss before you. It stares back, and you fall \
into the enveloping dark.</span>")
if(isliving(AM))
var/mob/living/L = AM
L.notransform = TRUE
L.Stun(10)
L.resting = TRUE
animate(AM, transform = matrix() - matrix(), alpha = 0, color = rgb(0, 0, 0), time = 10)
for(var/i in 1 to 5)
//Make sure the item is still there after our sleep
if(!AM || QDELETED(AM))
return
AM.pixel_y--
sleep(2)
//Make sure the item is still there after our sleep
if(!AM || QDELETED(AM))
return
if(isrobot(AM))
var/mob/living/silicon/robot/S = AM
qdel(S.mmi)
qdel(AM)
/turf/simulated/floor/chasm/straight_down/lava_land_surface/normal_air
oxygen = 22
nitrogen = 82
temperature = T20C
code/game/turfs/simulated/floor/lava.dm
+121
View File
@@ -0,0 +1,121 @@
/turf/simulated/floor/plating/lava
name = "lava"
icon_state = "lava"
gender = PLURAL //"That's some lava."
baseturf = /turf/simulated/floor/plating/lava //lava all the way down
slowdown = 2
luminosity = 1
var/static/list/safeties_typecache = list(/turf/simulated/floor/plating/airless/catwalk)
//if anything matching this typecache is found in the lava, we don't burn things
/turf/simulated/floor/plating/lava/New()
..()
safeties_typecache = typecacheof(safeties_typecache)
/turf/simulated/floor/plating/lava/ex_act()
return
/turf/simulated/floor/plating/lava/airless
temperature = TCMB
/turf/simulated/floor/plating/lava/Entered(atom/movable/AM)
if(burn_stuff(AM))
processing_objects.Add(src)
/turf/simulated/floor/plating/lava/hitby(atom/movable/AM)
if(burn_stuff(AM))
processing_objects.Add(src)
/turf/simulated/floor/plating/lava/process()
if(!burn_stuff())
processing_objects.Remove(src)
/turf/simulated/floor/plating/lava/singularity_act()
return
/turf/simulated/floor/plating/lava/singularity_pull(S, current_size)
return
/turf/simulated/floor/plating/lava/make_plating()
return
/turf/simulated/floor/plating/lava/proc/is_safe()
var/list/found_safeties = typecache_filter_list(contents, safeties_typecache)
return LAZYLEN(found_safeties)
/turf/simulated/floor/plating/lava/proc/burn_stuff(AM)
. = 0
if(is_safe())
return FALSE
var/thing_to_check = src
if (AM)
thing_to_check = list(AM)
for(var/thing in thing_to_check)
if (istype(thing, /atom/movable/lighting_overlay))
continue
if(isobj(thing))
var/obj/O = thing
if((O.resistance_flags & (LAVA_PROOF|INDESTRUCTIBLE)) || O.throwing)
continue
. = 1
if((O.resistance_flags & (ON_FIRE)))
continue
if(!(O.resistance_flags & FLAMMABLE))
O.resistance_flags |= FLAMMABLE //Even fireproof things burn up in lava
if(O.resistance_flags & FIRE_PROOF)
O.resistance_flags &= ~FIRE_PROOF
if(O.armor["fire"] > 50) //obj with 100% fire armor still get slowly burned away.
O.armor["fire"] = 50
O.fire_act(10000, 1000)
else if (isliving(thing))
. = 1
var/mob/living/L = thing
if(L.flying)
continue //YOU'RE FLYING OVER IT
if("lava" in L.weather_immunities)
continue
if(L.buckled)
if(isobj(L.buckled))
var/obj/O = L.buckled
if(O.resistance_flags & LAVA_PROOF)
continue
if(isliving(L.buckled)) //Goliath riding
var/mob/living/live = L.buckled
if("lava" in live.weather_immunities)
continue
L.adjustFireLoss(20)
if(L) //mobs turning into object corpses could get deleted here.
L.adjust_fire_stacks(20)
L.IgniteMob()
/turf/simulated/floor/plating/lava/attackby(obj/item/C, mob/user, params) //Lava isn't a good foundation to build on
return
/turf/simulated/floor/plating/lava/break_tile()
return
/turf/simulated/floor/plating/lava/burn_tile()
return
/turf/simulated/floor/plating/lava/smooth
name = "lava"
baseturf = /turf/simulated/floor/plating/lava/smooth
icon = 'icons/turf/floors/lava.dmi'
icon_state = "unsmooth"
smooth = SMOOTH_MORE | SMOOTH_BORDER
canSmoothWith = list(/turf/simulated/floor/plating/lava/smooth)
/turf/simulated/floor/plating/lava/smooth/lava_land_surface
temperature = 300
oxygen = 14
nitrogen = 23
//baseturf = /turf/simulated/chasm/straight_down/lava_land_surface TODO: Uncomment
/turf/simulated/floor/plating/lava/smooth/airless
temperature = TCMB
code/modules/mining/mine_turfs.dm → code/game/turfs/simulated/minerals.dm
+6 -231
View File
@@ -134,7 +134,7 @@ var/global/list/rockTurfEdgeCache = list(
if("Plasma")
M = new/turf/simulated/mineral/plasma(src)
if("Cave")
new/turf/simulated/floor/plating/airless/asteroid/cave(src)
new/turf/simulated/floor/plating/asteroid/airless/cave(src)
if("Gibtonite")
M = new/turf/simulated/mineral/gibtonite(src)
if("Bananium")
@@ -365,10 +365,9 @@ var/global/list/rockTurfEdgeCache = list(
if(det_time >= 1 && det_time <= 2)
G.quality = 2
G.icon_state = "Gibtonite ore 2"
var/turf/simulated/floor/plating/airless/asteroid/gibtonite_remains/G = ChangeTurf(/turf/simulated/floor/plating/airless/asteroid/gibtonite_remains)
G.fullUpdateMineralOverlays()
ChangeTurf(/turf/simulated/floor/plating/asteroid/airless/gibtonite_remains)
/turf/simulated/floor/plating/airless/asteroid/gibtonite_remains
/turf/simulated/floor/plating/asteroid/airless/gibtonite_remains
var/det_time = 0
var/stage = 0
@@ -385,13 +384,13 @@ var/global/list/rockTurfEdgeCache = list(
if(!( istype(T, /turf) ))
return
if(last_act+P.digspeed > world.time)//prevents message spam
if(last_act + (40 * P.toolspeed) > world.time)//prevents message spam
return
last_act = world.time
to_chat(user, "<span class='notice'>You start picking...</span>")
P.playDigSound()
if(do_after(user, P.digspeed, target = src))
if(do_after(user, 40 * P.toolspeed, target = src))
if(istype(src, /turf/simulated/mineral)) //sanity check against turf being deleted during digspeed delay
to_chat(user, "<span class='notice'>You finish cutting into the rock.</span>")
P.update_icon()
@@ -407,9 +406,8 @@ var/global/list/rockTurfEdgeCache = list(
for(i=0;i<mineralAmt;i++)
new mineralType(src)
feedback_add_details("ore_mined","[mineralType]|[mineralAmt]")
var/turf/simulated/floor/plating/airless/asteroid/N = ChangeTurf(/turf/simulated/floor/plating/airless/asteroid)
ChangeTurf(/turf/simulated/floor/plating/asteroid/airless)
playsound(src, 'sound/effects/break_stone.ogg', 50, 1) //beautiful destruction
N.fullUpdateMineralOverlays()
if(rand(1,750) == 1)
visible_message("<span class='notice'>An old dusty crate was buried within!</span>")
@@ -447,226 +445,3 @@ var/global/list/rockTurfEdgeCache = list(
var/obj/mecha/M = AM
if(istype(M.selected,/obj/item/mecha_parts/mecha_equipment/drill))
M.selected.action(src)
/**********************Asteroid**************************/
/turf/simulated/floor/plating/airless/asteroid
name = "Asteroid"
icon_state = "asteroid"
icon_plating = "asteroid"
var/dug = 0 //0 = has not yet been dug, 1 = has already been dug
oxygen = 0.01
nitrogen = 0.01
temperature = TCMB
/turf/simulated/floor/plating/airless/asteroid/New()
var/proper_name = name
..()
name = proper_name
if(prob(20))
icon_state = "asteroid[rand(0,12)]"
/turf/simulated/floor/plating/airless/asteroid/ex_act(severity, target)
switch(severity)
if(3.0)
return
if(2.0)
if(prob(20))
src.gets_dug()
if(1.0)
src.gets_dug()
return
/turf/simulated/floor/plating/airless/asteroid/attackby(obj/item/W, mob/user, params)
//note that this proc does not call ..()
if(!W || !user)
return 0
if((istype(W, /obj/item/shovel)))
var/turf/T = get_turf(user)
if(!istype(T))
return
if(dug)
to_chat(user, "<span class='warning'>This area has already been dug!</span>")
return
to_chat(user, "<span class='notice'>You start digging...</span>")
if(do_after(user, 20 * W.toolspeed, target = src))
to_chat(user, "<span class='notice'>You dig a hole.</span>")
gets_dug()
return
if((istype(W, /obj/item/pickaxe)))
var/obj/item/pickaxe/P = W
var/turf/T = get_turf(user)
if(!istype(T))
return
if(dug)
to_chat(user, "<span class='warning'>This area has already been dug!</span>")
return
to_chat(user, "<span class='notice'>You start digging...</span>")
if(do_after(user, P.digspeed, target = src))
to_chat(user, "<span class='notice'>You dig a hole.</span>")
gets_dug()
return
if(istype(W,/obj/item/storage/bag/ore))
var/obj/item/storage/bag/ore/S = W
if(S.collection_mode == 1)
for(var/obj/item/stack/ore/O in src.contents)
O.attackby(W,user)
return
if(istype(W, /obj/item/stack/tile/plasteel) && isarea(loc))
var/area/A = loc
if(A.outdoors)
to_chat(user, "<span class='warning'>You must define a room as part of the station using blueprints or an equivalent item first.</span>")
return
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
make_plating()
icon_plating = "plating"
icon_state = "plating"
update_icon()
/turf/simulated/floor/plating/airless/asteroid/gets_drilled()
if(!dug)
gets_dug()
else
..()
/turf/simulated/floor/plating/airless/asteroid/proc/gets_dug()
if(dug)
return
new/obj/item/stack/ore/glass(src, 5)
dug = 1
playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1) //FUCK YO RUSTLE I GOT'S THE DIGS SOUND HERE
icon_plating = "asteroid_dug"
icon_state = "asteroid_dug"
return
/turf/proc/updateMineralOverlays()
src.overlays.Cut()
if(istype(get_step(src, NORTH), /turf/simulated/mineral))
src.overlays += rockTurfEdgeCache[NORTH_EDGING]
if(istype(get_step(src, SOUTH), /turf/simulated/mineral))
src.overlays += rockTurfEdgeCache[SOUTH_EDGING]
if(istype(get_step(src, EAST), /turf/simulated/mineral))
src.overlays += rockTurfEdgeCache[EAST_EDGING]
if(istype(get_step(src, WEST), /turf/simulated/mineral))
src.overlays += rockTurfEdgeCache[WEST_EDGING]
/turf/simulated/mineral/updateMineralOverlays()
return
/turf/simulated/wall/updateMineralOverlays()
return
/turf/proc/fullUpdateMineralOverlays()
for(var/turf/t in range(1,src))
t.updateMineralOverlays()
/turf/simulated/floor/plating/airless/asteroid/cave
var/length = 100
var/mob_spawn_list = list("Goldgrub" = 1, "Goliath" = 5, "Basilisk" = 4, "Hivelord" = 3)
var/sanity = 1
/turf/simulated/floor/plating/airless/asteroid/cave/New(loc, var/length, var/go_backwards = 1, var/exclude_dir = -1)
// If length (arg2) isn't defined, get a random length; otherwise assign our length to the length arg.
if(!length)
src.length = rand(25, 50)
else
src.length = length
// Get our directiosn
var/forward_cave_dir = pick(alldirs - exclude_dir)
// Get the opposite direction of our facing direction
var/backward_cave_dir = angle2dir(dir2angle(forward_cave_dir) + 180)
// Make our tunnels
make_tunnel(forward_cave_dir)
if(go_backwards)
make_tunnel(backward_cave_dir)
// Kill ourselves by replacing ourselves with a normal floor.
SpawnFloor(src)
..()
/turf/simulated/floor/plating/airless/asteroid/cave/proc/make_tunnel(var/dir)
var/turf/simulated/mineral/tunnel = src
var/next_angle = pick(45, -45)
for(var/i = 0; i < length; i++)
if(!sanity)
break
var/list/L = list(45)
if(IsOdd(dir2angle(dir))) // We're going at an angle and we want thick angled tunnels.
L += -45
// Expand the edges of our tunnel
for(var/edge_angle in L)
var/turf/simulated/mineral/edge = get_step(tunnel, angle2dir(dir2angle(dir) + edge_angle))
if(istype(edge))
SpawnFloor(edge)
// Move our tunnel forward
tunnel = get_step(tunnel, dir)
if(istype(tunnel))
// Small chance to have forks in our tunnel; otherwise dig our tunnel.
if(i > 3 && prob(20))
new src.type(tunnel, rand(10, 15), 0, dir)
else
SpawnFloor(tunnel)
else //if(!istype(tunnel, src.parent)) // We hit space/normal/wall, stop our tunnel.
break
// Chance to change our direction left or right.
if(i > 2 && prob(33))
// We can't go a full loop though
next_angle = -next_angle
dir = angle2dir(dir2angle(dir) + next_angle)
/turf/simulated/floor/plating/airless/asteroid/cave/proc/SpawnFloor(var/turf/T)
for(var/turf/S in range(2,T))
if(istype(S, /turf/space) || istype(S.loc, /area/mine/dangerous/explored))
sanity = 0
break
if(!sanity)
return
SpawnMonster(T)
var/turf/simulated/floor/t = new /turf/simulated/floor/plating/airless/asteroid(T)
spawn(2)
t.fullUpdateMineralOverlays()
/turf/simulated/floor/plating/airless/asteroid/cave/proc/SpawnMonster(var/turf/T)
if(prob(30))
if(istype(loc, /area/mine/dangerous/explored))
return
for(var/atom/A in range(15,T))//Lowers chance of mob clumps
if(istype(A, /mob/living/simple_animal/hostile/asteroid))
return
var/randumb = pickweight(mob_spawn_list)
switch(randumb)
if("Goliath")
new /mob/living/simple_animal/hostile/asteroid/goliath(T)
if("Goldgrub")
new /mob/living/simple_animal/hostile/asteroid/goldgrub(T)
if("Basilisk")
new /mob/living/simple_animal/hostile/asteroid/basilisk(T)
if("Hivelord")
new /mob/living/simple_animal/hostile/asteroid/hivelord(T)
return
#undef NORTH_EDGING
#undef SOUTH_EDGING
#undef EAST_EDGING
#undef WEST_EDGING
code/game/turfs/turf.dm
+6
View File
@@ -41,6 +41,9 @@
if(smooth && ticker && ticker.current_state == GAME_STATE_PLAYING)
queue_smooth(src)
/turf/proc/process()
return;
/hook/startup/proc/smooth_world()
var/watch = start_watch()
log_startup_progress("Smoothing atoms...")
@@ -167,6 +170,9 @@
if(L)
qdel(L)
/turf/proc/TerraformTurf(path)
return ChangeTurf(path)
//Creates a new turf
/turf/proc/ChangeTurf(path, defer_change = FALSE, keep_icon = TRUE)
if(!path)
code/game/turfs/unsimulated/floor.dm
-40
View File
@@ -16,46 +16,6 @@
icon = 'icons/turf/snow.dmi'
icon_state = "snow"
/turf/unsimulated/floor/chasm
name = "chasm"
desc = "It's difficult to see the bottom."
density = 0
icon = 'icons/turf/floors/Chasms.dmi'
icon_state = "Fill"
smooth = SMOOTH_MORE
canSmoothWith = list(/turf/unsimulated/floor/chasm)
/turf/unsimulated/floor/chasm/Entered(mob/living/M, atom/OL, ignoreRest = 0)
// "fall" south
if(istype(M))
spawn(1)
if(step(M, SOUTH))
M.emote("scream")
/turf/unsimulated/floor/chasm/dense
density = 1
/turf/unsimulated/floor/lava
name = "lava"
desc = "That looks... a bit dangerous"
icon = 'icons/turf/floors/lava.dmi'
icon_state = "smooth"
smooth = SMOOTH_MORE
canSmoothWith = list(/turf/unsimulated/floor/lava)
var/lava_damage = 250
var/lava_fire = 20
light_range = 2
light_color = "#FFC040"
/turf/unsimulated/floor/lava/Entered(mob/living/M, atom/OL, ignoreRest = 0)
if(istype(M))
M.apply_damage(lava_damage, BURN)
M.adjust_fire_stacks(lava_fire)
M.IgniteMob()
/turf/unsimulated/floor/lava/dense
density = 1
/turf/unsimulated/floor/abductor
name = "alien floor"
icon_state = "alienpod1"
code/modules/food_and_drinks/food/foods/meat.dm
+17
View File
@@ -125,6 +125,17 @@
icon_state = "spidereggs"
list_reagents = list("protein" = 2, "toxin" = 2)
/obj/item/reagent_containers/food/snacks/goliath
name = "goliath meat"
desc = "A slab of goliath meat. It's not very edible now, but it cooks great in lava."
icon_state = "goliathmeat"
list_reagents = list("nutriment" = 3, "toxin" = 5)
/obj/item/reagent_containers/food/snacks/goliath/burn()
visible_message("[src] finishes cooking!")
new /obj/item/reagent_containers/food/snacks/goliath_steak(loc)
qdel(src)
//////////////////////
// Cooked Meat //
//////////////////////
@@ -205,6 +216,12 @@
filling_color = "#43DE18"
list_reagents = list("nutriment" = 6, "soysauce" = 5, "vitamin" = 2)
/obj/item/reagent_containers/food/snacks/goliath_steak
name = "goliath steak"
desc = "A delicious, lava cooked steak."
resistance_flags = LAVA_PROOF | FIRE_PROOF
icon_state = "goliathsteak"
trash = null
//////////////////////
// Cubes //
code/modules/food_and_drinks/recipes/recipes_grill.dm
+6
View File
@@ -226,3 +226,9 @@
/obj/item/reagent_containers/food/snacks/catfishmeat,
)
result = /obj/item/reagent_containers/food/snacks/sushi_Tai
/datum/recipe/grill/goliath
items = list(
/obj/item/reagent_containers/food/snacks/goliath
)
result = /obj/item/reagent_containers/food/snacks/goliath_steak
code/modules/mining/lavaland/loot/ashdragon_loot.dm
+2 -2
View File
@@ -161,9 +161,9 @@
hitsound = 'sound/weapons/sear.ogg'
burn_state = LAVA_PROOF | FIRE_PROOF
unacidable = 1
var/turf_type = /turf/unsimulated/floor/lava // /turf/simulated/floor/plating/lava/smooth once Lavaland turfs are added
var/turf_type = /turf/simulated/floor/plating/lava/smooth
var/transform_string = "lava"
var/reset_turf_type = /turf/simulated/floor/plating/airless/asteroid // /turf/simulated/floor/plating/asteroid/basalt once Lavaland turfs are added
var/reset_turf_type = /turf/simulated/floor/plating/asteroid/airless // /turf/simulated/floor/plating/asteroid/basalt once Lavaland turfs are added
var/reset_string = "basalt"
var/create_cooldown = 100
var/create_delay = 30
code/modules/mining/lavaland/loot/tendril_loot.dm
+2 -1
View File
@@ -131,7 +131,7 @@
var/turf/next = get_step(src, direction)
var/turf/current = get_turf(src)
if(istype(next, /turf/unsimulated/floor/lava) || istype(current, /turf/unsimulated/floor/lava)) //We can move from land to lava, or lava to land, but not from land to land
if(istype(next, /turf/simulated/floor/plating/lava/smooth) || istype(current, /turf/simulated/floor/plating/lava/smooth)) //We can move from land to lava, or lava to land, but not from land to land
..()
else
to_chat(user, "<span class='warning'>Boats don't go on land!</span>")
@@ -168,6 +168,7 @@
desc = "A tiny ship inside a bottle."
icon = 'icons/obj/lavaland/artefacts.dmi'
icon_state = "ship_bottle"
resistance_flags = LAVA_PROOF | FIRE_PROOF
/obj/item/ship_in_a_bottle/attack_self(mob/user)
to_chat(user, "You're not sure how they get the ships in these things, but you're pretty sure you know how to get it out.")
code/modules/mining/mine_items.dm
-8
View File
@@ -81,7 +81,6 @@
item_state = "pickaxe"
w_class = WEIGHT_CLASS_BULKY
materials = list(MAT_METAL=2000) //one sheet, but where can you make them?
var/digspeed = 40 //moving the delay to an item var so R&D can make improved picks. --NEO
origin_tech = "materials=2;engineering=3"
attack_verb = list("hit", "pierced", "sliced", "attacked")
var/list/digsound = list('sound/effects/picaxe1.ogg','sound/effects/picaxe2.ogg','sound/effects/picaxe3.ogg')
@@ -98,7 +97,6 @@
name = "silver-plated pickaxe"
icon_state = "spickaxe"
item_state = "spickaxe"
digspeed = 30 //mines faster than a normal pickaxe, bought from mining vendor
origin_tech = "materials=3;engineering=4"
desc = "A silver-plated pickaxe that mines slightly faster than standard-issue."
toolspeed = 0.75
@@ -107,7 +105,6 @@
name = "golden pickaxe"
icon_state = "gpickaxe"
item_state = "gpickaxe"
digspeed = 20
origin_tech = "materials=4;engineering=4"
desc = "A gold-plated pickaxe that mines faster than standard-issue."
toolspeed = 0.6
@@ -116,7 +113,6 @@
name = "diamond-tipped pickaxe"
icon_state = "dpickaxe"
item_state = "dpickaxe"
digspeed = 20 //mines twice as fast as a normal pickaxe, bought from mining vendor
origin_tech = "materials=5;engineering=4"
desc = "A pickaxe with a diamond pick head. Extremely robust at cracking rock walls and digging up dirt."
toolspeed = 0.5
@@ -125,7 +121,6 @@
name = "mining drill"
icon_state = "handdrill"
item_state = "jackhammer"
digspeed = 25 //available from roundstart, faster than a pickaxe.
digsound = list('sound/weapons/drill.ogg')
hitsound = 'sound/weapons/drill.ogg'
usesound = 'sound/weapons/drill.ogg'
@@ -141,7 +136,6 @@
/obj/item/pickaxe/drill/diamonddrill
name = "diamond-tipped mining drill"
icon_state = "diamonddrill"
digspeed = 10
origin_tech = "materials=6;powerstorage=4;engineering=4"
desc = "Yours is the drill that will pierce the heavens!"
toolspeed = 0.25
@@ -156,14 +150,12 @@
/obj/item/pickaxe/drill/cyborg/diamond //This is the BORG version!
name = "diamond-tipped cyborg mining drill" //To inherit the NODROP flag, and easier to change borg specific drill mechanics.
icon_state = "diamonddrill"
digspeed = 10
toolspeed = 0.25
/obj/item/pickaxe/drill/jackhammer
name = "sonic jackhammer"
icon_state = "jackhammer"
item_state = "jackhammer"
digspeed = 5 //the epitome of powertools. extremely fast mining, laughs at puny walls
origin_tech = "materials=6;powerstorage=4;engineering=5;magnets=4"
digsound = list('sound/weapons/sonic_jackhammer.ogg')
hitsound = 'sound/weapons/sonic_jackhammer.ogg'
code/modules/mining/ore.dm
+1 -1
View File
@@ -48,7 +48,7 @@
if(istype(thing, /obj/item/storage/bag/ore))
OB = thing
break
if(OB && istype(F, /turf/simulated/floor/plating/airless/asteroid))
if(OB && istype(F, /turf/simulated/floor/plating/asteroid/airless))
F.attackby(OB, AM)
return ..()
code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+52 -34
View File
@@ -25,9 +25,18 @@
melee_damage_lower = 1
melee_damage_upper = 2
stop_automated_movement_when_pulled = 1
var/milk_content = 0
can_collar = 1
blood_volume = BLOOD_VOLUME_NORMAL
var/obj/item/udder/udder = null
/mob/living/simple_animal/hostile/retaliate/goat/New()
udder = new()
. = ..()
/mob/living/simple_animal/hostile/retaliate/goat/Destroy()
qdel(udder)
udder = null
return ..()
/mob/living/simple_animal/hostile/retaliate/goat/handle_automated_movement()
..()
@@ -54,9 +63,8 @@
/mob/living/simple_animal/hostile/retaliate/goat/Life(seconds, times_fired)
. = ..()
if(stat == CONSCIOUS && prob(5))
milk_content = min(50, milk_content+rand(5, 10))
if(stat == CONSCIOUS)
udder.generateMilk()
/mob/living/simple_animal/hostile/retaliate/goat/Retaliate()
..()
@@ -71,19 +79,9 @@
/mob/living/simple_animal/hostile/retaliate/goat/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(stat == CONSCIOUS && istype(O, /obj/item/reagent_containers/glass))
user.changeNext_move(CLICK_CD_MELEE)
var/obj/item/reagent_containers/glass/G = O
var/transfered = min(milk_content, rand(5,10), (G.volume - G.reagents.total_volume))
if(transfered > 0)
user.visible_message("<span class='notice'>[user] milks [src] using \the [O].</span>")
G.reagents.add_reagent("milk", transfered)
milk_content -= transfered
else if(G.reagents.total_volume >= G.volume)
to_chat(user, "<span class='warning'>\The [O] is full.</span>")
else
to_chat(user, "<span class='warning'>The udder is dry. Wait a bit longer...</span>")
udder.milkAnimal(O, user)
else
..()
return ..()
//cow
/mob/living/simple_animal/cow
@@ -108,34 +106,31 @@
attack_sound = 'sound/weapons/punch1.ogg'
health = 50
maxHealth = 50
var/milk_content = 0
can_collar = 1
gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
blood_volume = BLOOD_VOLUME_NORMAL
var/obj/item/udder/udder = null
/mob/living/simple_animal/cow/New()
..()
/mob/living/simple_animal/cow/Initialize()
udder = new()
. = ..()
/mob/living/simple_animal/cow/attackby(var/obj/item/O as obj, var/mob/user as mob, params, params)
/mob/living/simple_animal/cow/Destroy()
qdel(udder)
udder = null
return ..()
/mob/living/simple_animal/cow/attackby(obj/item/O, mob/user, params)
if(stat == CONSCIOUS && istype(O, /obj/item/reagent_containers/glass))
user.changeNext_move(CLICK_CD_MELEE)
var/obj/item/reagent_containers/glass/G = O
var/transfered = min(milk_content, rand(5,10), (G.volume - G.reagents.total_volume))
if(transfered > 0)
user.visible_message("<span class='notice'>[user] milks [src] using \the [O].</span>")
G.reagents.add_reagent("milk", transfered)
milk_content -= transfered
else if(G.reagents.total_volume >= G.volume)
to_chat(user, "<span class='warning'>\The [O] is full.</span>")
else
to_chat(user, "<span class='warning'>The udder is dry. Wait a bit longer...</span>")
udder.milkAnimal(O, user)
return 1
else
..()
return ..()
/mob/living/simple_animal/cow/Life(seconds, times_fired)
. = ..()
if(stat == CONSCIOUS && prob(5))
milk_content = min(50, milk_content+rand(5, 10))
if(stat == CONSCIOUS)
udder.generateMilk()
/mob/living/simple_animal/cow/attack_hand(mob/living/carbon/M as mob)
if(!stat && M.a_intent == INTENT_DISARM && icon_state != icon_dead)
@@ -412,3 +407,26 @@ var/global/chicken_count = 0
can_collar = 1
gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
blood_volume = BLOOD_VOLUME_NORMAL
/obj/item/udder
name = "udder"
/obj/item/udder/New()
create_reagents(50)
reagents.add_reagent("milk", 20)
. = ..()
/obj/item/udder/proc/generateMilk()
if(prob(5))
reagents.add_reagent("milk", rand(5, 10))
/obj/item/udder/proc/milkAnimal(obj/O, mob/user)
var/obj/item/reagent_containers/glass/G = O
if(G.reagents.total_volume >= G.volume)
to_chat(user, "<span class='danger'>[O] is full.</span>")
return
var/transfered = reagents.trans_to(O, rand(5,10))
if(transfered)
user.visible_message("[user] milks [src] using \the [O].", "<span class='notice'>You milk [src] using \the [O].</span>")
else
to_chat(user, "<span class='danger'>The udder is dry. Wait a bit longer...</span>")
code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
+261 -2
View File
@@ -140,6 +140,7 @@
move_resist = MOVE_FORCE_VERY_STRONG
pull_force = MOVE_FORCE_VERY_STRONG
var/pre_attack = 0
var/pre_attack_icon = "Goliath_preattack"
loot = list(/obj/item/asteroid/goliath_hide{layer = 4.1})
/mob/living/simple_animal/hostile/asteroid/goliath/process_ai()
@@ -151,7 +152,7 @@
pre_attack++
if(!pre_attack || stat || AIStatus == AI_IDLE)
return
icon_state = "Goliath_preattack"
icon_state = pre_attack_icon
/mob/living/simple_animal/hostile/asteroid/goliath/revive()
move_force = MOVE_FORCE_VERY_STRONG
@@ -181,7 +182,7 @@
icon_state = icon_aggro
return
/obj/effect/goliath_tentacle/
/obj/effect/goliath_tentacle
name = "Goliath tentacle"
icon = 'icons/mob/animal.dmi'
icon_state = "Goliath_tentacle"
@@ -266,3 +267,261 @@
else
to_chat(user, "<span class='warning'>You can't improve [D] any further!</span>")
return
/////////////////////Lavaland
//Watcher
/mob/living/simple_animal/hostile/asteroid/basilisk/watcher
name = "watcher"
desc = "A levitating, eye-like creature held aloft by winglike formations of sinew. A sharp spine of crystal protrudes from its body."
icon = 'icons/mob/lavaland/watcher.dmi'
icon_state = "watcher"
icon_living = "watcher"
icon_aggro = "watcher"
icon_dead = "watcher_dead"
pixel_x = -10
throw_message = "bounces harmlessly off of"
melee_damage_lower = 15
melee_damage_upper = 15
attacktext = "impales"
a_intent = INTENT_HARM
speak_emote = list("telepathically cries")
attack_sound = 'sound/weapons/bladeslice.ogg'
stat_attack = 1
flying = TRUE
robust_searching = 1
loot = list()
butcher_results = list(/obj/item/stack/ore/diamond = 2, /obj/item/stack/sheet/sinew = 2, /obj/item/stack/sheet/bone = 1)
//Goliath
/mob/living/simple_animal/hostile/asteroid/goliath/beast
name = "goliath"
desc = "A hulking, armor-plated beast with long tendrils arching from its back."
icon = 'icons/mob/lavaland/lavaland_monsters.dmi'
icon_state = "goliath"
icon_living = "goliath"
icon_aggro = "goliath"
icon_dead = "goliath_dead"
throw_message = "does nothing to the tough hide of the"
pre_attack_icon = "goliath2"
butcher_results = list(/obj/item/reagent_containers/food/snacks/goliath = 2, /obj/item/stack/sheet/animalhide/goliath_hide = 1, /obj/item/stack/sheet/bone = 2)
loot = list()
stat_attack = 1
robust_searching = 1
//Gutlunches
/obj/item/udder/gutlunch
name = "nutrient sac"
/obj/item/udder/gutlunch/New()
reagents = new(50)
reagents.my_atom = src
/obj/item/udder/gutlunch/generateMilk()
if(prob(60))
reagents.add_reagent("cream", rand(2, 5))
if(prob(45))
reagents.add_reagent("salglu_solution", rand(2,5))
/mob/living/simple_animal/hostile/asteroid/gutlunch
name = "gutlunch"
desc = "A scavenger that eats raw meat, often found alongside ash walkers. Produces a thick, nutritious milk."
icon = 'icons/mob/lavaland/lavaland_monsters.dmi'
icon_state = "gutlunch"
icon_living = "gutlunch"
icon_dead = "gutlunch"
speak_emote = list("warbles", "quavers")
emote_hear = list("trills.")
emote_see = list("sniffs.", "burps.")
weather_immunities = list("lava","ash")
faction = list("mining", "ashwalker")
density = 0
speak_chance = 1
turns_per_move = 8
obj_damage = 0
environment_smash = 0
move_to_delay = 15
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "squishes"
friendly = "pinches"
a_intent = INTENT_HELP
ventcrawler = 2
gold_core_spawnable = 2
stat_attack = 1
gender = NEUTER
stop_automated_movement = FALSE
stop_automated_movement_when_pulled = TRUE
stat_exclusive = TRUE
robust_searching = TRUE
search_objects = TRUE
del_on_death = TRUE
loot = list(/obj/effect/decal/cleanable/blood/gibs)
deathmessage = "is pulped into bugmash."
simplespecies = /mob/living/simple_animal/hostile/asteroid/gutlunch
childtype = list(/mob/living/simple_animal/hostile/asteroid/gutlunch/gubbuck = 45, /mob/living/simple_animal/hostile/asteroid/gutlunch/guthen = 55)
wanted_objects = list(/obj/effect/decal/cleanable/blood/gibs)
var/obj/item/udder/gutlunch/udder = null
/mob/living/simple_animal/hostile/asteroid/gutlunch/New()
udder = new()
..()
/mob/living/simple_animal/hostile/asteroid/gutlunch/Destroy()
qdel(udder)
udder = null
return ..()
/mob/living/simple_animal/hostile/asteroid/gutlunch/regenerate_icons()
cut_overlays()
if(udder.reagents.total_volume == udder.reagents.maximum_volume)
add_overlay("gl_full")
..()
/mob/living/simple_animal/hostile/asteroid/gutlunch/attackby(obj/item/O, mob/user, params)
if(stat == CONSCIOUS && istype(O, /obj/item/reagent_containers/glass))
udder.milkAnimal(O, user)
regenerate_icons()
else
..()
/mob/living/simple_animal/hostile/asteroid/gutlunch/AttackingTarget()
if(is_type_in_typecache(target, wanted_objects)) //we eats
udder.generateMilk()
regenerate_icons()
visible_message("<span class='notice'>[src] slurps up [target].</span>")
qdel(target)
..()
/obj/item/udder/gutlunch
name = "nutrient sac"
/obj/item/udder/gutlunch/New()
reagents = new(50)
reagents.my_atom = src
/obj/item/udder/gutlunch/generateMilk()
if(prob(60))
reagents.add_reagent("cream", rand(2, 5))
if(prob(45))
reagents.add_reagent("salglu_solution", rand(2,5))
//Male gutlunch. They're smaller and more colorful!
/mob/living/simple_animal/hostile/asteroid/gutlunch/gubbuck
name = "gubbuck"
gender = MALE
/mob/living/simple_animal/hostile/asteroid/gutlunch/gubbuck/New()
..()
add_atom_colour(pick("#E39FBB", "#D97D64", "#CF8C4A"), FIXED_COLOUR_PRIORITY)
resize = 0.85
update_transform()
//Lady gutlunch. They make the babby.
/mob/living/simple_animal/hostile/asteroid/gutlunch/guthen
name = "guthen"
gender = FEMALE
/mob/living/simple_animal/hostile/asteroid/gutlunch/guthen/Life()
..()
if(udder.reagents.total_volume == udder.reagents.maximum_volume) //Only breed when we're full.
make_babies()
/mob/living/simple_animal/hostile/asteroid/gutlunch/guthen/make_babies()
. = ..()
if(.)
udder.reagents.clear_reagents()
regenerate_icons()
//Nests
/mob/living/simple_animal/hostile/spawner/lavaland
name = "necropolis tendril"
desc = "A vile tendril of corruption, originating deep underground. Terrible monsters are pouring out of it."
icon = 'icons/mob/nest.dmi'
icon_state = "tendril"
icon_living = "tendril"
icon_dead = "tendril"
faction = list("mining")
weather_immunities = list("lava","ash")
luminosity = 1
health = 250
maxHealth = 250
max_mobs = 3
spawn_time = 300 //30 seconds default
mob_type = /mob/living/simple_animal/hostile/asteroid/basilisk/watcher
spawn_text = "emerges from"
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = INFINITY
loot = list(/obj/effect/collapse, /obj/structure/closet/crate/necropolis/tendril)
del_on_death = 1
var/gps = null
/mob/living/simple_animal/hostile/spawner/lavaland/New()
..()
//for(var/F in RANGE_TURFS(1, src)) TODO: Uncomment
//if(ismineralturf(F))
//var/turf/simulated/mineral/M = F
//M.ChangeTurf(M.turf_type, FALSE, TRUE)
gps = new /obj/item/gps/internal(src)
/mob/living/simple_animal/hostile/spawner/lavaland/Destroy()
qdel(gps)
. = ..()
#define MEDAL_PREFIX "Tendril"
/mob/living/simple_animal/hostile/spawner/lavaland/death()
var/last_tendril = TRUE
for(var/mob/living/simple_animal/hostile/spawner/lavaland/other in GLOB.mob_list)
if(other != src)
last_tendril = FALSE
break
if(last_tendril && !admin_spawned)
if(global.medal_hub && global.medal_pass && global.medals_enabled)
for(var/mob/living/L in view(7,src))
if(L.stat)
continue
if(L.client)
var/client/C = L.client
var/suffixm = ALL_KILL_MEDAL
var/prefix = MEDAL_PREFIX
UnlockMedal("[prefix] [suffixm]",C)
SetScore(TENDRIL_CLEAR_SCORE,C,1)
..()
#undef MEDAL_PREFIX
/obj/effect/collapse
name = "collapsing necropolis tendril"
desc = "Get clear!"
luminosity = 1
layer = ABOVE_OPEN_TURF_LAYER
icon = 'icons/mob/nest.dmi'
icon_state = "tendril"
anchored = TRUE
/obj/effect/collapse/New()
..()
visible_message("<span class='boldannounce'>The tendril writhes in fury as the earth around it begins to crack and break apart! Get back!</span>")
visible_message("<span class='warning'>Something falls free of the tendril!</span>")
playsound(get_turf(src),'sound/effects/tendril_destroyed.ogg', 200, 0, 50, 1, 1)
spawn(50)
for(var/mob/M in range(7,src))
shake_camera(M, 15, 1)
playsound(get_turf(src),'sound/effects/explosionfar.ogg', 200, 1)
visible_message("<span class='boldannounce'>The tendril falls inward, the ground around it widening into a yawning chasm!</span>")
for(var/turf/T in range(2,src))
if(!T.density)
T.TerraformTurf(/turf/simulated/floor/chasm/straight_down/lava_land_surface)
qdel(src)
/mob/living/simple_animal/hostile/spawner/lavaland/goliath
mob_type = /mob/living/simple_animal/hostile/asteroid/goliath/beast
/mob/living/simple_animal/hostile/spawner/lavaland/legion
mob_type = /mob/living/simple_animal/hostile/asteroid/hivelord/legion
code/modules/procedural_mapping/mapGenerators/asteroid.dm
+1 -1
View File
@@ -1,6 +1,6 @@
//Asteroid turfs
/datum/mapGeneratorModule/bottomLayer/asteroidTurfs
spawnableTurfs = list(/turf/simulated/floor/plating/airless/asteroid = 100)
spawnableTurfs = list(/turf/simulated/floor/plating/asteroid/airless = 100)
/datum/mapGeneratorModule/bottomLayer/asteroidWalls
spawnableTurfs = list(/turf/simulated/mineral = 100)
icons/obj/food/food.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 96 KiB

After

Width:  |  Height:  |  Size: 97 KiB

icons/turf/floors/lava.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 114 KiB

After

Width:  |  Height:  |  Size: 37 KiB

icons/turf/floors/plating.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 55 KiB

icons/turf/snow.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 28 KiB

paradise.dme
+5 -1
View File
@@ -420,6 +420,7 @@
#include "code\game\area\depot-areas.dm"
#include "code\game\area\Dynamic areas.dm"
#include "code\game\area\Space Station 13 areas.dm"
#include "code\game\area\areas\mining.dm"
#include "code\game\dna\dna2.dm"
#include "code\game\dna\dna2_domutcheck.dm"
#include "code\game\dna\dna2_helpers.dm"
@@ -1087,12 +1088,16 @@
#include "code\game\turfs\turf.dm"
#include "code\game\turfs\unsimulated.dm"
#include "code\game\turfs\simulated\floor.dm"
#include "code\game\turfs\simulated\minerals.dm"
#include "code\game\turfs\simulated\shuttle.dm"
#include "code\game\turfs\simulated\walls.dm"
#include "code\game\turfs\simulated\walls_mineral.dm"
#include "code\game\turfs\simulated\walls_misc.dm"
#include "code\game\turfs\simulated\walls_reinforced.dm"
#include "code\game\turfs\simulated\floor\asteroid.dm"
#include "code\game\turfs\simulated\floor\chasm.dm"
#include "code\game\turfs\simulated\floor\fancy_floor.dm"
#include "code\game\turfs\simulated\floor\lava.dm"
#include "code\game\turfs\simulated\floor\light_floor.dm"
#include "code\game\turfs\simulated\floor\mineral.dm"
#include "code\game\turfs\simulated\floor\misc_floor.dm"
@@ -1608,7 +1613,6 @@
#include "code\modules\mining\machine_unloading.dm"
#include "code\modules\mining\mine_areas.dm"
#include "code\modules\mining\mine_items.dm"
#include "code\modules\mining\mine_turfs.dm"
#include "code\modules\mining\minebot.dm"
#include "code\modules\mining\mint.dm"
#include "code\modules\mining\money_bag.dm"
sound/ambience/ambilava.ogg
BIN
View File
Binary file not shown.
sound/effects/tendril_destroyed.ogg
BIN
View File
Binary file not shown.
tools/Runtime Condenser/Input.txt
+1 -1
View File
@@ -1410,7 +1410,7 @@ proc name: throw at (/atom/movable/proc/throw_at)
usr: Reese Marcotte (/mob/living/carbon/human)
src: Reese Marcotte (/mob/living/carbon/human)
call stack:
Reese Marcotte (/mob/living/carbon/human): throw at(Asteroid (174,85,5) (/turf/simulated/floor/plating/airless/asteroid), 5, 1)
Reese Marcotte (/mob/living/carbon/human): throw at(Asteroid (174,85,5) (/turf/simulated/floor/plating/asteroid/airless), 5, 1)
Delivery chute (/obj/machinery/disposal/deliveryChute): expel(null)
Rebooted server.
Running TG Revision Number: 4060.