Merge pull request #3440 from CHOMPStation2/upstream-merge-11834

[MIRROR] SD QOL update
This commit is contained in:
Nadyr
2021-12-12 05:23:16 -05:00
committed by GitHub
26 changed files with 22905 additions and 364 deletions
@@ -216,4 +216,4 @@
if(!T)
return
if(T.get_lumcount() >= 0.5)
adjustBruteLoss(1)
adjustBruteLoss(1)
@@ -174,4 +174,4 @@
icon_living = "startreader"
SetStunned(0)
update_icon()
update_icon()
@@ -688,7 +688,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have?
amount_grown -= rand(100,250)
if(not_hungy)
do_breeding()
if(prob(0.5))
if(!client && prob(0.5))
teppi_sound()
/mob/living/simple_mob/vore/alienanimals/teppi/proc/do_breeding()
@@ -1180,4 +1180,4 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have?
skin_color = "#f09ca9"
marking_type = "13"
horn_type = "0"
. = ..()
. = ..()
@@ -45,4 +45,14 @@
L.Confuse(1)
L.throw_at(get_edge_target_turf(L, throwdir), rand(3,6), 10)
//VOREStation Add Start
if(istype(L, /mob/living/simple_mob/vore/alienanimals/startreader))
var/mob/living/simple_mob/vore/alienanimals/startreader/S = L
if(!S.flipped)
S.adjustBruteLoss(100)
S.visible_message("<span class='notice'>\The [S] is flipped over!!!</span>")
S.flipped = TRUE
S.flip_cooldown = 10
S.handle_flip()
//VOREStation Add End
return 1
@@ -87,7 +87,12 @@
new_temperature = round(new_temperature * temp_factor)
L.bodytemperature = new_temperature
//VOREStation Add Start - The last metroid has escaped from captivity, the galaxy is no longer safe.
if(istype(L, /mob/living/simple_mob/vore/alienanimals/space_jellyfish) && target_temperature <= T0C)
var/mob/living/simple_mob/vore/alienanimals/space_jellyfish/J = L
J.adjustFireLoss(75)
J.movement_cooldown *= 2
//VOREStation Add End
return 1
/obj/item/projectile/temp/hot
Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 30 KiB

+222 -80
View File
@@ -8,6 +8,7 @@
"ac" = (
/obj/structure/table/steel_reinforced,
/obj/machinery/power/apc/angled{
cell_type = /obj/item/weapon/cell/super;
dir = 1;
name = "night shift APC";
nightshift_setting = 2
@@ -3117,8 +3118,9 @@
dir = 4
},
/obj/machinery/power/apc/angled{
cell_type = /obj/item/weapon/cell/super;
dir = 8;
req_access = list(31)
req_access = list(31,5)
},
/obj/structure/cable/yellow,
/obj/machinery/light/floortube{
@@ -3940,7 +3942,11 @@
},
/obj/machinery/recharger/wallcharger{
pixel_x = 4;
pixel_y = 28
pixel_y = 29
},
/obj/machinery/recharger/wallcharger{
pixel_x = 4;
pixel_y = 38
},
/turf/simulated/floor/tiled/dark,
/area/security/security_cell_hallway)
@@ -4215,6 +4221,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/station_map{
pixel_y = 32
},
/turf/simulated/floor/tiled/techmaint,
/area/stellardelight/deck1/aft)
"iT" = (
@@ -4254,6 +4263,15 @@
/obj/structure/flora/pottedplant/stoutbush,
/turf/simulated/floor/tiled/techmaint,
/area/stellardelight/deck1/starboard)
"iX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
/obj/structure/cable/green{
icon_state = "1-2"
},
/turf/simulated/floor/tiled/techmaint,
/area/stellardelight/deck1/fore)
"iY" = (
/obj/effect/floor_decal/industrial/warning{
dir = 8
@@ -4594,6 +4612,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 6
},
/obj/machinery/hologram/holopad,
/turf/simulated/floor/tiled/eris/steel/cargo,
/area/stellardelight/deck1/mining)
"jG" = (
@@ -4846,6 +4865,17 @@
},
/turf/simulated/floor/lino,
/area/chapel/office)
"kl" = (
/obj/structure/disposalpipe/segment,
/obj/effect/floor_decal/milspec/color/emerald/half{
dir = 4
},
/obj/machinery/station_map{
dir = 8;
pixel_x = 32
},
/turf/simulated/floor/tiled/techmaint,
/area/stellardelight/deck1/aft)
"km" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -5962,6 +5992,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
/obj/machinery/station_map{
pixel_y = 32
},
/turf/simulated/floor/tiled/techmaint,
/area/stellardelight/deck1/starboard)
"mF" = (
@@ -6111,6 +6144,15 @@
},
/turf/simulated/floor/tiled/steel_ridged,
/area/stellardelight/deck1/starboard)
"mT" = (
/obj/structure/cable/green{
icon_state = "4-8"
},
/obj/structure/cable/green{
icon_state = "1-8"
},
/turf/simulated/floor/tiled/techmaint,
/area/stellardelight/deck1/fore)
"mU" = (
/obj/structure/closet/emcloset,
/turf/simulated/floor/tiled/dark,
@@ -7946,6 +7988,9 @@
},
/turf/simulated/floor/tiled/steel_ridged,
/area/stellardelight/deck1/resleeving)
"qX" = (
/turf/space/internal_edge/right,
/area/stellardelight/deck1/starboard)
"qY" = (
/obj/effect/floor_decal/milspec/color/orange/half,
/turf/simulated/floor/tiled/dark,
@@ -8133,6 +8178,11 @@
},
/turf/simulated/floor,
/area/maintenance/stellardelight/substation/security)
"rt" = (
/obj/structure/table/woodentable,
/obj/item/weapon/folder/blue,
/turf/simulated/floor/tiled/milspec,
/area/stellardelight/deck1/explobriefing)
"ru" = (
/obj/machinery/light_switch{
dir = 4;
@@ -9557,6 +9607,9 @@
},
/turf/simulated/floor/carpet/purcarpet,
/area/stellardelight/deck1/dorms/dorm2)
"uw" = (
/turf/space/internal_edge/left,
/area/stellardelight/deck1/starboard)
"ux" = (
/obj/machinery/door/firedoor/glass,
/obj/structure/cable/green{
@@ -9663,6 +9716,10 @@
/obj/effect/floor_decal/steeldecal/steel_decals6{
dir = 9
},
/obj/structure/closet/emergsuit_wall{
dir = 8;
pixel_x = -27
},
/turf/simulated/floor/tiled/techmaint,
/area/stellardelight/deck1/port)
"uH" = (
@@ -10741,6 +10798,9 @@
/obj/structure/filingcabinet/chestdrawer,
/turf/simulated/floor/tiled/dark,
/area/security/security_processing)
"xe" = (
/turf/simulated/wall/bay/r_wall/brown,
/area/stellardelight/deck1/starboard)
"xf" = (
/obj/machinery/door/firedoor/glass,
/obj/structure/window/bay/reinforced,
@@ -10957,15 +11017,12 @@
/turf/simulated/floor/tiled/eris/steel/cargo,
/area/stellardelight/deck1/oreprocessing)
"xE" = (
/obj/machinery/power/apc/angled{
dir = 1
},
/obj/structure/cable/green{
icon_state = "0-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
/obj/machinery/station_map{
pixel_y = 32
},
/turf/simulated/floor/tiled/techmaint,
/area/stellardelight/deck1/fore)
"xF" = (
@@ -11173,8 +11230,9 @@
dir = 8
},
/obj/machinery/power/apc/angled{
cell_type = /obj/item/weapon/cell/super;
dir = 4;
req_access = list(19,43,67)
req_access = list(19,43,67,66,5)
},
/obj/structure/cable/green{
color = "#42038a"
@@ -14012,6 +14070,9 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/security_cell_hallway)
"Ef" = (
/turf/space/internal_edge/top,
/area/stellardelight/deck1/starboard)
"Eg" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -14189,6 +14250,18 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/rnd/xenobiology)
"EA" = (
/obj/effect/floor_decal/milspec/color/red/half{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals6{
dir = 10
},
/obj/machinery/firealarm/angled{
dir = 4
},
/turf/simulated/floor/tiled/techmaint,
/area/stellardelight/deck1/fore)
"EB" = (
/obj/machinery/door/window/eastright{
dir = 8;
@@ -14237,6 +14310,18 @@
pixel_x = 4;
pixel_y = 5
},
/obj/machinery/recharger/wallcharger{
pixel_x = 4;
pixel_y = 20
},
/obj/machinery/recharger/wallcharger{
pixel_x = 4;
pixel_y = 28
},
/obj/machinery/recharger/wallcharger{
pixel_x = 4;
pixel_y = 36
},
/turf/simulated/floor/tiled,
/area/stellardelight/deck1/explobriefing)
"EG" = (
@@ -14392,6 +14477,9 @@
},
/turf/simulated/floor/tiled/dark,
/area/chapel/main)
"EZ" = (
/turf/space/internal_edge/bottomright,
/area/stellardelight/deck1/starboard)
"Fa" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 10
@@ -15982,18 +16070,23 @@
/turf/simulated/floor/tiled/dark,
/area/security/security_lockerroom)
"Iu" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/door/airlock/angled_bay/external/glass{
dir = 4;
door_color = "#525252";
name = "Exploration Shuttle";
<<<<<<< HEAD
req_one_access = list(19,43,67);
=======
req_one_access = list(19,43,67,66,5);
>>>>>>> b8bd9f130c... Merge pull request #11834 from Very-Soft/QOLwow
stripe_color = "#408f3b"
},
/obj/structure/cable/green{
color = "#42038a";
icon_state = "4-8"
},
/obj/machinery/atmospheric_field_generator/perma,
/obj/machinery/door/firedoor/glass/talon,
/turf/simulated/floor/tiled/steel_ridged,
/area/stellardelight/deck1/exploshuttle)
"Iw" = (
@@ -16221,6 +16314,9 @@
},
/turf/simulated/floor,
/area/maintenance/stellardelight/deck1/portcent)
"IT" = (
/turf/space/internal_edge/bottom,
/area/stellardelight/deck1/starboard)
"IU" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/green{
@@ -17611,17 +17707,18 @@
/turf/simulated/wall/bay/r_wall/steel,
/area/stellardelight/deck1/exploration)
"Ma" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/door/airlock/angled_bay/external/glass{
dir = 4;
door_color = "#a88860";
name = "Mining Shuttle";
req_access = list(31);
req_access = list(31,5);
stripe_color = "#69461a"
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/atmospheric_field_generator/perma,
/obj/machinery/door/firedoor/glass/talon,
/turf/simulated/floor/tiled/steel_ridged,
/area/stellardelight/deck1/miningshuttle)
"Mb" = (
@@ -17691,6 +17788,9 @@
/obj/structure/low_wall/bay/reinforced/purple,
/turf/simulated/floor,
/area/rnd/workshop)
"Mh" = (
/turf/space/internal_edge/topleft,
/area/stellardelight/deck1/starboard)
"Mi" = (
/obj/structure/table/standard,
/obj/item/weapon/stock_parts/matter_bin,
@@ -18406,6 +18506,9 @@
/area/assembly/robotics)
"NN" = (
/obj/structure/table/steel_reinforced,
/obj/machinery/recharger{
pixel_y = 5
},
/turf/simulated/floor/tiled/dark,
/area/security/lobby)
"NP" = (
@@ -18437,6 +18540,9 @@
},
/turf/simulated/floor,
/area/stellardelight/deck1/mining)
"NT" = (
/turf/space/internal_edge/topright,
/area/stellardelight/deck1/starboard)
"NV" = (
/obj/structure/cable/green{
color = "#42038a";
@@ -19479,7 +19585,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/firealarm/angled,
/obj/machinery/station_map{
pixel_y = 32
},
/turf/simulated/floor/tiled/techmaint,
/area/stellardelight/deck1/fore)
"Qp" = (
@@ -20152,6 +20260,9 @@
},
/turf/simulated/floor/tiled/eris/white/bluecorner,
/area/medical/exam_room)
"RI" = (
/turf/space/internal_edge/bottomleft,
/area/stellardelight/deck1/starboard)
"RJ" = (
/obj/machinery/light{
dir = 4
@@ -20242,7 +20353,7 @@
},
/obj/machinery/recharger/wallcharger{
pixel_x = 4;
pixel_y = 28
pixel_y = 29
},
/obj/machinery/recharger/wallcharger{
pixel_x = 4;
@@ -20251,14 +20362,24 @@
/obj/effect/floor_decal/milspec/color/red/half{
dir = 4
},
/obj/machinery/recharger/wallcharger{
pixel_x = 4;
pixel_y = 38
},
/turf/simulated/floor/tiled/dark,
/area/security/security_lockerroom)
"RX" = (
/obj/structure/cable/green{
icon_state = "4-8"
/obj/effect/floor_decal/milspec/color/red/half{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals6{
dir = 9
},
/obj/machinery/power/apc/angled{
dir = 8
},
/obj/structure/cable/green{
icon_state = "1-8"
icon_state = "0-2"
},
/turf/simulated/floor/tiled/techmaint,
/area/stellardelight/deck1/fore)
@@ -21212,6 +21333,8 @@
/obj/machinery/alarm/angled{
dir = 4
},
/obj/item/paint_palette,
/obj/item/paint_brush,
/turf/simulated/floor/wood,
/area/library)
"TW" = (
@@ -21500,6 +21623,7 @@
/area/rnd/research)
"UB" = (
/obj/machinery/power/apc/angled{
cell_type = /obj/item/weapon/cell/super;
dir = 1;
name = "night shift APC";
nightshift_setting = 2
@@ -22099,7 +22223,10 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
/obj/structure/ore_box,
/obj/structure/table/standard,
/obj/machinery/recharger{
pixel_y = 5
},
/turf/simulated/floor/tiled/eris/steel/cargo,
/area/stellardelight/deck1/mining)
"VF" = (
@@ -23291,6 +23418,7 @@
/obj/machinery/camera/network/mining{
dir = 8
},
/obj/structure/ore_box,
/turf/simulated/floor/tiled/eris/steel/cargo,
/area/stellardelight/deck1/mining)
"Yi" = (
@@ -23440,7 +23568,9 @@
/area/security/tactical)
"Yy" = (
/obj/structure/table/steel_reinforced,
/obj/machinery/recharger,
/obj/machinery/recharger{
pixel_y = 5
},
/obj/structure/sign/vacuum{
pixel_y = 32
},
@@ -23778,7 +23908,9 @@
/area/stellardelight/deck1/miningequipment)
"Zh" = (
/obj/structure/table/woodentable,
/obj/item/weapon/folder/blue,
/obj/machinery/recharger{
pixel_y = 5
},
/turf/simulated/floor/tiled/milspec,
/area/stellardelight/deck1/explobriefing)
"Zi" = (
@@ -23968,7 +24100,14 @@
/turf/simulated/floor/tiled/techmaint,
/area/stellardelight/deck1/aft)
"ZC" = (
/obj/machinery/firealarm/angled,
/obj/machinery/recharger/wallcharger{
pixel_x = 4;
pixel_y = 20
},
/obj/machinery/recharger/wallcharger{
pixel_x = 4;
pixel_y = 29
},
/turf/simulated/floor/tiled/eris/steel/cargo,
/area/stellardelight/deck1/mining)
"ZD" = (
@@ -24031,6 +24170,9 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
/obj/machinery/firealarm/angled{
dir = 8
},
/turf/simulated/floor/tiled/eris/steel/cargo,
/area/stellardelight/deck1/mining)
"ZK" = (
@@ -24064,9 +24206,9 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/structure/closet/emergsuit_wall{
dir = 8;
pixel_x = -27
/obj/machinery/station_map{
dir = 4;
pixel_x = -32
},
/turf/simulated/floor/tiled/techmaint,
/area/stellardelight/deck1/aft)
@@ -31106,7 +31248,7 @@ Rz
TC
oZ
Zh
zZ
rt
OB
Rz
ny
@@ -33032,7 +33174,7 @@ Zy
SQ
Yv
xE
RX
zW
xZ
MA
Zt
@@ -33314,9 +33456,9 @@ Xk
OD
ZR
QG
XC
IF
zW
RX
iX
mT
Ku
Ku
Ku
@@ -33617,13 +33759,13 @@ rW
lC
HT
ER
uq
uq
uq
uq
uq
uq
uq
EZ
qX
qX
qX
qX
qX
NT
vu
Br
AP
@@ -33759,13 +33901,13 @@ SH
jD
PI
IZ
uq
uq
uq
uq
uq
uq
uq
IT
xe
xe
xe
xe
xe
Ef
AT
Aq
WE
@@ -33901,13 +34043,13 @@ zg
aj
Wl
IZ
uq
uq
uq
uq
uq
uq
uq
IT
xe
xe
xe
xe
xe
Ef
AT
Qd
VH
@@ -34043,13 +34185,13 @@ bi
bi
bi
bi
uq
uq
uq
uq
uq
uq
uq
IT
xe
xe
xe
xe
xe
Ef
IC
IC
IC
@@ -34185,13 +34327,13 @@ Si
gK
LX
wE
uq
uq
uq
uq
uq
uq
uq
IT
xe
xe
xe
xe
xe
Ef
PA
da
dc
@@ -34327,13 +34469,13 @@ KG
sn
kL
wE
uq
uq
uq
uq
uq
uq
uq
IT
xe
xe
xe
xe
xe
Ef
PA
Wk
iT
@@ -34469,13 +34611,13 @@ HX
Gu
JB
bi
uq
uq
uq
uq
uq
uq
uq
RI
uw
uw
uw
uw
uw
Mh
IC
RM
De
@@ -34734,7 +34876,7 @@ HN
Tg
Vr
Hs
zb
EA
zc
zW
Ku
@@ -35626,7 +35768,7 @@ Wj
MH
xx
xF
XJ
kl
CV
kv
jg
+212 -58
View File
@@ -549,6 +549,45 @@
},
/turf/simulated/floor/tiled/eris/steel/cargo,
/area/quartermaster/storage)
<<<<<<< HEAD
=======
"bm" = (
/obj/structure/sign/directions/science{
pixel_x = 32
},
/obj/structure/sign/directions/dorms{
pixel_x = 32;
pixel_y = 6
},
/obj/structure/sign/directions{
desc = "A direction sign, pointing out the way to Exploration.";
name = "\improper Exploration Department";
pixel_x = 32;
pixel_y = -6
},
/obj/structure/sign/directions/security{
pixel_x = 32;
pixel_y = 12
},
/obj/structure/sign/directions/stairs_down{
pixel_x = 32;
pixel_y = 18
},
/obj/structure/railing/grey{
dir = 4
},
/turf/simulated/floor/tiled/monotile,
/area/stellardelight/deck2/aftport)
"bn" = (
/obj/structure/railing/grey{
dir = 8
},
/obj/structure/cable/white{
icon_state = "32-1"
},
/turf/simulated/floor/tiled/monotile,
/area/stellardelight/deck2/triage)
>>>>>>> b8bd9f130c... Merge pull request #11834 from Very-Soft/QOLwow
"bo" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 9
@@ -582,6 +621,36 @@
},
/turf/simulated/floor/tiled,
/area/hydroponics)
<<<<<<< HEAD
=======
"br" = (
/obj/structure/sign/directions/science{
pixel_x = -32
},
/obj/structure/sign/directions/dorms{
pixel_x = -32;
pixel_y = 6
},
/obj/structure/sign/directions{
desc = "A direction sign, pointing out the way to Exploration.";
name = "\improper Exploration Department";
pixel_x = -32;
pixel_y = -6
},
/obj/structure/sign/directions/security{
pixel_x = -32;
pixel_y = 12
},
/obj/structure/sign/directions/stairs_down{
pixel_x = -32;
pixel_y = 18
},
/obj/structure/railing/grey{
dir = 8
},
/turf/simulated/floor/tiled/monotile,
/area/stellardelight/deck2/aftstarboard)
>>>>>>> b8bd9f130c... Merge pull request #11834 from Very-Soft/QOLwow
"bs" = (
/obj/structure/table/standard,
/obj/item/device/healthanalyzer,
@@ -1976,9 +2045,6 @@
/area/stellardelight/deck2/aftport)
"eE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/universal,
/obj/structure/cable{
icon_state = "1-2"
},
/turf/simulated/floor,
/area/maintenance/stellardelight/deck2/portsolars)
"eF" = (
@@ -2811,6 +2877,12 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/engineering/atmos/monitoring)
"gA" = (
/obj/structure/railing/grey{
dir = 4
},
/turf/simulated/floor/tiled/monotile,
/area/stellardelight/deck2/fore)
"gB" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -2855,10 +2927,10 @@
/area/engineering/storage)
"gF" = (
/obj/structure/cable/orange{
icon_state = "2-8"
icon_state = "1-2"
},
/obj/structure/cable/orange{
icon_state = "1-2"
icon_state = "2-8"
},
/turf/simulated/floor/airless,
/area/stellardelight/deck2/exterior)
@@ -3029,9 +3101,6 @@
/obj/machinery/alarm/angled{
dir = 8
},
/obj/structure/cable{
icon_state = "1-2"
},
/turf/simulated/floor,
/area/maintenance/stellardelight/deck2/starboardsolars)
"hb" = (
@@ -3993,13 +4062,15 @@
/turf/simulated/floor/tiled,
/area/stellardelight/deck2/fore)
"jz" = (
/obj/machinery/firealarm/angled,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 1
},
/obj/machinery/station_map{
pixel_y = 32
},
/turf/simulated/floor/tiled,
/area/stellardelight/deck2/aftstarboard)
"jA" = (
@@ -4928,6 +4999,10 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
},
/turf/simulated/floor/tiled/techfloor,
/area/engineering/atmos/monitoring)
"lu" = (
@@ -5303,6 +5378,16 @@
},
/turf/simulated/floor/airless,
/area/stellardelight/deck2/exterior)
"mb" = (
/obj/effect/floor_decal/milspec/color/blue/half{
dir = 4
},
/obj/machinery/station_map{
dir = 8;
pixel_x = 32
},
/turf/simulated/floor/tiled,
/area/stellardelight/deck2/port)
"md" = (
/obj/effect/floor_decal/industrial/outline,
/obj/effect/floor_decal/steeldecal/steel_decals9,
@@ -5355,14 +5440,15 @@
/area/stellardelight/deck2/port)
"mj" = (
/obj/machinery/atmospherics/pipe/simple/hidden/universal,
/obj/structure/cable{
icon_state = "0-2"
},
/obj/machinery/power/apc/angled{
cell_type = /obj/item/weapon/cell/super;
dir = 4;
name = "night shift APC";
nightshift_setting = 2
},
/obj/structure/cable{
icon_state = "0-8"
},
/turf/simulated/floor,
/area/maintenance/stellardelight/deck2/starboardsolars)
"mk" = (
@@ -5620,6 +5706,10 @@
/obj/effect/floor_decal/milspec/color/silver/corner{
dir = 4
},
/obj/machinery/station_map{
dir = 8;
pixel_x = 32
},
/turf/simulated/floor/tiled,
/area/stellardelight/deck2/fore)
"mO" = (
@@ -5871,6 +5961,10 @@
/obj/effect/floor_decal/milspec/color/orange/half{
dir = 8
},
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/turf/simulated/floor/tiled,
/area/stellardelight/deck2/aftport)
"nx" = (
@@ -6543,6 +6637,9 @@
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 1
},
/obj/machinery/station_map{
pixel_y = 32
},
/turf/simulated/floor/tiled,
/area/stellardelight/deck2/fore)
"pb" = (
@@ -6651,9 +6748,6 @@
/obj/structure/cable{
icon_state = "0-8"
},
/obj/structure/cable{
icon_state = "1-8"
},
/turf/simulated/floor,
/area/maintenance/stellardelight/deck2/portsolars)
"pl" = (
@@ -7003,12 +7097,13 @@
/turf/simulated/floor/tiled/techfloor,
/area/stellardelight/deck2/o2production)
"pZ" = (
/obj/machinery/firealarm/angled{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 4
},
/obj/machinery/station_map{
dir = 8;
pixel_x = 32
},
/turf/simulated/floor/tiled,
/area/stellardelight/deck2/fore)
"qa" = (
@@ -7069,6 +7164,9 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable{
icon_state = "1-4"
},
/turf/simulated/floor,
/area/maintenance/stellardelight/deck2/starboardsolars)
"qi" = (
@@ -7457,6 +7555,9 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
/obj/structure/cable/green{
icon_state = "1-8"
},
/turf/simulated/floor,
/area/maintenance/stellardelight/deck2/portsolars)
"qZ" = (
@@ -8549,9 +8650,6 @@
/obj/structure/cable{
icon_state = "0-4"
},
/obj/structure/cable{
icon_state = "1-4"
},
/turf/simulated/floor,
/area/maintenance/stellardelight/deck2/starboardsolars)
"ty" = (
@@ -8562,6 +8660,7 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/techfloor,
/area/engineering/atmos/monitoring)
"tz" = (
@@ -10202,6 +10301,10 @@
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 1
},
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
/turf/simulated/floor/tiled,
/area/stellardelight/deck2/aftport)
"xy" = (
@@ -11081,12 +11184,13 @@
dir = 4
},
/obj/machinery/power/apc/angled{
cell_type = /obj/item/weapon/cell/super;
dir = 8;
name = "night shift APC";
nightshift_setting = 2
},
/obj/structure/cable{
icon_state = "0-2"
/obj/structure/cable/green{
icon_state = "0-4"
},
/turf/simulated/floor,
/area/maintenance/stellardelight/deck2/portsolars)
@@ -11969,6 +12073,12 @@
},
/turf/simulated/floor/plating,
/area/engineering/storage)
"BA" = (
/obj/structure/railing/grey{
dir = 8
},
/turf/simulated/floor/tiled/monotile,
/area/stellardelight/deck2/fore)
"BB" = (
/obj/structure/cable/orange{
icon_state = "4-8"
@@ -12370,6 +12480,9 @@
/obj/structure/cable{
icon_state = "2-4"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
/area/engineering/atmos/monitoring)
"CA" = (
@@ -12823,6 +12936,15 @@
"DB" = (
/turf/simulated/floor,
/area/maintenance/stellardelight/deck2/atmos)
"DC" = (
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 4
},
/obj/machinery/firealarm/angled{
dir = 4
},
/turf/simulated/floor/tiled,
/area/stellardelight/deck2/fore)
"DD" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/obj/machinery/alarm/freezer{
@@ -12946,9 +13068,13 @@
/turf/simulated/floor/tiled/freezer/cold,
/area/crew_quarters/kitchen)
"DQ" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/sortjunction/flipped{
dir = 1;
name = "Atmospherics";
sortType = "Atmospherics"
},
/turf/simulated/floor/tiled,
/area/stellardelight/deck2/aftport)
"DR" = (
@@ -14403,6 +14529,7 @@
/obj/machinery/power/terminal{
dir = 8
},
/obj/structure/cable,
/turf/simulated/floor,
/area/maintenance/stellardelight/deck2/portsolars)
"GP" = (
@@ -14785,6 +14912,10 @@
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 8
},
/obj/machinery/station_map{
dir = 4;
pixel_x = -32
},
/turf/simulated/floor/tiled,
/area/stellardelight/deck2/aftport)
"HH" = (
@@ -15070,6 +15201,7 @@
},
/obj/random/vendordrink,
/obj/machinery/atmospherics/unary/vent_pump/on,
/obj/machinery/firealarm/angled,
/turf/simulated/floor/tiled,
/area/stellardelight/deck2/aftstarboard)
"Il" = (
@@ -15187,6 +15319,16 @@
/obj/machinery/recharger,
/turf/simulated/floor/tiled/eris/white/bluecorner,
/area/stellardelight/deck2/triage)
"Iv" = (
/obj/effect/floor_decal/milspec/color/blue/half{
dir = 8
},
/obj/machinery/station_map{
dir = 4;
pixel_x = -32
},
/turf/simulated/floor/tiled,
/area/stellardelight/deck2/starboard)
"Iw" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -17053,7 +17195,9 @@
/area/crew_quarters/bar)
"MM" = (
/obj/structure/table/standard,
/obj/machinery/recharger,
/obj/machinery/recharger{
pixel_y = 5
},
/obj/machinery/light/floortube{
pixel_y = -4
},
@@ -17736,6 +17880,7 @@
/area/medical/surgery2)
"Oq" = (
/obj/machinery/power/apc/angled{
cell_type = /obj/item/weapon/cell/super;
dir = 8
},
/obj/structure/cable/cyan{
@@ -17980,6 +18125,10 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/turf/simulated/floor/tiled/techfloor,
/area/engineering/atmos/monitoring)
"OU" = (
@@ -21335,6 +21484,9 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/steel_ridged,
/area/engineering/atmos/monitoring)
"WB" = (
@@ -21644,9 +21796,6 @@
/obj/machinery/alarm/angled{
dir = 4
},
/obj/structure/cable{
icon_state = "1-2"
},
/turf/simulated/floor,
/area/maintenance/stellardelight/deck2/portsolars)
"Xo" = (
@@ -21678,9 +21827,6 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/structure/cable{
icon_state = "1-2"
},
/turf/simulated/floor,
/area/maintenance/stellardelight/deck2/starboardsolars)
"Xs" = (
@@ -29950,8 +30096,8 @@ UG
cv
cv
cv
ZG
Jh
CP
SO
Jh
Jh
Jh
@@ -30092,6 +30238,7 @@ Zt
qM
Vm
mq
Wb
ZG
Jh
Jh
@@ -30112,7 +30259,6 @@ Jh
Jh
Jh
Jh
Jh
"}
(52,1,1) = {"
Jh
@@ -30234,6 +30380,7 @@ LG
AV
Vm
Vm
Wb
ZG
Jh
Jh
@@ -30254,7 +30401,6 @@ Jh
Jh
Jh
Jh
Jh
"}
(53,1,1) = {"
Jh
@@ -30376,8 +30522,8 @@ yg
AV
cv
cv
ZG
Jh
Ds
kL
Jh
Jh
Jh
@@ -30660,8 +30806,8 @@ MP
PB
cv
cv
ZG
Jh
CP
SO
Jh
Jh
Jh
@@ -30802,6 +30948,7 @@ ay
wm
Vm
mq
Wb
ZG
Jh
Jh
@@ -30822,7 +30969,6 @@ Jh
Jh
Jh
Jh
Jh
"}
(57,1,1) = {"
Jh
@@ -30944,6 +31090,7 @@ DR
AV
Vm
Vm
Wb
ZG
Jh
Jh
@@ -30964,7 +31111,6 @@ Jh
Jh
Jh
Jh
Jh
"}
(58,1,1) = {"
Jh
@@ -31086,8 +31232,8 @@ eg
tk
cv
cv
ZG
Jh
Ds
kL
Jh
Jh
Jh
@@ -31462,7 +31608,7 @@ VP
bA
bA
bA
bA
mb
bA
BP
wF
@@ -31874,7 +32020,11 @@ nt
Rq
Rq
lQ
<<<<<<< HEAD
Rq
=======
gA
>>>>>>> b8bd9f130c... Merge pull request #11834 from Very-Soft/QOLwow
Jq
Xi
kF
@@ -33578,7 +33728,11 @@ nt
Rq
Rq
lY
<<<<<<< HEAD
Rq
=======
BA
>>>>>>> b8bd9f130c... Merge pull request #11834 from Very-Soft/QOLwow
Jq
IK
kF
@@ -34018,7 +34172,7 @@ Ru
nL
WL
WL
iu
Iv
iu
ec
YX
@@ -34280,7 +34434,7 @@ Zr
Zr
vj
pZ
Zr
DC
Zr
OV
Zr
@@ -34494,8 +34648,8 @@ uo
BN
nq
nq
ZG
Jh
CP
SO
Jh
Jh
Jh
@@ -34636,6 +34790,7 @@ cF
Jk
VJ
Dw
Wb
ZG
Jh
Jh
@@ -34656,7 +34811,6 @@ Jh
Jh
Jh
Jh
Jh
"}
(84,1,1) = {"
Jh
@@ -34778,6 +34932,7 @@ Nt
Lw
VJ
VJ
Wb
ZG
Jh
Jh
@@ -34798,7 +34953,6 @@ Jh
Jh
Jh
Jh
Jh
"}
(85,1,1) = {"
Jh
@@ -34920,8 +35074,8 @@ lk
Lw
nq
nq
ZG
Jh
Ds
kL
Jh
Jh
Jh
@@ -35204,8 +35358,8 @@ jA
Lw
nq
nq
ZG
Jh
CP
SO
Jh
Jh
Jh
@@ -35346,6 +35500,7 @@ lX
yA
VJ
Dw
Wb
ZG
Jh
Jh
@@ -35366,7 +35521,6 @@ Jh
Jh
Jh
Jh
Jh
"}
(89,1,1) = {"
Jh
@@ -35488,6 +35642,7 @@ nO
nq
VJ
VJ
Wb
ZG
Jh
Jh
@@ -35508,7 +35663,6 @@ Jh
Jh
Jh
Jh
Jh
"}
(90,1,1) = {"
Jh
@@ -35630,8 +35784,8 @@ SG
rT
rT
rT
ZG
Jh
Ds
kL
Jh
Jh
Jh
+81 -3
View File
@@ -20,6 +20,33 @@
},
/turf/simulated/floor/airless,
/area/stellardelight/deck3/exterior)
<<<<<<< HEAD
=======
"ag" = (
/turf/simulated/floor/tiled/monotile,
/area/stellardelight/deck3/aft)
"ah" = (
/obj/structure/sign/directions/stairs_down{
pixel_x = 32;
pixel_y = 18
},
/obj/structure/sign/directions/medical{
pixel_x = 32;
pixel_y = 12
},
/obj/structure/sign/directions/engineering{
pixel_x = 32;
pixel_y = 6
},
/obj/structure/sign/directions/cargo{
pixel_x = 32
},
/obj/structure/railing/grey{
dir = 4
},
/turf/simulated/floor/tiled/monotile,
/area/stellardelight/deck3/aft)
>>>>>>> b8bd9f130c... Merge pull request #11834 from Very-Soft/QOLwow
"ai" = (
/obj/machinery/door/firedoor/glass,
/obj/structure/window/bay/reinforced,
@@ -29,6 +56,30 @@
"aj" = (
/turf/simulated/floor/carpet/turcarpet,
/area/ai)
<<<<<<< HEAD
=======
"ak" = (
/obj/structure/sign/directions/stairs_down{
pixel_x = -32;
pixel_y = 18
},
/obj/structure/sign/directions/medical{
pixel_x = -32;
pixel_y = 12
},
/obj/structure/sign/directions/engineering{
pixel_x = -32;
pixel_y = 6
},
/obj/structure/sign/directions/cargo{
pixel_x = -32
},
/obj/structure/railing/grey{
dir = 8
},
/turf/simulated/floor/tiled/monotile,
/area/stellardelight/deck3/aft)
>>>>>>> b8bd9f130c... Merge pull request #11834 from Very-Soft/QOLwow
"al" = (
/obj/machinery/power/terminal{
dir = 8
@@ -2086,7 +2137,12 @@
/obj/machinery/door/airlock/angled_bay/hatch{
door_color = "#e6ab22";
name = "Shield Generator";
<<<<<<< HEAD
req_access = list(11,24);
=======
req_access = null;
req_one_access = list(11,24);
>>>>>>> b8bd9f130c... Merge pull request #11834 from Very-Soft/QOLwow
stripe_color = "#e6ab22"
},
/turf/simulated/floor/tiled/steel_ridged,
@@ -2382,6 +2438,13 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/crew_quarters/heads/hor)
"jO" = (
/obj/machinery/station_map{
dir = 4;
pixel_x = -32
},
/turf/simulated/floor/tiled/eris/dark/gray_platform,
/area/stellardelight/deck3/commandhall)
"jP" = (
/obj/machinery/alarm/angled,
/obj/effect/floor_decal/steeldecal/steel_decals5{
@@ -5856,10 +5919,12 @@
/area/ai_cyborg_station)
"wP" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/machinery/camera/network/halls,
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 1
},
/obj/machinery/station_map{
pixel_y = 32
},
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/aft)
"wQ" = (
@@ -8960,6 +9025,9 @@
"HR" = (
/obj/structure/table/steel,
/obj/random/contraband,
/obj/machinery/chemical_dispenser/bar_coffee/full{
pixel_y = 8
},
/turf/simulated/floor,
/area/maintenance/stellardelight/deck3/foreportrooma)
"HS" = (
@@ -9592,6 +9660,9 @@
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals5,
/obj/machinery/camera/network/halls{
dir = 1
},
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/aft)
"Kg" = (
@@ -11138,6 +11209,9 @@
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals5,
/obj/machinery/camera/network/halls{
dir = 1
},
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/aft)
"PC" = (
@@ -12140,6 +12214,7 @@
},
/obj/structure/disposalpipe/segment,
/obj/machinery/power/apc/angled{
cell_type = /obj/item/weapon/cell/super;
dir = 8;
name = "night shift APC";
nightshift_setting = 2
@@ -12380,10 +12455,12 @@
/area/stellardelight/deck3/exterior)
"Uy" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/obj/machinery/camera/network/halls,
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 1
},
/obj/machinery/station_map{
pixel_y = 32
},
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/aft)
"UA" = (
@@ -13033,6 +13110,7 @@
/area/lawoffice)
"WQ" = (
/obj/machinery/power/apc/angled{
cell_type = /obj/item/weapon/cell/super;
dir = 4;
name = "night shift APC";
nightshift_setting = 2
@@ -23574,7 +23652,7 @@ BK
aQ
aQ
sf
aQ
jO
aQ
BK
aQ
@@ -129,6 +129,7 @@
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
forbid_events = TRUE
/area/stellardelight/deck1/dorms/dorm1
name = "Dormitory One"
@@ -277,6 +278,10 @@
/area/stellardelight/deck3/readingroom
name = "Reading Rooms"
sound_env = SMALL_SOFTFLOOR
flags = RAD_SHIELDED| BLUE_SHIELDED |AREA_FLAG_IS_NOT_PERSISTENT
soundproofed = TRUE
block_suit_sensors = TRUE
forbid_events = TRUE
/area/stellardelight/deck3/portdock
name = "Port Dock"
+41 -31
View File
@@ -4,17 +4,6 @@
#define Z_LEVEL_SHIP_HIGH 3
#define Z_LEVEL_CENTCOM 4
#define Z_LEVEL_MISC 5
<<<<<<< HEAD
#define Z_LEVEL_BEACH 6
#define Z_LEVEL_BEACH_CAVE 7
#define Z_LEVEL_AEROSTAT 8
#define Z_LEVEL_AEROSTAT_SURFACE 9
#define Z_LEVEL_DEBRISFIELD 10
#define Z_LEVEL_FUELDEPOT 11
#define Z_LEVEL_OVERMAP 12
#define Z_LEVEL_OFFMAP1 13
#define Z_LEVEL_GATEWAY 14
=======
#define Z_LEVEL_SPACE_ROCKS 6
#define Z_LEVEL_BEACH 7
#define Z_LEVEL_BEACH_CAVE 8
@@ -26,7 +15,6 @@
#define Z_LEVEL_OFFMAP1 14
#define Z_LEVEL_GATEWAY 15
#define Z_LEVEL_OM_ADVENTURE 16
>>>>>>> 60011ecd0b... Merge pull request #11928 from Very-Soft/whalesandcrystals
//Camera networks
#define NETWORK_HALLS "Halls"
@@ -60,12 +48,12 @@
lobby_screens = list("youcanttaketheskyfromme")
id_hud_icons = 'icons/mob/hud_jobs_vr.dmi'
/*
holomap_smoosh = list(list(
Z_LEVEL_SURFACE_LOW,
Z_LEVEL_SURFACE_MID,
Z_LEVEL_SURFACE_HIGH))
*/
Z_LEVEL_SHIP_LOW,
Z_LEVEL_SHIP_MID,
Z_LEVEL_SHIP_HIGH))
station_name = "NRV Stellar Delight"
station_short = "Stellar Delight"
dock_name = "Virgo-3B Colony"
@@ -140,6 +128,7 @@
lateload_z_levels = list(
list("Ship - Central Command"),
list("Ship - Misc"), //Shuttle transit zones, holodeck templates, etc
list("V3b Asteroid Field"),
list("Desert Planet - Z1 Beach","Desert Planet - Z2 Cave"),
list("Remmi Aerostat - Z1 Aerostat","Remmi Aerostat - Z2 Surface"),
list("Debris Field - Z1 Space"),
@@ -195,17 +184,13 @@
. += "As an employee or contractor of NanoTrasen, operators of the Adephagia and one of the galaxy's largest corporations, you're probably just here to do a job."
return jointext(., "<br>")
/*
/datum/map/stellar_delight/perform_map_generation()
new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_SURFACE_MINE, world.maxx, world.maxy) // Create the mining Z-level.
new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_SURFACE_MINE, 64, 64) // Create the mining ore distribution map.
new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_SOLARS, world.maxx, world.maxy) // Create the mining Z-level.
new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_SOLARS, 64, 64) // Create the mining ore distribution map.
new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_SPACE_ROCKS, world.maxx, world.maxy) // Create the mining Z-level.
new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_SPACE_ROCKS, 64, 64) // Create the mining ore distribution map.
return 1
*/
/datum/skybox_settings/stellar_delight
icon_state = "space5"
@@ -218,12 +203,6 @@
Z_LEVEL_BEACH
)
// For making the 6-in-1 holomap, we calculate some offsets
#define SHIP_MAP_SIZE 140 // Width and height of compiled in tether z levels.
#define SHIP_HOLOMAP_CENTER_GUTTER 40 // 40px central gutter between columns
#define SHIP_HOLOMAP_MARGIN_X ((HOLOMAP_ICON_SIZE - (2*TETHER_MAP_SIZE) - TETHER_HOLOMAP_CENTER_GUTTER) / 2) // 80
#define SHIP_HOLOMAP_MARGIN_Y ((HOLOMAP_ICON_SIZE - (2*TETHER_MAP_SIZE)) / 2) // 30
/obj/effect/landmark/map_data/stellar_delight
height = 3
@@ -259,6 +238,11 @@
return
cached_skybox_image.add_overlay("glow")
// For making the 6-in-1 holomap, we calculate some offsets
#define SHIP_MAP_SIZE 140 // Width and height of compiled in tether z levels.
#define SHIP_HOLOMAP_CENTER_GUTTER 40 // 40px central gutter between columns
#define SHIP_HOLOMAP_MARGIN_X ((HOLOMAP_ICON_SIZE - (2*SHIP_MAP_SIZE) - SHIP_HOLOMAP_CENTER_GUTTER) / 2) // 80
#define SHIP_HOLOMAP_MARGIN_Y ((HOLOMAP_ICON_SIZE - (2*SHIP_MAP_SIZE)) / 2) // 30
// We have a bunch of stuff common to the station z levels
/datum/map_z_level/stellar_delight
@@ -271,18 +255,24 @@
name = "Deck 1"
base_turf = /turf/space
transit_chance = 33
holomap_offset_x = SHIP_HOLOMAP_MARGIN_X
holomap_offset_y = SHIP_HOLOMAP_MARGIN_Y
/datum/map_z_level/stellar_delight/deck_two
z = Z_LEVEL_SHIP_MID
name = "Deck 2"
base_turf = /turf/simulated/open
transit_chance = 33
holomap_offset_x = SHIP_HOLOMAP_MARGIN_X
holomap_offset_y = SHIP_HOLOMAP_MARGIN_Y + SHIP_MAP_SIZE
/datum/map_z_level/stellar_delight/deck_three
z = Z_LEVEL_SHIP_HIGH
name = "Deck 3"
base_turf = /turf/simulated/open
transit_chance = 33
holomap_offset_x = HOLOMAP_ICON_SIZE - SHIP_HOLOMAP_MARGIN_X - SHIP_MAP_SIZE
holomap_offset_y = SHIP_HOLOMAP_MARGIN_Y + SHIP_MAP_SIZE
/datum/map_template/ship_lateload
allow_duplicates = FALSE
@@ -325,6 +315,26 @@
name = "Misc"
flags = MAP_LEVEL_ADMIN|MAP_LEVEL_SEALED|MAP_LEVEL_CONTACT|MAP_LEVEL_XENOARCH_EXEMPT
#include "../submaps/space_rocks/space_rocks.dm"
/datum/map_template/ship_lateload/space_rocks
name = "V3b Asteroid Field"
desc = "Space debris is common in V3b's orbit due to the proximity of Virgo 3"
mappath = 'maps/submaps/space_rocks/space_rocks.dmm'
associated_map_datum = /datum/map_z_level/ship_lateload/space_rocks
/datum/map_template/ship_lateload/space_rocks/on_map_loaded(z)
. = ..()
seed_submaps(list(Z_LEVEL_SPACE_ROCKS), 60, /area/sdmine/unexplored, /datum/map_template/space_rocks)
new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, Z_LEVEL_SPACE_ROCKS, world.maxx - 4, world.maxy - 4)
new /datum/random_map/noise/ore/spacerocks(null, 1, 1, Z_LEVEL_SPACE_ROCKS, 64, 64)
/datum/map_z_level/ship_lateload/space_rocks
z = Z_LEVEL_SPACE_ROCKS
name = "V3b Asteroid Field"
base_turf = /turf/space
/datum/map_template/ship_lateload/overmap
name = "Overmap"
desc = "Overmap lives here :3"
@@ -250,8 +250,11 @@
skybox_pixel_x = 0
skybox_pixel_y = 0
initial_generic_waypoints = list("sr-c","sr-n","sr-s")
initial_restricted_waypoints = list("Central Command Shuttlepad" = list("cc_shuttlepad"))
extra_z_levels = list(Z_LEVEL_SPACE_ROCKS)
/////SD Starts at V3b to pick up crew refuel and repair (And to make sure it doesn't spawn on hazards)
/obj/effect/overmap/visitable/sector/virgo3b/Initialize()
. = ..()
+145
View File
@@ -0,0 +1,145 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/template_noop,
/area/template_noop)
"L" = (
/obj/random/underdark/uncertain,
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/bittynest1)
"P" = (
/turf/simulated/mineral/vacuum/sdmine,
/area/submap/space_rocks/bittynest1)
"W" = (
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/bittynest1)
"Y" = (
/obj/tether_away_spawner/asteroidbaddies,
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/bittynest1)
(1,1,1) = {"
a
a
a
a
P
P
a
a
a
a
"}
(2,1,1) = {"
a
a
a
P
P
P
P
W
a
a
"}
(3,1,1) = {"
a
a
P
P
W
W
W
W
P
a
"}
(4,1,1) = {"
a
P
P
W
W
P
P
P
P
a
"}
(5,1,1) = {"
P
P
W
W
W
W
W
Y
P
P
"}
(6,1,1) = {"
P
P
W
W
W
L
W
W
W
P
"}
(7,1,1) = {"
P
P
W
W
W
W
W
W
W
P
"}
(8,1,1) = {"
a
P
P
Y
W
W
W
W
P
P
"}
(9,1,1) = {"
a
a
P
P
P
P
P
P
P
a
"}
(10,1,1) = {"
a
a
a
a
a
P
P
a
a
a
"}
+145
View File
@@ -0,0 +1,145 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/template_noop,
/area/template_noop)
"v" = (
/turf/simulated/mineral/vacuum/sdmine,
/area/submap/space_rocks/bittynest2)
"B" = (
/obj/tether_away_spawner/asteroidbaddies,
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/bittynest2)
"R" = (
/obj/random/underdark/uncertain,
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/bittynest2)
"W" = (
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/bittynest2)
(1,1,1) = {"
a
a
a
a
v
v
a
v
v
a
"}
(2,1,1) = {"
a
a
v
v
v
v
v
v
v
a
"}
(3,1,1) = {"
a
v
v
v
v
W
R
v
v
v
"}
(4,1,1) = {"
a
v
v
v
W
W
B
W
v
v
"}
(5,1,1) = {"
v
v
v
W
W
W
W
W
v
a
"}
(6,1,1) = {"
v
v
W
W
W
W
W
v
v
v
"}
(7,1,1) = {"
v
v
R
B
W
W
W
W
v
a
"}
(8,1,1) = {"
v
v
v
W
W
v
v
W
a
a
"}
(9,1,1) = {"
a
v
v
v
v
v
v
W
a
a
"}
(10,1,1) = {"
a
a
a
v
v
a
a
a
a
a
"}
+145
View File
@@ -0,0 +1,145 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/template_noop,
/area/template_noop)
"p" = (
/obj/tether_away_spawner/asteroidbaddies,
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/bittynest3)
"N" = (
/obj/random/underdark/uncertain,
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/bittynest3)
"Q" = (
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/bittynest3)
"Z" = (
/turf/simulated/mineral/vacuum/sdmine,
/area/submap/space_rocks/bittynest3)
(1,1,1) = {"
a
a
Q
a
Z
Z
Z
Z
a
a
"}
(2,1,1) = {"
a
Z
Q
Q
Q
Z
Z
Z
Z
a
"}
(3,1,1) = {"
a
Z
Z
Q
Q
p
Q
Z
Z
Z
"}
(4,1,1) = {"
Z
Z
Z
Z
Z
Q
Q
Q
Z
Z
"}
(5,1,1) = {"
Z
Z
Z
p
Q
Z
Q
Q
Z
a
"}
(6,1,1) = {"
Z
Z
Q
Q
Q
Q
Q
Z
Z
a
"}
(7,1,1) = {"
Z
Z
Q
N
Q
Q
Q
Z
Z
a
"}
(8,1,1) = {"
a
Z
Z
Q
Q
Z
Z
Z
Z
a
"}
(9,1,1) = {"
a
a
Z
Z
Z
Z
Z
Z
a
a
"}
(10,1,1) = {"
a
a
a
Z
Z
Z
a
a
a
a
"}
+145
View File
@@ -0,0 +1,145 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/template_noop,
/area/template_noop)
"m" = (
/obj/tether_away_spawner/asteroidbaddies,
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/bittynest4)
"x" = (
/obj/random/underdark/uncertain,
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/bittynest4)
"P" = (
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/bittynest4)
"V" = (
/turf/simulated/mineral/vacuum/sdmine,
/area/submap/space_rocks/bittynest4)
(1,1,1) = {"
a
a
V
V
V
P
V
V
a
a
"}
(2,1,1) = {"
a
V
V
V
P
P
P
V
V
a
"}
(3,1,1) = {"
V
V
P
P
P
x
V
V
V
V
"}
(4,1,1) = {"
V
V
P
P
V
V
V
V
V
V
"}
(5,1,1) = {"
a
V
P
V
V
m
P
x
V
V
"}
(6,1,1) = {"
V
V
P
V
P
P
P
P
P
V
"}
(7,1,1) = {"
V
V
P
P
P
P
V
V
P
V
"}
(8,1,1) = {"
V
V
V
P
V
V
V
P
P
V
"}
(9,1,1) = {"
a
V
V
V
V
V
P
m
V
V
"}
(10,1,1) = {"
a
a
V
V
V
P
P
V
V
a
"}
+148
View File
@@ -0,0 +1,148 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/template_noop,
/area/template_noop)
"v" = (
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/clearing)
"y" = (
/obj/random/contraband/nofail,
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/clearing)
"P" = (
/obj/random/underdark/uncertain,
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/clearing)
"W" = (
/obj/tether_away_spawner/asteroidbaddies,
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/clearing)
(1,1,1) = {"
a
a
a
a
v
v
a
a
a
a
"}
(2,1,1) = {"
a
a
v
v
v
v
v
v
a
a
"}
(3,1,1) = {"
a
v
v
v
v
v
v
v
v
a
"}
(4,1,1) = {"
a
v
v
v
v
v
v
v
v
a
"}
(5,1,1) = {"
v
v
v
v
P
v
v
v
v
v
"}
(6,1,1) = {"
v
v
v
W
v
y
v
v
v
v
"}
(7,1,1) = {"
a
v
v
v
v
v
v
v
v
a
"}
(8,1,1) = {"
a
v
v
v
v
v
v
v
v
a
"}
(9,1,1) = {"
a
a
v
v
v
v
v
v
a
a
"}
(10,1,1) = {"
a
a
a
a
v
v
a
a
a
a
"}
+498
View File
@@ -0,0 +1,498 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/template_noop,
/area/template_noop)
"b" = (
/obj/structure/loot_pile/surface/alien/medical,
/turf/simulated/shuttle/floor/alienplating/vacuum,
/area/submap/space_rocks/seventemple)
"f" = (
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/seventemple)
"h" = (
/obj/structure/loot_pile/surface/alien/end,
/turf/simulated/shuttle/floor/alienplating/vacuum,
/area/submap/space_rocks/seventemple)
"m" = (
/turf/simulated/shuttle/floor/alien,
/area/submap/space_rocks/seventemple)
"p" = (
/obj/structure/loot_pile/surface/bones,
/turf/simulated/shuttle/floor/alien/blue,
/area/submap/space_rocks/seventemple)
"q" = (
/obj/random/underdark/uncertain,
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/seventemple)
"t" = (
/turf/simulated/shuttle/floor/alienplating/vacuum,
/area/submap/space_rocks/seventemple)
"w" = (
/obj/structure/loot_pile/surface/alien/security,
/turf/simulated/shuttle/floor/alienplating/vacuum,
/area/submap/space_rocks/seventemple)
"y" = (
/obj/structure/loot_pile/surface/drone,
/turf/simulated/shuttle/floor/alienplating/vacuum,
/area/submap/space_rocks/seventemple)
"F" = (
/turf/simulated/shuttle/floor/alien/blue,
/area/submap/space_rocks/seventemple)
"J" = (
/turf/simulated/wall/eris/r_wall,
/area/submap/space_rocks/seventemple)
"R" = (
/obj/tether_away_spawner/asteroidbaddies,
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/seventemple)
"Y" = (
/obj/structure/loot_pile/surface/alien/engineering,
/turf/simulated/shuttle/floor/alienplating/vacuum,
/area/submap/space_rocks/seventemple)
(1,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(2,1,1) = {"
a
a
J
a
a
a
a
f
J
J
J
f
a
a
a
a
J
a
a
a
"}
(3,1,1) = {"
a
J
J
J
a
a
f
J
J
t
J
J
f
a
a
J
J
J
a
a
"}
(4,1,1) = {"
a
a
J
f
f
f
f
J
Y
t
t
J
f
f
f
f
J
a
a
a
"}
(5,1,1) = {"
a
a
a
f
R
f
f
J
t
t
t
J
f
f
f
f
a
a
a
a
"}
(6,1,1) = {"
a
a
f
f
f
f
f
J
t
y
t
J
f
f
R
f
f
a
a
a
"}
(7,1,1) = {"
a
f
f
f
f
f
J
J
t
m
t
J
J
f
f
f
f
f
a
a
"}
(8,1,1) = {"
a
f
f
f
f
J
J
m
t
t
t
m
J
J
f
f
f
f
a
a
"}
(9,1,1) = {"
a
f
q
f
J
J
t
t
t
F
t
t
t
J
J
f
f
f
a
a
"}
(10,1,1) = {"
J
f
f
f
J
w
t
t
F
p
F
t
t
h
J
f
f
f
J
a
"}
(11,1,1) = {"
a
f
f
f
J
J
t
t
t
F
t
t
t
J
J
f
f
f
a
a
"}
(12,1,1) = {"
a
f
f
f
f
J
J
m
t
t
t
m
J
J
f
f
f
f
a
a
"}
(13,1,1) = {"
a
f
f
f
f
f
J
J
t
m
t
J
J
f
f
f
q
f
a
a
"}
(14,1,1) = {"
a
a
f
f
f
f
f
J
t
y
t
J
f
f
f
f
f
a
a
a
"}
(15,1,1) = {"
a
a
a
f
R
f
f
J
t
t
t
J
f
f
R
f
a
a
a
a
"}
(16,1,1) = {"
a
a
J
f
f
f
f
J
b
t
t
J
f
f
f
f
J
a
a
a
"}
(17,1,1) = {"
a
J
J
J
a
a
f
J
J
t
J
J
f
a
a
J
J
J
a
a
"}
(18,1,1) = {"
a
a
J
a
a
a
a
f
J
J
J
f
a
a
a
a
J
a
a
a
"}
(19,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(20,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
+61
View File
@@ -0,0 +1,61 @@
#include "space_rocks_pois.dm"
#include "space_rocks_stuff.dm"
/turf/simulated/mineral/vacuum/sdmine/make_ore(var/rare_ore)
if(mineral)
return
var/mineral_name
if(rare_ore)
mineral_name = pickweight(list(
"marble" = 3,
"uranium" = 10,
"platinum" = 10,
"hematite" = 20,
"carbon" = 5,
"diamond" = 1,
"gold" = 8,
"silver" = 8,
"phoron" = 18,
"lead" = 2,
"verdantium" = 1))
else
mineral_name = pickweight(list(
"marble" = 2,
"uranium" = 5,
"platinum" = 5,
"hematite" = 35,
"carbon" = 5,
"gold" = 3,
"silver" = 3,
"phoron" = 25,
"lead" = 1))
if(mineral_name && (mineral_name in GLOB.ore_data))
mineral = GLOB.ore_data[mineral_name]
UpdateMineral()
update_icon()
/datum/random_map/noise/ore/spacerocks
descriptor = "asteroid field ore distribution map"
deep_val = 0.2
rare_val = 0.1
/datum/random_map/noise/ore/spacerocks/check_map_sanity()
return 1 //Totally random, but probably beneficial.
/area/sdmine/
ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg')
base_turf = /turf/simulated/mineral/floor/vacuum
/area/sdmine/unexplored
name = "asteroid field"
icon_state = "unexplored"
/area/sdmine/explored
name = "asteroid field"
icon_state = "explored"
/obj/effect/overmap/visitable/sector/virgo3b/generate_skybox(zlevel)
var/static/image/smallone = image(icon = 'icons/skybox/virgo3b.dmi', icon_state = "small")
if(zlevel == Z_LEVEL_SPACE_ROCKS)
return smallone
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,96 @@
#if MAP_TEST
#include "bittynest1.dmm"
#include "bittynest2.dmm"
#include "bittynest3.dmm"
#include "bittynest4.dmm"
#include "clearing.dmm"
#include "seventemple.dmm"
#include "spacecrystals.dmm"
#include "tunnel1.dmm"
#include "tunnel2.dmm"
#endif
/area/submap/space_rocks
name = "POI - Space Rocks"
ambience = AMBIENCE_FOREBODING
/area/submap/space_rocks/bittynest1
name = "POI - Bittynest1"
/datum/map_template/space_rocks/bittynest1
name = "Bittynest1"
desc = "A smol nest for smol badguys"
mappath = 'bittynest1.dmm'
cost = 5
/area/submap/space_rocks/bittynest2
name = "POI - Bittynest2"
/datum/map_template/space_rocks/bittynest2
name = "Bittynest2"
desc = "A smol nest for smol badguys"
mappath = 'bittynest2.dmm'
cost = 5
/area/submap/space_rocks/bittynest3
name = "POI - Bittynest3"
/datum/map_template/space_rocks/bittynest3
name = "Bittynest3"
desc = "A smol nest for smol badguys"
mappath = 'bittynest3.dmm'
cost = 5
/area/submap/space_rocks/bittynest4
name = "POI - Bittynest4"
/datum/map_template/space_rocks/bittynest4
name = "Bittynest4"
desc = "A smol nest for smol badguys"
mappath = 'bittynest4.dmm'
cost = 5
/area/submap/space_rocks/tunnel1
name = "POI - Tunnel1"
/datum/map_template/space_rocks/tunnel1
name = "Tunnel1"
desc = "A tunnel left behind!"
mappath = 'tunnel1.dmm'
cost = 10
/area/submap/space_rocks/tunnel2
name = "POI - Tunnel2"
/datum/map_template/space_rocks/tunnel2
name = "Tunnel2"
desc = "A tunnel left behind!"
mappath = 'tunnel2.dmm'
cost = 10
/area/submap/space_rocks/spacecrystals
name = "POI - Space Crystals"
/datum/map_template/space_rocks/tunnel2
name = "Space Crystals"
desc = "Some crystals living in space!"
mappath = 'spacecrystals.dmm'
cost = 10
/area/submap/space_rocks/clearing
name = "POI - Clearing"
/datum/map_template/space_rocks/clearing
name = "Clearing"
desc = "A clear spot for mischief to happen."
mappath = 'clearing.dmm'
cost = 10
/area/submap/space_rocks/seventemple
name = "POI - Temple of the Seven"
/datum/map_template/space_rocks/seventemple
name = "Temple of the Seven"
desc = "A mysterious space!"
mappath = 'seventemple.dmm'
cost = 25
@@ -0,0 +1,30 @@
/////LANDING LANDMARKS
/obj/effect/shuttle_landmark/premade/spacerocks/center
name = "asteroid field center"
landmark_tag = "sr-c"
/obj/effect/shuttle_landmark/premade/spacerocks/north
name = "asteroid field north"
landmark_tag = "sr-n"
/obj/effect/shuttle_landmark/premade/spacerocks/south
name = "asteroid field south"
landmark_tag = "sr-s"
/obj/tether_away_spawner/asteroidbaddies
name = "Asteroid Mob Spawner"
faction = "space_rock"
atmos_comp = TRUE
prob_spawn = 100
prob_fall = 40
//guard = 20
mobs_to_pick_from = list(
/mob/living/simple_mob/animal/space/bats = 10,
/mob/living/simple_mob/vore/alienanimals/space_jellyfish = 15,
/mob/living/simple_mob/vore/alienanimals/startreader = 15,
/mob/living/simple_mob/vore/alienanimals/space_ghost = 6,
/mob/living/simple_mob/vore/oregrub = 1,
/mob/living/simple_mob/animal/space/carp = 3,
/mob/living/simple_mob/animal/space/carp/large = 1,
/mob/living/simple_mob/animal/space/carp/large/huge = 1
)
+471
View File
@@ -0,0 +1,471 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/template_noop,
/area/template_noop)
"c" = (
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/spacecrystals)
"j" = (
/obj/random/underdark/uncertain,
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/spacecrystals)
"W" = (
/turf/simulated/mineral/vacuum/sdmine,
/area/submap/space_rocks/spacecrystals)
"X" = (
/obj/tether_away_spawner/asteroidbaddies,
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/spacecrystals)
"Z" = (
/obj/machinery/crystal,
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/spacecrystals)
(1,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(2,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(3,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(4,1,1) = {"
a
a
a
a
W
W
W
W
W
W
a
a
a
a
a
a
a
a
a
a
"}
(5,1,1) = {"
a
a
a
W
W
c
c
c
c
W
W
a
a
a
a
a
a
a
a
a
"}
(6,1,1) = {"
a
a
a
W
c
c
c
c
c
c
W
a
a
a
a
a
a
a
a
a
"}
(7,1,1) = {"
a
a
W
W
X
j
c
c
c
c
W
W
W
W
W
W
a
a
a
a
"}
(8,1,1) = {"
a
a
W
c
c
c
c
c
c
Z
c
c
c
c
W
W
a
a
a
a
"}
(9,1,1) = {"
a
a
W
c
c
c
c
Z
c
c
c
Z
c
c
c
W
W
a
a
a
"}
(10,1,1) = {"
a
a
W
W
c
c
c
c
c
c
c
c
c
j
c
c
W
a
a
a
"}
(11,1,1) = {"
a
a
a
W
W
W
c
c
c
Z
c
c
c
c
c
c
W
a
a
a
"}
(12,1,1) = {"
a
a
a
a
a
W
c
c
c
c
c
c
c
c
c
c
W
a
a
a
"}
(13,1,1) = {"
a
a
a
a
W
W
c
Z
c
c
c
Z
c
c
X
W
W
a
a
a
"}
(14,1,1) = {"
a
a
a
W
W
c
c
c
c
Z
c
c
W
W
W
W
a
a
a
a
"}
(15,1,1) = {"
a
a
a
W
c
c
j
X
c
c
c
W
W
a
a
a
a
a
a
a
"}
(16,1,1) = {"
a
a
a
W
c
c
c
c
c
c
W
W
a
a
a
a
a
a
a
a
"}
(17,1,1) = {"
a
a
a
W
c
c
c
c
c
W
W
a
a
a
a
a
a
a
a
a
"}
(18,1,1) = {"
a
a
a
W
W
c
W
c
W
W
a
a
a
a
a
a
a
a
a
a
"}
(19,1,1) = {"
a
a
a
a
W
W
W
W
W
a
a
a
a
a
a
a
a
a
a
a
"}
(20,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
+251
View File
@@ -0,0 +1,251 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/simulated/mineral/vacuum/sdmine,
/area/template_noop)
"b" = (
/turf/simulated/floor/airless,
/area/submap/space_rocks/tunnel1)
"k" = (
/obj/tether_away_spawner/asteroidbaddies,
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/tunnel1)
"l" = (
/turf/simulated/wall,
/area/submap/space_rocks/tunnel1)
"x" = (
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/tunnel1)
"L" = (
/turf/simulated/mineral/vacuum/sdmine,
/area/submap/space_rocks/tunnel1)
"Z" = (
/obj/random/underdark/uncertain,
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/tunnel1)
(1,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(2,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(3,1,1) = {"
L
l
L
L
L
L
l
x
L
L
L
L
l
x
x
L
L
L
l
L
"}
(4,1,1) = {"
L
b
L
L
Z
L
b
x
x
L
L
x
b
L
x
x
x
x
b
L
"}
(5,1,1) = {"
x
b
b
x
k
x
b
b
x
x
x
x
b
b
x
x
L
x
b
b
"}
(6,1,1) = {"
x
b
b
x
x
x
b
b
x
x
x
x
b
b
x
Z
k
x
b
b
"}
(7,1,1) = {"
L
b
L
k
x
L
b
x
x
x
x
x
b
x
x
L
x
x
b
L
"}
(8,1,1) = {"
L
l
x
x
L
L
l
L
x
x
L
L
l
L
L
L
L
L
l
L
"}
(9,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(10,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
+275
View File
@@ -0,0 +1,275 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/simulated/mineral/vacuum/sdmine,
/area/template_noop)
"f" = (
/obj/tether_away_spawner/asteroidbaddies,
/turf/simulated/floor/airless,
/area/submap/space_rocks/tunnel2)
"i" = (
/turf/simulated/floor/airless,
/area/submap/space_rocks/tunnel2)
"l" = (
/obj/random/underdark/uncertain,
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/tunnel2)
"q" = (
/turf/simulated/wall,
/area/submap/space_rocks/tunnel2)
"z" = (
/obj/tether_away_spawner/asteroidbaddies,
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/tunnel2)
"C" = (
/turf/simulated/mineral/floor/vacuum{
ignore_cavegen = 1
},
/area/submap/space_rocks/tunnel2)
"L" = (
/turf/simulated/mineral/vacuum/sdmine,
/area/submap/space_rocks/tunnel2)
(1,1,1) = {"
a
a
L
L
C
C
L
L
a
a
"}
(2,1,1) = {"
a
a
q
i
i
i
i
q
a
a
"}
(3,1,1) = {"
a
a
L
C
f
i
L
L
a
a
"}
(4,1,1) = {"
a
a
L
C
C
C
L
L
a
a
"}
(5,1,1) = {"
a
a
L
C
C
C
L
L
a
a
"}
(6,1,1) = {"
a
a
L
L
L
C
l
L
a
a
"}
(7,1,1) = {"
a
a
q
i
i
i
i
q
a
a
"}
(8,1,1) = {"
a
a
L
C
i
i
L
L
a
a
"}
(9,1,1) = {"
a
a
L
C
C
C
C
L
a
a
"}
(10,1,1) = {"
a
a
C
C
C
C
L
L
a
a
"}
(11,1,1) = {"
a
a
C
C
C
C
C
L
a
a
"}
(12,1,1) = {"
a
a
L
C
C
L
C
L
a
a
"}
(13,1,1) = {"
a
a
q
i
i
i
i
q
a
a
"}
(14,1,1) = {"
a
a
L
L
i
i
L
L
a
a
"}
(15,1,1) = {"
a
a
L
L
C
C
C
L
a
a
"}
(16,1,1) = {"
a
a
L
l
C
C
C
L
a
a
"}
(17,1,1) = {"
a
a
L
z
C
C
C
L
a
a
"}
(18,1,1) = {"
a
a
L
L
L
C
C
L
a
a
"}
(19,1,1) = {"
a
a
q
i
i
i
i
q
a
a
"}
(20,1,1) = {"
a
a
L
L
i
i
L
L
a
a
"}
@@ -79,193 +79,6 @@
/mob/living/simple_mob/vore/aggressive/dragon = 1
)
/obj/random/underdark
name = "random underdark loot"
desc = "Random loot for Underdark."
icon = 'icons/obj/items.dmi'
icon_state = "spickaxe"
/obj/random/underdark/item_to_spawn()
return pick(prob(3);/obj/random/multiple/underdark/miningdrills,
prob(3);/obj/random/multiple/underdark/ores,
prob(2);/obj/random/multiple/underdark/treasure,
prob(1);/obj/random/multiple/underdark/mechtool)
/obj/random/underdark/uncertain
icon_state = "upickaxe"
spawn_nothing_percentage = 65 //only 33% to spawn loot
/obj/random/multiple/underdark/miningdrills
name = "random underdark mining tool loot"
desc = "Random mining tool loot for Underdark."
icon = 'icons/obj/items.dmi'
icon_state = "spickaxe"
/obj/random/multiple/underdark/miningdrills/item_to_spawn()
return pick(
prob(10);list(/obj/item/weapon/pickaxe/silver),
prob(8);list(/obj/item/weapon/pickaxe/drill),
prob(6);list(/obj/item/weapon/pickaxe/jackhammer),
prob(5);list(/obj/item/weapon/pickaxe/gold),
prob(4);list(/obj/item/weapon/pickaxe/plasmacutter),
prob(2);list(/obj/item/weapon/pickaxe/diamond),
prob(1);list(/obj/item/weapon/pickaxe/diamonddrill)
)
/obj/random/multiple/underdark/ores
name = "random underdark mining ore loot"
desc = "Random mining utility loot for Underdark."
icon = 'icons/obj/mining.dmi'
icon_state = "satchel"
/obj/random/multiple/underdark/ores/item_to_spawn()
return pick(
prob(9);list(
/obj/item/weapon/storage/bag/ore,
/obj/item/weapon/shovel,
/obj/item/weapon/ore/glass,
/obj/item/weapon/ore/glass,
/obj/item/weapon/ore/glass,
/obj/item/weapon/ore/glass,
/obj/item/weapon/ore/glass,
/obj/item/weapon/ore/glass,
/obj/item/weapon/ore/glass,
/obj/item/weapon/ore/glass,
/obj/item/weapon/ore/glass,
/obj/item/weapon/ore/glass,
/obj/item/weapon/ore/hydrogen,
/obj/item/weapon/ore/hydrogen,
/obj/item/weapon/ore/hydrogen,
/obj/item/weapon/ore/hydrogen,
/obj/item/weapon/ore/hydrogen,
/obj/item/weapon/ore/hydrogen
),
prob(7);list(
/obj/item/weapon/storage/bag/ore,
/obj/item/weapon/pickaxe,
/obj/item/weapon/ore/osmium,
/obj/item/weapon/ore/osmium,
/obj/item/weapon/ore/osmium,
/obj/item/weapon/ore/osmium,
/obj/item/weapon/ore/osmium,
/obj/item/weapon/ore/osmium,
/obj/item/weapon/ore/osmium,
/obj/item/weapon/ore/osmium,
/obj/item/weapon/ore/osmium,
/obj/item/weapon/ore/osmium
),
prob(4);list(
/obj/item/clothing/suit/radiation,
/obj/item/clothing/head/radiation,
/obj/item/weapon/ore/uranium,
/obj/item/weapon/ore/uranium,
/obj/item/weapon/ore/uranium,
/obj/item/weapon/ore/uranium,
/obj/item/weapon/ore/uranium,
/obj/item/weapon/ore/uranium,
/obj/item/weapon/ore/uranium,
/obj/item/weapon/ore/uranium,
/obj/item/weapon/ore/uranium,
/obj/item/weapon/ore/uranium,
/obj/item/weapon/ore/uranium,
/obj/item/weapon/ore/uranium,
/obj/item/weapon/ore/uranium,
/obj/item/weapon/ore/uranium,
/obj/item/weapon/ore/uranium,
/obj/item/weapon/ore/uranium,
/obj/item/weapon/ore/uranium,
/obj/item/weapon/ore/uranium,
/obj/item/weapon/ore/uranium,
/obj/item/weapon/ore/uranium),
prob(2);list(
/obj/item/device/flashlight/lantern,
/obj/item/clothing/glasses/material,
/obj/item/weapon/ore/diamond,
/obj/item/weapon/ore/diamond,
/obj/item/weapon/ore/diamond,
/obj/item/weapon/ore/diamond,
/obj/item/weapon/ore/diamond,
/obj/item/weapon/ore/diamond,
/obj/item/weapon/ore/diamond,
/obj/item/weapon/ore/diamond,
/obj/item/weapon/ore/diamond,
/obj/item/weapon/ore/diamond
),
prob(1);list(
/obj/item/weapon/mining_scanner,
/obj/item/weapon/shovel/spade,
/obj/item/weapon/ore/verdantium,
/obj/item/weapon/ore/verdantium,
/obj/item/weapon/ore/verdantium,
/obj/item/weapon/ore/verdantium,
/obj/item/weapon/ore/verdantium
)
)
/obj/random/multiple/underdark/treasure
name = "random underdark treasure"
desc = "Random treasure loot for Underdark."
icon = 'icons/obj/storage.dmi'
icon_state = "cashbag"
/obj/random/multiple/underdark/treasure/item_to_spawn()
return pick(
prob(5);list(
/obj/random/coin,
/obj/random/coin,
/obj/random/coin,
/obj/random/coin,
/obj/random/coin,
/obj/item/clothing/head/pirate
),
prob(4);list(
/obj/item/weapon/storage/bag/cash,
/obj/item/weapon/spacecash/c500,
/obj/item/weapon/spacecash/c100,
/obj/item/weapon/spacecash/c50
),
prob(3);list(
/obj/item/clothing/head/hardhat/orange,
/obj/item/stack/material/gold,
/obj/item/stack/material/gold,
/obj/item/stack/material/gold,
/obj/item/stack/material/gold,
/obj/item/stack/material/gold,
/obj/item/stack/material/gold,
/obj/item/stack/material/gold,
/obj/item/stack/material/gold,
/obj/item/stack/material/gold,
/obj/item/stack/material/gold),
prob(1);list(
/obj/item/stack/material/phoron,
/obj/item/stack/material/phoron,
/obj/item/stack/material/phoron,
/obj/item/stack/material/phoron,
/obj/item/stack/material/diamond,
/obj/item/stack/material/diamond,
/obj/item/stack/material/diamond
)
)
/obj/random/multiple/underdark/mechtool
name = "random underdark mech equipment"
desc = "Random mech equipment loot for Underdark."
icon = 'icons/mecha/mecha_equipment.dmi'
icon_state = "mecha_clamp"
/obj/random/multiple/underdark/mechtool/item_to_spawn()
return pick(
prob(12);list(/obj/item/mecha_parts/mecha_equipment/tool/drill),
prob(10);list(/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp),
prob(8);list(/obj/item/mecha_parts/mecha_equipment/generator),
prob(7);list(/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot/rigged),
prob(6);list(/obj/item/mecha_parts/mecha_equipment/repair_droid),
prob(3);list(/obj/item/mecha_parts/mecha_equipment/gravcatapult),
prob(2);list(/obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser),
prob(2);list(/obj/item/mecha_parts/mecha_equipment/weapon/energy/flamer/rigged),
prob(1);list(/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill),
)
//POI STUFF
VIRGO3B_TURF_CREATE(/turf/simulated/mineral/ignore_oregen)
VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor/ignore_oregen)