cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-16 01:23:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Explorer Redux (#24202)

Browse Source 
* WE'RE SO BACK

* LET THERE BE SOUND

* More bugs

* fixes

* sound

* hmm

* clothing sprites + minor code changes to clothes

* meestake

* spritening

* YARR

* hiss

* Cyberiad explorer remap

* hand telover

* delta days

* rooms done

* VENDOR

* Mapping done

* Salvage mapped

* qol

* Forgot the hivelord.

* woops

* oops redux

* reviews and more

* consistency

* Update code/game/jobs/job_globals.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* character

* Update code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/sellable.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/effects/spawners/random_spawners.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/hostile/pirate.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/clothing/head/job_hats.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/effects/spawners/random_spawners.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/boxes.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/research/designs/machine_designs.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* some reviews

* Update code/game/machinery/constructable_frame.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* supply

* area repathing and ambience

* mapping

* metamapping

* Update code/game/objects/items/weapons/storage/belt.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* the doorening

* redooring

* modsuit

* more reviews

* the plasmamamninigngg

* add random salvage generation across space ruins

* add blackbox tracking for salvage sold

* gun

* deconflicts and reviews

* Update code/game/objects/items/sellable.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/clothing/head/job_hats.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/sellable.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/sellable.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/sellable.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/sellable.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/garment.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* all conversations resolved

* maybe work now?

* please no more, too many apcs

* Update code/modules/mob/living/simple_animal/corpse.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/mining/machine_vending.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/clothing/suits/misc_suits.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/sellable.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/sellable.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* henri review + action figure

* Update code/game/objects/items/toys.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* PDA

* conflicts

* more conflicts

* maybe all conflcits?

* wait fuck

* maybe fixed???

* KIDAN SPRITES

* MAYBE?

* access fixes

* explorer hotfixes 1:

- fixes space pirates dying in space
- gives explorers ORM access
- box: fixes access on NTR airlock
- box: fixes naming on BS airlock
- box: adds expedition access to mail sorting room

* add salvage selling back

* NOT FOR SALE

* oh my god actually sell the fucking salvage this time

* maybe fine now?

* carpover

* NO MORE CABLE

* balance tweaks

* some depot loot updates

* merge conflict

* deconflicted???

* woops more oversights

* skirts, bombers, exploredrobe code + sprites

* woops (again)

* deconflicting

* remove old explorer room again

* Hat fix

* minor changes to sprites and code for hats

* yarrr fix 1

* first fixes

* don't drop loot from syndies gibbed by depot destruction

* add selling back with new signal based system

* speedmerge this shit

* minor changes to collars/bomber resprite

* docking port in

* ruins

* WE DON'T NEED CONFIG CHANGES WE NEED PICTURES PICTURES OF SPIDERMAN

* no more murder hallway on whiteship

* undelete meson sunglasses, redelete uristrunes

* BOOTY BAGS

* don't drop ashdrake loot from crusher kills

* box: fix ntrep fax, add explorer access to ORMroom

* add meson sunglasses item icon back

* fix cere handtele, meta shutter control, death sound arg

* cleaning up

* she mosins on my russian till i dj station

* Update code/modules/clothing/head/soft_caps.dm

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com>

* Update code/modules/clothing/suits/misc_suits.dm

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com>

* Update code/modules/mining/machine_vending.dm

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com>

* Update code/game/gamemodes/game_mode.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com>

* mapping

* Cleaning up

* revert changes in tools/{bootstrap,ci}

---------

Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com>
Co-authored-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
This commit is contained in:
Marm
2024-05-27 20:27:59 +01:00
committed by GitHub
parent c9f44b1f29
commit 5a68c5f6d3
146 changed files with 5636 additions and 4652 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm
+36 -14
View File
@@ -13,6 +13,10 @@
icon_state = "dark"
},
/area/ruin/space/abandoned_engi_sat)
"aR" = (
/mob/living/simple_animal/hostile/carp/megacarp,
/turf/template_noop,
/area/template_noop)
"bi" = (
/obj/structure/chair/comfy/black{
dir = 8
@@ -239,6 +243,7 @@
/area/ruin/space/abandoned_engi_sat)
"hB" = (
/obj/structure/table,
/obj/item/salvage/ruin/nanotrasen,
/turf/simulated/floor/carpet/airless,
/area/ruin/space/abandoned_engi_sat)
"hE" = (
@@ -567,7 +572,6 @@
"pX" = (
/obj/structure/closet{
icon_state = "eng_secure";
opened = 1;
open_door_sprite = "eng_secure_door";
name = "engineer's locker"
},
@@ -577,6 +581,10 @@
/obj/effect/spawner/random_spawners/wall_rusted_always,
/turf/simulated/wall/r_wall,
/area/ruin/space/abandoned_engi_sat)
"rn" = (
/mob/living/simple_animal/hostile/carp,
/turf/template_noop,
/area/template_noop)
"rr" = (
/obj/structure/lattice,
/turf/template_noop,
@@ -1079,6 +1087,11 @@
name = "floor"
},
/area/ruin/space/abandoned_engi_sat)
"Ig" = (
/obj/structure/table,
/obj/item/salvage/ruin/nanotrasen,
/turf/simulated/floor/plasteel,
/area/ruin/space/abandoned_engi_sat)
"Iz" = (
/obj/structure/disposalpipe/segment,
/obj/effect/spawner/random_spawners/wall_rusted_always,
@@ -1204,6 +1217,10 @@
icon_state = "blue"
},
/area/ruin/space/abandoned_engi_sat)
"OW" = (
/mob/living/simple_animal/hostile/asteroid/hivelord,
/turf/simulated/floor/plating,
/area/ruin/space/abandoned_engi_sat)
"OZ" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -1410,6 +1427,11 @@
/obj/structure/bed,
/turf/simulated/floor/carpet/airless,
/area/ruin/space/abandoned_engi_sat)
"Xq" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/hostile/asteroid/hivelord,
/turf/simulated/floor/plating,
/area/ruin/space/abandoned_engi_sat)
"XP" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -1550,13 +1572,13 @@ LP
"}
(2,1,1) = {"
LP
rn
LP
LP
LP
LP
LP
LP
LP
rn
LP
LP
LP
@@ -1586,9 +1608,9 @@ LP
LP
LP
LP
rn
LP
LP
LP
rn
LP
LP
LP
@@ -1780,7 +1802,7 @@ Iz
hE
LP
LP
LP
aR
LP
LP
LP
@@ -1974,7 +1996,7 @@ kt
eP
fA
XP
et
OW
et
Yz
CP
@@ -2040,7 +2062,7 @@ kZ
Tw
YE
jG
XP
Xq
XP
Ud
fA
@@ -2308,7 +2330,7 @@ oL
mW
NM
mW
BR
Ig
IC
IC
ao
@@ -2357,11 +2379,11 @@ LP
Gi
LP
LP
rn
LP
LP
LP
LP
LP
rn
LP
"}
(26,1,1) = {"
@@ -2427,7 +2449,7 @@ px
LP
LP
LP
LP
rn
LP
LP
LP
@@ -2486,7 +2508,7 @@ uQ
qu
LP
LP
LP
rn
LP
LP
LP
@@ -2523,7 +2545,7 @@ LP
LP
LP
LP
LP
rn
LP
LP
LP
_maps/map_files/RandomRuins/SpaceRuins/asteroid1.dmm
+10 -6
View File
@@ -8,6 +8,10 @@
"c" = (
/turf/simulated/mineral/random/high_chance,
/area/ruin/space/unpowered)
"V" = (
/mob/living/simple_animal/hostile/carp,
/turf/template_noop,
/area/template_noop)
(1,1,1) = {"
a
@@ -83,7 +87,7 @@ a
a
a
a
a
V
a
a
a
@@ -158,7 +162,7 @@ c
a
a
a
a
V
a
a
a
@@ -220,10 +224,10 @@ a
a
a
a
V
a
a
a
a
V
a
a
a
@@ -254,7 +258,7 @@ a
(12,1,1) = {"
a
a
a
V
a
a
c
@@ -322,7 +326,7 @@ a
a
a
a
a
V
a
a
a
_maps/map_files/RandomRuins/SpaceRuins/asteroid2.dmm
+18 -6
View File
@@ -11,6 +11,18 @@
"d" = (
/turf/simulated/mineral/random/high_chance,
/area/ruin/space/unpowered)
"t" = (
/obj/structure/spawner/mining/basilisk,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
"R" = (
/obj/structure/spawner/mining/goliath,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
"V" = (
/mob/living/simple_animal/hostile/carp,
/turf/template_noop,
/area/template_noop)
(1,1,1) = {"
a
@@ -105,7 +117,7 @@ a
a
a
b
b
t
b
c
c
@@ -367,7 +379,7 @@ b
(17,1,1) = {"
a
a
a
V
b
a
a
@@ -388,8 +400,8 @@ a
"}
(18,1,1) = {"
a
a
a
V
V
b
b
a
@@ -400,7 +412,7 @@ a
b
b
b
b
R
b
b
b
@@ -413,7 +425,7 @@ a
a
a
a
a
V
a
a
a
_maps/map_files/RandomRuins/SpaceRuins/asteroid3.dmm
+42 -31
View File
@@ -19,6 +19,17 @@
/obj/item/pickaxe/diamond,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
"q" = (
/turf/simulated/mineral/random/low_chance,
/area/ruin/space/unpowered)
"v" = (
/obj/structure/spawner/mining/basilisk,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
"N" = (
/obj/structure/spawner/mining/hivelord,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
(1,1,1) = {"
a
@@ -79,7 +90,7 @@ b
d
d
c
c
q
d
d
d
@@ -101,8 +112,8 @@ c
d
d
c
c
d
q
q
d
d
b
@@ -115,17 +126,17 @@ b
b
c
c
q
q
c
c
c
c
c
c
c
c
c
d
d
q
q
q
d
c
a
@@ -137,16 +148,16 @@ a
b
c
c
c
c
c
q
q
q
c
c
c
b
c
c
c
q
c
c
b
@@ -192,7 +203,7 @@ b
b
c
c
b
v
b
b
"}
@@ -207,7 +218,7 @@ c
c
c
b
b
N
e
b
b
@@ -276,8 +287,8 @@ c
c
c
c
c
c
q
q
c
d
d
@@ -292,14 +303,14 @@ a
b
d
d
c
c
q
q
c
d
c
c
c
c
q
q
q
c
c
b
@@ -314,12 +325,12 @@ a
b
d
d
c
c
c
c
c
c
q
q
q
q
q
q
c
c
b
@@ -337,10 +348,10 @@ b
c
c
c
c
c
c
c
q
q
q
q
c
c
c
_maps/map_files/RandomRuins/SpaceRuins/asteroid4.dmm
+21 -18
View File
@@ -50,6 +50,9 @@
},
/turf/simulated/floor/mineral/titanium/blue,
/area/ruin/space/unpowered)
"Q" = (
/turf/simulated/mineral/random/low_chance,
/area/ruin/space/unpowered)
(1,1,1) = {"
a
@@ -122,7 +125,7 @@ a
a
b
c
c
Q
b
d
d
@@ -132,9 +135,9 @@ a
a
b
b
Q
b
b
b
Q
a
a
b
@@ -154,9 +157,9 @@ a
a
a
a
b
b
b
Q
Q
Q
a
a
a
@@ -166,8 +169,8 @@ a
a
a
b
b
b
Q
Q
b
b
d
@@ -189,7 +192,7 @@ a
a
b
c
b
Q
b
b
d
@@ -211,7 +214,7 @@ a
a
b
b
b
Q
b
b
d
@@ -233,8 +236,8 @@ a
a
a
b
b
b
Q
Q
b
b
b
@@ -388,9 +391,9 @@ a
a
a
b
b
b
b
Q
Q
Q
b
b
b
@@ -408,9 +411,9 @@ a
a
a
a
b
b
b
Q
Q
Q
b
b
a
_maps/map_files/RandomRuins/SpaceRuins/asteroid5.dmm
+69 -50
View File
@@ -11,6 +11,25 @@
"d" = (
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
"f" = (
/obj/structure/spawner/mining/goliath,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
"A" = (
/turf/simulated/mineral/random/low_chance,
/area/ruin/space/unpowered)
"S" = (
/mob/living/simple_animal/hostile/carp,
/turf/template_noop,
/area/template_noop)
"U" = (
/obj/structure/spawner/mining/basilisk,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
"Y" = (
/obj/structure/spawner/mining/hivelord,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
(1,1,1) = {"
a
@@ -157,7 +176,7 @@ a
a
a
a
a
S
a
a
a
@@ -230,9 +249,9 @@ a
c
c
c
b
b
b
A
A
A
b
b
b
@@ -258,7 +277,7 @@ d
b
b
b
b
A
b
b
b
@@ -274,8 +293,8 @@ c
c
c
b
b
b
A
A
b
b
b
@@ -298,9 +317,9 @@ d
d
b
b
b
b
b
A
A
A
b
b
b
@@ -312,8 +331,8 @@ a
a
a
c
c
c
A
A
c
b
b
@@ -340,8 +359,8 @@ b
c
c
c
c
b
A
A
b
b
b
@@ -354,7 +373,7 @@ a
a
b
c
c
A
c
b
b
@@ -369,7 +388,7 @@ b
a
a
a
a
S
a
a
a
@@ -380,10 +399,10 @@ b
b
b
c
c
c
c
b
A
A
A
A
b
c
c
@@ -396,8 +415,8 @@ a
a
b
b
b
b
A
A
b
d
d
@@ -437,8 +456,8 @@ a
a
b
b
b
b
A
A
b
c
d
@@ -479,7 +498,7 @@ a
a
b
b
b
A
b
b
d
@@ -520,8 +539,8 @@ a
a
a
b
b
b
A
A
b
d
d
@@ -562,7 +581,7 @@ a
a
a
b
b
A
b
c
d
@@ -591,7 +610,7 @@ d
d
c
d
d
U
d
b
b
@@ -679,7 +698,7 @@ d
d
b
b
b
A
b
a
a
@@ -721,7 +740,7 @@ d
d
b
b
b
A
b
b
a
@@ -762,8 +781,8 @@ d
d
b
b
b
b
A
A
c
c
a
@@ -805,7 +824,7 @@ b
b
c
c
b
A
c
c
a
@@ -815,7 +834,7 @@ a
c
c
d
d
U
d
a
a
@@ -840,14 +859,14 @@ b
b
b
d
d
f
d
b
b
b
c
c
b
A
c
c
a
@@ -889,7 +908,7 @@ b
b
b
b
b
A
c
c
a
@@ -1263,11 +1282,11 @@ a
a
a
a
S
a
a
a
a
a
S
a
a
a
@@ -1337,14 +1356,14 @@ d
d
d
b
b
b
b
b
A
A
A
A
b
b
a
a
S
a
a
a
@@ -1361,7 +1380,7 @@ a
a
a
a
a
S
a
a
a
@@ -1382,8 +1401,8 @@ b
b
b
b
b
b
A
A
c
a
a
@@ -1406,7 +1425,7 @@ a
a
a
a
a
S
a
a
a
@@ -1506,7 +1525,7 @@ b
b
d
d
d
Y
d
b
b
_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm
+6 -1
View File
@@ -199,6 +199,10 @@
icon_state = "dark"
},
/area/ruin/space/tcommsat)
"lq" = (
/mob/living/simple_animal/hostile/syndicate/ranged/space/autogib,
/turf/simulated/floor/plating/airless,
/area/ruin/space/tcommsat)
"my" = (
/obj/structure/window/reinforced{
dir = 4
@@ -239,6 +243,7 @@
"oh" = (
/obj/structure/table,
/obj/item/taperecorder,
/obj/item/salvage/ruin/nanotrasen,
/turf/simulated/floor/plating/airless,
/area/ruin/space/tcommsat)
"ok" = (
@@ -1978,7 +1983,7 @@ YW
hg
Wc
jv
Wc
lq
Wc
Wc
Wc
_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm
+63 -50
View File
@@ -81,6 +81,9 @@
},
/turf/simulated/floor/plasteel/airless,
/area/ruin/space/unpowered)
"v" = (
/turf/simulated/mineral/random/high_chance/clown,
/area/ruin/space/unpowered)
"x" = (
/obj/effect/mob_spawn/human/corpse/clown,
/turf/simulated/floor/plasteel/airless,
@@ -204,6 +207,16 @@
},
/turf/simulated/floor/plating/airless,
/area/ruin/space/unpowered)
"U" = (
/turf/simulated/mineral/random/low_chance,
/area/ruin/space/unpowered)
"Y" = (
/turf/simulated/mineral/random/high_chance,
/area/ruin/space/unpowered)
"Z" = (
/obj/structure/spawner/mining/hivelord,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
(1,1,1) = {"
a
@@ -254,8 +267,8 @@ a
a
a
m
m
m
v
v
m
m
m
@@ -277,8 +290,8 @@ a
a
a
m
m
m
v
v
m
m
m
@@ -299,10 +312,10 @@ a
a
a
a
m
m
m
m
v
v
v
v
m
m
m
@@ -321,13 +334,13 @@ a
a
a
a
m
m
m
m
m
m
m
v
U
U
U
U
U
Y
m
m
m
@@ -342,14 +355,14 @@ a
a
a
a
m
m
m
m
m
m
m
m
v
v
v
U
U
U
U
U
m
m
m
@@ -364,16 +377,16 @@ a
a
a
n
v
m
m
m
m
m
m
m
m
m
m
U
U
U
U
Y
Y
m
m
m
@@ -392,9 +405,9 @@ m
m
m
m
m
m
m
Y
U
U
m
m
m
@@ -413,14 +426,14 @@ m
m
m
m
m
m
m
Y
Y
Y
m
m
m
n
n
Z
a
a
a
@@ -435,10 +448,10 @@ m
m
m
m
Y
m
m
m
m
Y
Y
m
m
n
@@ -528,8 +541,8 @@ m
m
m
m
m
m
v
v
m
m
m
@@ -550,10 +563,10 @@ m
J
b
m
m
m
m
m
v
v
v
v
m
m
"}
@@ -573,8 +586,8 @@ k
b
m
m
m
m
v
v
n
m
m
@@ -595,8 +608,8 @@ K
b
b
m
m
m
v
v
n
m
m
_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm
+11 -2
View File
@@ -21,6 +21,10 @@
/obj/structure/grille/broken,
/turf/space,
/area/space)
"f" = (
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/space,
/turf/space,
/area/space)
"g" = (
/obj/structure/disposalpipe/broken{
dir = 4
@@ -144,6 +148,11 @@
"V" = (
/turf/simulated/wall,
/area/space)
"W" = (
/obj/structure/lattice,
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/space,
/turf/space,
/area/space)
"X" = (
/turf/space,
/area/space)
@@ -295,7 +304,7 @@ X
X
y
E
X
f
E
Y
X
@@ -383,7 +392,7 @@ X
X
I
v
v
W
X
v
t
_maps/map_files/RandomRuins/SpaceRuins/debris2.dmm
+1 -3
View File
@@ -118,9 +118,7 @@
/area/space)
"H" = (
/obj/structure/table,
/obj/item/shard{
icon_state = "medium"
},
/obj/item/salvage/ruin/brick,
/turf/simulated/floor/plasteel/airless,
/area/space)
"I" = (
_maps/map_files/RandomRuins/SpaceRuins/debris3.dmm
+6 -2
View File
@@ -134,6 +134,10 @@
/obj/structure/girder/displaced,
/turf/space,
/area/template_noop)
"Q" = (
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/space,
/turf/space,
/area/template_noop)
"S" = (
/obj/structure/lattice,
/turf/space,
@@ -429,7 +433,7 @@ A
A
B
O
A
Q
B
A
M
@@ -475,7 +479,7 @@ z
H
A
A
A
Q
S
A
q
_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
+1624 -1570
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/RandomRuins/SpaceRuins/derelict1.dmm
+22 -3
View File
@@ -73,6 +73,25 @@
/obj/structure/alien/weeds,
/obj/structure/bed/nest,
/obj/effect/decal/remains/xeno,
/mob/living/simple_animal/hostile/alien,
/turf/simulated/floor/plating/airless,
/area/ruin/space/unpowered)
"F" = (
/obj/structure/alien/weeds/node,
/mob/living/simple_animal/hostile/alien/maid,
/turf/simulated/floor/plating/airless,
/area/ruin/space/unpowered)
"G" = (
/obj/structure/alien/weeds,
/obj/structure/bed/nest,
/mob/living/simple_animal/hostile/alien,
/turf/simulated/floor/plating/airless,
/area/ruin/space/unpowered)
"S" = (
/obj/structure/alien/weeds,
/obj/structure/bed/nest,
/obj/effect/decal/remains/human,
/mob/living/simple_animal/hostile/alien,
/turf/simulated/floor/plating/airless,
/area/ruin/space/unpowered)
@@ -680,7 +699,7 @@ b
b
k
f
i
G
f
c
m
@@ -810,7 +829,7 @@ c
f
c
f
j
S
f
c
f
@@ -1015,7 +1034,7 @@ b
c
i
f
h
F
f
f
c
_maps/map_files/RandomRuins/SpaceRuins/derelict2.dmm
+14 -25
View File
@@ -34,21 +34,9 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/ruin/space/powered)
"h" = (
/obj/machinery/light/small{
dir = 1
},
/turf/simulated/floor/plasteel,
/area/ruin/space/powered)
"i" = (
/turf/simulated/floor/plasteel,
/area/ruin/space/powered)
"j" = (
/obj/machinery/light/small{
dir = 4
},
/turf/simulated/floor/plasteel,
/area/ruin/space/powered)
"k" = (
/obj/structure/window/reinforced,
/turf/template_noop,
@@ -65,6 +53,7 @@
dir = 4
},
/obj/effect/decal/remains/human,
/mob/living/simple_animal/hostile/retaliate/ghost,
/turf/simulated/floor/plasteel,
/area/ruin/space/powered)
"n" = (
@@ -78,6 +67,7 @@
/obj/item/trash/plate{
pixel_x = -10
},
/obj/item/food/snacks/burger/ghost,
/turf/simulated/floor/plasteel,
/area/ruin/space/powered)
"o" = (
@@ -85,6 +75,7 @@
dir = 8
},
/obj/effect/decal/remains/human,
/mob/living/simple_animal/hostile/retaliate/ghost,
/turf/simulated/floor/plasteel,
/area/ruin/space/powered)
"p" = (
@@ -94,13 +85,11 @@
/turf/template_noop,
/area/space/nearstation)
"q" = (
/obj/machinery/light/small{
dir = 8
},
/obj/structure/cult/functional/pylon,
/turf/simulated/floor/plasteel,
/area/ruin/space/powered)
"r" = (
/obj/machinery/light/small,
/obj/item/salvage/ruin/tablet,
/turf/simulated/floor/plasteel,
/area/ruin/space/powered)
@@ -840,7 +829,7 @@ i
i
i
i
q
i
f
a
a
@@ -877,12 +866,12 @@ a
a
a
f
h
i
i
i
q
i
i
i
q
i
f
a
@@ -924,7 +913,7 @@ i
i
m
i
i
r
i
g
b
@@ -1004,7 +993,7 @@ d
d
g
i
i
r
i
o
i
@@ -1046,12 +1035,12 @@ a
a
f
i
q
i
i
i
q
i
i
r
f
a
a
@@ -1088,7 +1077,7 @@ a
a
a
f
j
i
i
i
i
_maps/map_files/RandomRuins/SpaceRuins/derelict3.dmm
+91 -48
View File
@@ -12,6 +12,49 @@
/obj/structure/lattice,
/turf/template_noop,
/area/space/nearstation)
"h" = (
/obj/item/grenade/jaunter_grenade,
/turf/simulated/floor/plating/airless,
/area/ruin/space/unpowered)
"l" = (
/obj/structure/lattice,
/mob/living/simple_animal/hostile/carp/megacarp,
/turf/template_noop,
/area/space/nearstation)
"m" = (
/obj/item/salvage/ruin/tablet,
/turf/simulated/floor/plating/airless,
/area/ruin/space/unpowered)
"n" = (
/obj/structure/lattice,
/mob/living/simple_animal/hostile/carp,
/turf/template_noop,
/area/space/nearstation)
"s" = (
/mob/living/simple_animal/hostile/carp/megacarp,
/turf/simulated/floor/plating/airless,
/area/ruin/space/unpowered)
"w" = (
/mob/living/simple_animal/hostile/megafauna/dragon/space_dragon,
/obj/effect/decal/remains/human,
/turf/simulated/floor/plating/airless,
/area/ruin/space/unpowered)
"x" = (
/mob/living/simple_animal/hostile/carp,
/turf/template_noop,
/area/template_noop)
"F" = (
/obj/effect/decal/remains/human,
/turf/simulated/floor/plating/airless,
/area/ruin/space/unpowered)
"O" = (
/mob/living/simple_animal/hostile/carp,
/turf/simulated/floor/plating/airless,
/area/ruin/space/unpowered)
"X" = (
/obj/item/survivalcapsule/luxury,
/turf/simulated/floor/plating/airless,
/area/ruin/space/unpowered)
(1,1,1) = {"
a
@@ -109,7 +152,7 @@ a
a
a
a
a
x
a
a
a
@@ -239,7 +282,7 @@ a
a
a
a
a
x
a
a
a
@@ -257,7 +300,7 @@ d
b
b
b
b
X
b
c
a
@@ -298,8 +341,8 @@ a
d
d
d
b
b
h
F
b
c
a
@@ -328,7 +371,7 @@ a
a
a
a
a
x
a
a
a
@@ -358,7 +401,7 @@ a
a
a
a
a
x
a
a
a
@@ -479,7 +522,7 @@ a
a
a
a
a
x
a
a
a
@@ -535,7 +578,7 @@ a
a
a
a
a
x
a
a
a
@@ -609,7 +652,7 @@ a
a
a
a
a
x
a
a
a
@@ -639,7 +682,7 @@ a
a
a
a
a
x
a
a
"}
@@ -658,7 +701,7 @@ a
a
a
a
a
x
a
a
a
@@ -703,7 +746,7 @@ a
a
a
d
d
n
b
b
c
@@ -750,7 +793,7 @@ b
b
c
b
b
m
b
d
a
@@ -788,11 +831,11 @@ d
d
b
b
b
F
b
c
b
b
F
b
d
a
@@ -827,7 +870,7 @@ a
d
d
b
d
l
b
c
c
@@ -860,7 +903,7 @@ a
a
a
a
a
x
a
a
d
@@ -913,9 +956,9 @@ d
d
d
b
F
b
b
b
O
b
b
d
@@ -928,7 +971,7 @@ a
a
a
a
a
x
a
a
a
@@ -947,7 +990,7 @@ a
a
b
b
b
O
b
b
b
@@ -955,7 +998,7 @@ d
d
d
b
b
m
b
b
d
@@ -988,11 +1031,11 @@ a
a
b
b
b
O
b
c
b
b
m
d
d
d
@@ -1000,7 +1043,7 @@ d
b
b
b
d
n
d
b
d
@@ -1076,11 +1119,11 @@ c
c
c
c
b
s
b
d
d
b
w
d
d
d
@@ -1168,14 +1211,14 @@ d
b
b
b
O
b
b
b
O
b
b
d
a
a
x
a
a
a
@@ -1201,14 +1244,14 @@ b
b
b
b
b
F
b
d
d
d
d
b
b
F
b
b
b
@@ -1249,9 +1292,9 @@ d
d
d
b
b
b
b
s
F
m
b
c
b
@@ -1265,7 +1308,7 @@ a
a
a
a
a
x
a
a
a
@@ -1283,7 +1326,7 @@ a
a
a
a
d
n
d
d
d
@@ -1339,7 +1382,7 @@ c
b
c
b
b
F
b
a
a
@@ -1361,14 +1404,14 @@ a
a
a
a
x
a
a
a
a
a
a
a
a
x
a
d
d
@@ -1415,9 +1458,9 @@ a
a
d
d
n
d
d
d
n
b
b
b
@@ -1449,7 +1492,7 @@ a
a
a
a
a
x
a
a
a
@@ -1517,7 +1560,7 @@ a
a
a
a
a
x
a
a
a
@@ -1540,6 +1583,7 @@ a
a
a
a
x
a
a
a
@@ -1552,8 +1596,7 @@ a
a
a
a
a
a
x
a
a
a
@@ -1691,5 +1734,5 @@ a
a
a
a
a
x
"}
_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm
+19 -11
View File
@@ -89,6 +89,14 @@
/obj/structure/girder,
/turf/simulated/floor/plating/airless,
/area/ruin/space/unpowered)
"K" = (
/obj/structure/spawner/mining/basilisk,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
"Z" = (
/mob/living/simple_animal/hostile/carp,
/turf/template_noop,
/area/template_noop)
(1,1,1) = {"
a
@@ -281,7 +289,7 @@ a
a
a
a
a
Z
a
a
a
@@ -313,7 +321,7 @@ c
a
a
a
a
Z
a
a
a
@@ -572,7 +580,7 @@ c
c
c
c
c
K
c
c
c
@@ -627,7 +635,7 @@ a
a
a
a
a
Z
a
a
a
@@ -897,7 +905,7 @@ a
a
a
a
a
Z
a
a
a
@@ -968,7 +976,7 @@ b
b
b
c
c
K
c
a
"}
@@ -1040,7 +1048,7 @@ h
h
f
c
c
K
c
c
b
@@ -1236,7 +1244,7 @@ b
b
b
a
a
Z
a
b
b
@@ -1338,7 +1346,7 @@ a
a
a
a
a
Z
a
a
a
@@ -1439,7 +1447,7 @@ a
a
a
a
a
Z
a
a
a
@@ -1542,7 +1550,7 @@ a
a
a
a
a
Z
a
a
a
_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
+108 -90
View File
@@ -34,6 +34,9 @@
/mob/living/simple_animal/cockroach,
/turf/simulated/floor/plasteel,
/area/ruin/space/unpowered)
"ez" = (
/turf/simulated/mineral/random/high_chance/clown,
/area/ruin/space/unpowered)
"fi" = (
/obj/structure/closet/cabinet,
/obj/item/clothing/under/suit/charcoal,
@@ -48,6 +51,10 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/ruin/space/unpowered)
"gx" = (
/obj/structure/spawner/mining/basilisk,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
"hG" = (
/obj/structure/kitchenspike,
/turf/simulated/floor/plasteel,
@@ -168,6 +175,10 @@
/obj/item/gun/projectile/revolver/russian,
/turf/simulated/floor/plasteel,
/area/ruin/space/unpowered)
"yq" = (
/mob/living/simple_animal/hostile/carp,
/turf/template_noop,
/area/template_noop)
"yY" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -202,6 +213,9 @@
/obj/effect/decal/cleanable/insectguts,
/turf/simulated/floor/plasteel,
/area/ruin/space/unpowered)
"Dt" = (
/turf/simulated/mineral/random/high_chance,
/area/ruin/space/unpowered)
"Gx" = (
/obj/effect/decal/cleanable/blood,
/turf/simulated/floor/plasteel,
@@ -216,6 +230,10 @@
/obj/effect/decal/cleanable/blood/splatter,
/turf/simulated/floor/plating,
/area/ruin/space/unpowered)
"KW" = (
/obj/structure/spawner/mining/hivelord,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
"Li" = (
/obj/structure/door_assembly,
/obj/structure/barricade/wooden/crude,
@@ -394,7 +412,7 @@ TT
TT
TT
TT
TT
yq
TT
TT
TT
@@ -409,7 +427,7 @@ VS
VS
TT
TT
TT
yq
TT
"}
(3,1,1) = {"
@@ -446,8 +464,8 @@ TT
TT
TT
TT
VS
VS
Dt
Dt
VS
TT
TT
@@ -461,7 +479,7 @@ TT
TT
TT
TT
TT
yq
TT
TT
TT
@@ -524,7 +542,7 @@ TT
TT
TT
TT
TT
yq
TT
TT
TT
@@ -577,7 +595,7 @@ TT
TT
TT
TT
VS
Dt
TT
"}
(7,1,1) = {"
@@ -651,23 +669,23 @@ TT
TT
VS
VS
VS
TT
TT
Dt
TT
TT
TT
TT
TT
TT
yq
TT
yq
TT
TT
"}
(9,1,1) = {"
TT
TT
TT
yq
TT
TT
TT
@@ -693,7 +711,7 @@ TT
TT
VS
VS
VS
Dt
TT
TT
TT
@@ -715,10 +733,10 @@ TT
TT
TT
Qx
Dt
Dt
Qx
Qx
Qx
Qx
Dt
Qx
Qx
Qx
@@ -745,7 +763,7 @@ TT
TT
TT
TT
TT
yq
TT
"}
(11,1,1) = {"
@@ -776,7 +794,7 @@ TT
TT
TT
TT
VS
Dt
VS
VS
VS
@@ -804,10 +822,10 @@ Qx
Qx
Qx
Qx
Dt
Qx
Qx
Qx
Qx
Dt
Qx
Qx
WA
@@ -842,15 +860,15 @@ TT
Qx
Qx
Qx
Dt
Dt
Qx
Qx
Dt
Qx
Qx
Qx
Qx
Qx
Qx
Qx
Dt
Dt
Qx
Qx
Qx
@@ -936,8 +954,8 @@ Se
Pq
Se
Qx
Qx
Qx
Dt
Dt
Qx
Qx
WA
@@ -967,8 +985,8 @@ TT
TT
Qx
Qx
Qx
Qx
Dt
Dt
Qx
Pq
aN
@@ -978,7 +996,7 @@ vg
kb
Pq
LZ
Qx
Dt
Qx
Qx
Qx
@@ -1009,7 +1027,7 @@ TT
TT
TT
Qx
Qx
Dt
Qx
Qx
Se
@@ -1064,7 +1082,7 @@ Se
vE
KU
Se
Qx
Dt
Qx
Qx
WA
@@ -1106,7 +1124,7 @@ Se
zN
xs
Qx
Qx
Dt
Qx
Qx
Qx
@@ -1129,14 +1147,14 @@ TT
(20,1,1) = {"
TT
TT
TT
yq
TT
TT
TT
TT
Qx
Qx
Qx
Dt
Qx
Se
ph
@@ -1178,7 +1196,7 @@ TT
TT
Qx
Qx
Qx
Dt
Qx
Qx
ZP
@@ -1195,7 +1213,7 @@ Qx
Qx
Qx
WA
WA
KW
WA
WA
WA
@@ -1233,8 +1251,8 @@ vE
kO
Se
Qx
Qx
Qx
Dt
Dt
Qx
WA
WA
@@ -1247,8 +1265,8 @@ WA
WA
WA
Qx
Qx
Qx
Dt
Dt
Qx
TT
"}
@@ -1285,7 +1303,7 @@ WA
WA
WA
WA
WA
gx
WA
WA
Qx
@@ -1372,8 +1390,8 @@ WA
WA
Qx
Qx
Qx
Qx
Dt
Dt
Qx
Qx
Qx
@@ -1390,8 +1408,8 @@ TT
Qx
Qx
Qx
Qx
Qx
Dt
Dt
Gx
zN
zN
@@ -1415,7 +1433,7 @@ Qx
Qx
Qx
Qx
Qx
Dt
Qx
Qx
Qx
@@ -1433,7 +1451,7 @@ TT
Qx
Qx
Qx
Qx
Dt
Qx
zN
Wy
@@ -1445,8 +1463,8 @@ Se
Qx
Qx
Qx
Qx
Qx
ez
ez
Qx
Qx
Qx
@@ -1484,12 +1502,12 @@ Se
nb
zN
Qx
Dt
Qx
Qx
Qx
Qx
Qx
Qx
Dt
Dt
ez
Qx
Se
fi
@@ -1501,7 +1519,7 @@ Qx
Qx
Qx
Qx
Qx
Dt
Qx
"}
(29,1,1) = {"
@@ -1526,12 +1544,12 @@ Se
Se
Pq
Qx
Dt
ez
Qx
Qx
Qx
Qx
Qx
Qx
Dt
ez
Qx
Pq
zN
@@ -1543,7 +1561,7 @@ Pq
Qx
Qx
Qx
Qx
Dt
Qx
"}
(30,1,1) = {"
@@ -1563,17 +1581,17 @@ Qx
Qx
Qx
Qx
Dt
Dt
Qx
Qx
Qx
Dt
Qx
Qx
ez
Qx
Qx
Qx
Qx
Qx
Qx
ez
Qx
Se
vE
@@ -1610,12 +1628,12 @@ Qx
Qx
Qx
Qx
Dt
ez
Qx
Qx
Qx
Qx
Qx
Qx
Dt
ez
Qx
Pq
sd
@@ -1625,7 +1643,7 @@ rc
vE
Se
Qx
Qx
Dt
Qx
Qx
Qx
@@ -1652,12 +1670,12 @@ Qx
Qx
Qx
Qx
Dt
Qx
Qx
Qx
Qx
Qx
Qx
Dt
Dt
ez
Qx
Se
Qx
@@ -1666,8 +1684,8 @@ Pq
Se
Pq
Se
Qx
Qx
Dt
Dt
Qx
Qx
TT
@@ -1677,8 +1695,8 @@ TT
TT
VS
VS
VS
VS
Dt
Dt
TT
TT
TT
@@ -1697,8 +1715,8 @@ Qx
Qx
Qx
Qx
Qx
Qx
ez
ez
Qx
Qx
Qx
@@ -1718,8 +1736,8 @@ TT
TT
TT
TT
VS
VS
Dt
Dt
VS
TT
TT
@@ -1733,6 +1751,7 @@ Qx
Qx
Qx
Qx
Dt
Qx
Qx
Qx
@@ -1746,9 +1765,8 @@ Qx
Qx
Qx
Qx
Qx
Qx
Qx
Dt
Dt
Qx
Qx
Qx
@@ -1778,16 +1796,16 @@ Qx
Qx
Qx
Qx
Dt
Qx
Qx
Qx
Dt
Qx
Qx
Qx
Qx
Qx
Qx
Qx
Dt
Dt
Qx
Qx
Qx
@@ -1827,7 +1845,7 @@ Qx
Qx
Qx
Qx
Qx
Dt
Qx
Qx
Qx
@@ -1895,7 +1913,7 @@ TT
TT
TT
TT
TT
yq
TT
TT
TT
_maps/map_files/RandomRuins/SpaceRuins/dj.dmm
+13 -3
View File
@@ -512,6 +512,7 @@
/area/ruin/space/djstation)
"bp" = (
/obj/structure/chair/office/light,
/mob/living/simple_animal/hostile/russian/ranged/mosin,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/djstation)
"bq" = (
@@ -794,6 +795,15 @@
},
/turf/template_noop,
/area/ruin/space/djstation)
"yr" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/salvage/ruin/russian,
/turf/simulated/floor/plating,
/area/ruin/space/djstation)
"Zp" = (
/obj/item/salvage/ruin/russian,
/turf/simulated/floor/plating,
/area/ruin/space/djstation)
(1,1,1) = {"
aa
@@ -1106,8 +1116,8 @@ ae
aa
aa
am
at
av
yr
Zp
aF
av
aM
@@ -1226,7 +1236,7 @@ ae
ad
aa
am
av
Zp
aB
at
aJ
_maps/map_files/RandomRuins/SpaceRuins/druglab.dmm
+15 -11
View File
@@ -108,6 +108,7 @@
/area/ruin/space/methlab)
"v" = (
/obj/structure/chair,
/mob/living/simple_animal/hostile/pirate,
/turf/simulated/floor/plating,
/area/ruin/space/methlab)
"w" = (
@@ -123,6 +124,9 @@
/obj/machinery/kitchen_machine/microwave,
/turf/simulated/floor/plating,
/area/ruin/space/methlab)
"K" = (
/turf/simulated/mineral/random/high_chance,
/area/ruin/space/methlab)
(1,1,1) = {"
a
@@ -162,9 +166,9 @@ a
a
b
b
b
b
b
K
K
K
b
b
b
@@ -229,8 +233,8 @@ e
j
p
t
b
b
K
K
b
b
b
@@ -240,12 +244,12 @@ a
a
b
b
b
K
f
m
b
b
b
K
K
b
b
a
@@ -255,8 +259,8 @@ a
(9,1,1) = {"
b
b
b
b
K
K
f
n
j
@@ -272,7 +276,7 @@ a
b
b
b
b
K
g
i
j
_maps/map_files/RandomRuins/SpaceRuins/emptyshell.dmm
+13 -4
View File
@@ -29,12 +29,21 @@
/area/ruin/space/unpowered)
"i" = (
/obj/machinery/door/airlock,
/obj/structure/barricade/wooden/crude,
/turf/simulated/floor/plating,
/area/ruin/space/unpowered)
"j" = (
/obj/item/stack/cable_coil,
/turf/simulated/floor/plating,
/area/ruin/space/unpowered)
"p" = (
/mob/living/simple_animal/hostile/asteroid/hivelord,
/turf/simulated/floor/plating,
/area/ruin/space/unpowered)
"T" = (
/obj/item/salvage/ruin/tablet,
/turf/simulated/floor/plating,
/area/ruin/space/unpowered)
(1,1,1) = {"
a
@@ -161,7 +170,7 @@ a
c
c
e
d
T
d
g
e
@@ -182,7 +191,7 @@ d
d
d
d
d
p
d
d
c
@@ -230,9 +239,9 @@ c
c
d
e
p
d
d
d
T
g
d
e
_maps/map_files/RandomRuins/SpaceRuins/intactemptyship.dmm
+6 -1
View File
@@ -131,6 +131,11 @@
/obj/item/blank_tarot_card,
/turf/simulated/floor/mineral/titanium/purple,
/area/ruin/space/powered)
"R" = (
/obj/structure/table/wood,
/obj/item/salvage/ruin/tablet,
/turf/simulated/floor/mineral/titanium/purple,
/area/ruin/space/powered)
(1,1,1) = {"
a
@@ -194,7 +199,7 @@ h
z
b
h
n
R
b
"}
(6,1,1) = {"
_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm
+49 -42
View File
@@ -18,6 +18,9 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/ruin/space/syndicate_listening_station)
"cB" = (
/turf/simulated/mineral/random/high_chance,
/area/ruin/space/syndicate_listening_station/asteroid)
"du" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -448,6 +451,10 @@
},
/turf/simulated/floor/plating/airless,
/area/ruin/space/syndicate_listening_station/asteroid)
"Ie" = (
/obj/structure/spawner/mining/basilisk,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/syndicate_listening_station/asteroid)
"Km" = (
/obj/machinery/light/small{
dir = 1
@@ -832,10 +839,10 @@ Zw
Zw
Zw
yn
yn
cB
Zw
Zw
yn
cB
yn
yn
yn
@@ -846,8 +853,8 @@ Zw
Zw
yn
yn
yn
yn
cB
cB
yn
Zw
Zw
@@ -876,8 +883,8 @@ Zw
yn
yn
Zw
yn
yn
cB
cB
yn
Zw
yn
@@ -888,9 +895,9 @@ Zw
Zw
yn
yn
yn
yn
yn
cB
cB
cB
Zw
Zw
Zw
@@ -945,7 +952,7 @@ HZ
yn
yn
yn
yn
cB
yn
AT
AT
@@ -985,15 +992,15 @@ tk
HZ
yn
yn
yn
cB
yn
yn
yn
AT
AT
yn
yn
yn
cB
cB
yn
yn
yn
@@ -1026,9 +1033,9 @@ yn
yn
yn
yn
cB
yn
yn
yn
cB
yn
yn
yn
@@ -1066,6 +1073,8 @@ kJ
kE
kJ
yn
cB
cB
yn
yn
yn
@@ -1078,9 +1087,7 @@ yn
yn
yn
yn
yn
yn
yn
cB
yn
yn
yn
@@ -1118,14 +1125,14 @@ yn
yn
yn
yn
cB
yn
cB
yn
yn
yn
yn
yn
yn
yn
yn
cB
cB
Zw
Zw
Zw
@@ -1164,10 +1171,10 @@ yn
yn
yn
yn
yn
yn
yn
yn
cB
cB
cB
cB
Zw
Zw
Zw
@@ -1208,7 +1215,7 @@ yn
yn
yn
yn
yn
cB
yn
yn
Zw
@@ -1247,7 +1254,7 @@ kJ
kJ
yn
yn
yn
cB
yn
yn
yn
@@ -1377,7 +1384,7 @@ yn
yn
yn
AT
AT
Ie
AT
Zw
Zw
@@ -1543,7 +1550,7 @@ yn
yn
yn
AT
AT
Ie
AT
Zw
Zw
@@ -1660,9 +1667,9 @@ kJ
yn
yn
rK
yn
yn
yn
cB
cB
cB
yn
yn
yn
@@ -1703,9 +1710,9 @@ yn
yn
rK
yn
yn
yn
yn
cB
cB
cB
yn
yn
yn
@@ -1746,8 +1753,8 @@ yn
iL
yn
yn
yn
yn
cB
cB
yn
yn
AT
@@ -1788,7 +1795,7 @@ yn
Zw
yn
yn
yn
cB
Zw
yn
AT
@@ -1980,8 +1987,8 @@ Zw
Zw
yn
yn
yn
yn
cB
cB
Zw
Zw
yn
_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm
+94 -51
View File
@@ -1480,6 +1480,7 @@
icon_state = "2-4";
tag = ""
},
/mob/living/simple_animal/hostile/pirate/ranged,
/turf/simulated/floor/plasteel{
icon_state = "bar"
},
@@ -2398,6 +2399,48 @@
},
/turf/simulated/floor/plating,
/area/ruin/unpowered/BMPship/Aft)
"hE" = (
/obj/effect/landmark/damageturf,
/mob/living/simple_animal/hostile/pirate,
/turf/simulated/floor/plating,
/area/ruin/unpowered/BMPship/Midship)
"qM" = (
/obj/machinery/conveyor{
dir = 4;
id = "meatConvey2"
},
/obj/item/salvage/ruin/pirate,
/turf/simulated/floor/plating,
/area/ruin/unpowered/BMPship/Midship)
"uK" = (
/mob/living/simple_animal/hostile/pirate,
/turf/simulated/floor/plasteel{
icon_state = "bar"
},
/area/ruin/unpowered/BMPship/Midship)
"uT" = (
/turf/simulated/mineral/random/high_chance,
/area/ruin/powered)
"BC" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
tag = ""
},
/mob/living/simple_animal/hostile/pirate,
/turf/simulated/floor/plasteel{
icon_state = "bar"
},
/area/ruin/unpowered/BMPship/Midship)
"Ht" = (
/obj/machinery/conveyor{
dir = 4;
id = "meatConvey1"
},
/obj/item/salvage/ruin/pirate,
/turf/simulated/floor/plating,
/area/ruin/unpowered/BMPship/Midship)
"IM" = (
/obj/structure/closet/crate/freezer,
/obj/item/food/snacks/meat,
@@ -2761,7 +2804,7 @@ aJ
aJ
aK
aK
aK
uT
aK
aK
aK
@@ -2813,9 +2856,9 @@ aJ
aK
aK
aK
aK
aK
aK
uT
uT
uT
aK
aK
aa
@@ -2867,7 +2910,7 @@ aK
aK
aK
aK
aK
uT
aK
aK
aa
@@ -3114,8 +3157,8 @@ aD
aK
aK
aK
aK
aK
uT
uT
aK
aK
aK
@@ -3165,8 +3208,8 @@ aD
aK
aK
aK
aK
aK
uT
uT
aK
aK
aK
@@ -3215,9 +3258,9 @@ fA
aD
aK
aK
aK
aK
aK
uT
uT
uT
aK
aK
aK
@@ -3266,8 +3309,8 @@ gs
aK
aK
aK
aK
aK
uT
uT
aK
aK
aK
@@ -3318,11 +3361,11 @@ gs
aK
aK
aK
uT
uT
aK
aK
aK
aK
aK
uT
aK
aK
aK
@@ -3368,12 +3411,12 @@ gs
bc
aK
aK
uT
uT
aK
aK
aK
aK
aK
aK
uT
uT
aK
aK
aK
@@ -3420,10 +3463,10 @@ aK
aK
aK
aK
uT
aK
aK
aK
aK
uT
uT
aK
aK
aK
@@ -3469,12 +3512,12 @@ gs
gs
aK
aK
aK
aK
aK
aK
aK
aK
uT
uT
uT
uT
uT
uT
aK
aK
aK
@@ -3522,9 +3565,9 @@ aK
aK
aK
aK
aK
aK
aK
uT
uT
uT
aK
aK
aK
@@ -3564,7 +3607,7 @@ eo
fn
dC
ca
gb
hE
bF
aK
aK
@@ -3573,13 +3616,13 @@ aK
aK
bc
aK
uT
aK
aK
aK
aK
aK
aK
aK
uT
uT
aK
aK
aK
@@ -3629,9 +3672,9 @@ aK
aK
aK
aK
aK
aK
aK
uT
uT
uT
aK
aK
aK
@@ -3682,8 +3725,8 @@ aK
aK
aK
aK
aK
aK
uT
uT
aK
aK
aK
@@ -3734,7 +3777,7 @@ aK
aK
aK
aK
aK
uT
aK
aK
aK
@@ -3862,7 +3905,7 @@ cr
cJ
ca
ca
ca
uK
ca
dg
ca
@@ -3915,7 +3958,7 @@ ca
ca
dT
ca
dg
BC
ca
ca
dT
@@ -4117,7 +4160,7 @@ ca
ca
ca
dC
dU
Ht
dC
dg
ca
@@ -4195,7 +4238,7 @@ aJ
aJ
aK
aK
aK
uT
aK
aa
"}
@@ -4224,7 +4267,7 @@ dC
dg
ca
dC
fr
qM
dC
ca
ca
@@ -4245,8 +4288,8 @@ aa
aa
aa
aK
aK
aK
uT
uT
aK
aa
"}
@@ -4297,7 +4340,7 @@ aa
aa
aa
aK
aK
uT
aa
aa
"}
_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm
+17 -3
View File
@@ -340,6 +340,7 @@
/obj/effect/decal/cleanable/shreds{
pixel_y = -10
},
/mob/living/simple_animal/hostile/pirate/ranged,
/turf/simulated/floor/plating/airless,
/area/ruin/space/mech_transport)
"xE" = (
@@ -383,6 +384,10 @@
/obj/effect/decal/remains/human,
/turf/simulated/floor/mineral/plastitanium/red/airless,
/area/ruin/space/mech_transport)
"zM" = (
/mob/living/simple_animal/hostile/pirate,
/turf/simulated/floor/mineral/plastitanium/red/airless,
/area/ruin/space/mech_transport)
"zP" = (
/obj/machinery/computer/nonfunctional{
dir = 8
@@ -524,6 +529,10 @@
pixel_x = -6
},
/obj/item/pen/multi/syndicate,
/obj/item/salvage/ruin/nanotrasen{
pixel_y = 3;
pixel_x = 2
},
/turf/simulated/floor/mineral/plastitanium,
/area/ruin/space/mech_transport)
"MA" = (
@@ -556,6 +565,7 @@
pixel_y = -32;
name = "secure supplies blast door control"
},
/mob/living/simple_animal/hostile/pirate/ranged,
/turf/simulated/floor/mineral/plastitanium,
/area/ruin/space/mech_transport)
"Nq" = (
@@ -713,6 +723,10 @@
},
/turf/simulated/floor/plating/airless,
/area/ruin/space/mech_transport)
"Yq" = (
/mob/living/simple_animal/hostile/pirate,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/mech_transport)
"Zn" = (
/obj/machinery/light_switch{
dir = 4;
@@ -1269,7 +1283,7 @@ MI
vo
rK
bU
bU
Yq
bU
Af
vo
@@ -1333,7 +1347,7 @@ vo
vo
zX
bU
bU
Yq
bU
HK
vo
@@ -1484,7 +1498,7 @@ oo
vo
pJ
VS
VS
zM
VS
aW
aq
_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm
+12 -1
View File
@@ -4441,6 +4441,7 @@
},
/obj/effect/decal/cleanable/cobweb2,
/obj/structure/table,
/obj/item/salvage/ruin/nanotrasen,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "caution"
@@ -4574,6 +4575,15 @@
dir = 8
},
/area/ruin/space/moonbase19)
"oI" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/railing{
dir = 1
},
/obj/structure/table,
/obj/item/salvage/ruin/nanotrasen,
/turf/simulated/floor/plating,
/area/ruin/space/moonbase19)
"oJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/tracks{
@@ -12664,6 +12674,7 @@
/obj/item/taperecorder{
pixel_x = -3
},
/obj/item/salvage/ruin/nanotrasen,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -16449,7 +16460,7 @@ Gg
Gg
tv
lm
Ic
oI
cm
bP
NU
_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
+60 -55
View File
@@ -2421,20 +2421,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/ruin/ancientstation/thetacorridor)
"ge" = (
/obj/structure/table,
/obj/structure/cable{
d2 = 2;
icon_state = "0-2";
pixel_y = 1
},
/obj/machinery/power/apc/off_station/empty_charge/directional/west,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "red"
},
/area/ruin/ancientstation/sec)
"gf" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
@@ -2497,6 +2483,7 @@
/obj/item/stock_parts/capacitor,
/obj/item/stock_parts/micro_laser,
/obj/item/stack/cable_coil,
/obj/item/salvage/ruin/nanotrasen,
/turf/simulated/floor/plasteel,
/area/ruin/ancientstation/rnd)
"gn" = (
@@ -3877,9 +3864,11 @@
/turf/simulated/floor/plating,
/area/ruin/ancientstation)
"jt" = (
/obj/effect/spawner/random_spawners/wall_rusted_always,
/turf/simulated/wall/r_wall,
/area/ruin/ancientstation/proto)
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
/obj/item/salvage/ruin/nanotrasen,
/turf/simulated/floor/plasteel,
/area/ruin/ancientstation/comm)
"ju" = (
/obj/structure/cable{
d1 = 1;
@@ -4141,6 +4130,7 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/obj/item/salvage/ruin/nanotrasen,
/turf/simulated/floor/plasteel/white,
/area/ruin/ancientstation/proto)
"jZ" = (
@@ -4382,8 +4372,8 @@
/turf/simulated/floor/engine,
/area/ruin/ancientstation/atmo)
"kE" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/obj/effect/spawner/random_spawners/wall_rusted_always,
/turf/simulated/wall/indestructible/riveted,
/area/ruin/ancientstation/proto)
"kF" = (
/obj/structure/transit_tube_pod{
@@ -4960,6 +4950,21 @@
/obj/machinery/power/tesla_coil,
/turf/simulated/floor/plating,
/area/ruin/ancientstation/thetacorridor)
"Hr" = (
/obj/structure/table,
/obj/item/salvage/ruin/nanotrasen,
/obj/structure/cable{
d2 = 2;
icon_state = "0-2";
pixel_y = 1
},
/obj/machinery/power/apc/off_station/empty_charge/directional/west,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "red"
},
/area/ruin/ancientstation/sec)
"Lu" = (
/obj/structure/transit_tube/horizontal{
dir = 4
@@ -6583,7 +6588,7 @@ aa
am
aM
aO
aF
jt
at
aS
dt
@@ -7169,7 +7174,7 @@ bC
bC
cG
dg
ge
Hr
eu
fX
eu
@@ -7952,13 +7957,13 @@ dj
dj
iS
jj
jt
jt
jt
jt
jt
jt
jt
kE
kE
kE
kE
kE
kE
kE
aa
aa
aa
@@ -8000,13 +8005,13 @@ ig
dj
ld
lg
jt
kE
jB
jS
jt
kE
kq
ky
jt
kE
aa
aa
aa
@@ -8048,13 +8053,13 @@ ig
dj
iU
jk
jt
kE
jC
jT
jt
kE
jT
jC
jt
kE
aa
aa
aa
@@ -8096,13 +8101,13 @@ ih
dj
iV
ji
jt
kE
jD
jU
ki
jU
jU
jt
kE
aa
aa
aa
@@ -8144,13 +8149,13 @@ gf
dj
ld
lg
jt
kE
cV
jV
jV
jV
kz
jt
kE
aa
aa
aa
@@ -8288,13 +8293,13 @@ dj
dj
iT
fq
jt
kE
cW
jV
jV
jV
kz
jt
kE
aa
aa
aa
@@ -8336,13 +8341,13 @@ ij
dj
lf
lh
jt
kE
jI
jW
kj
jW
jW
jt
kE
aa
aa
aa
@@ -8384,13 +8389,13 @@ ik
dj
iT
fq
jt
kE
jC
jX
jt
kE
jX
jC
jt
kE
aa
aa
aa
@@ -8432,13 +8437,13 @@ il
dj
ld
kS
jt
kE
jJ
jY
jt
kE
kt
kB
jt
kE
aa
aa
aa
@@ -8480,13 +8485,13 @@ dj
dj
iS
jn
jt
jt
jt
jt
jt
jt
jt
kE
kE
kE
kE
kE
kE
kE
aa
aa
aa
_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm
+12 -3
View File
@@ -1224,6 +1224,10 @@
},
/turf/template_noop,
/area/space/nearstation)
"gL" = (
/mob/living/simple_animal/hostile/carp,
/turf/template_noop,
/area/template_noop)
"jQ" = (
/obj/structure/cable{
d2 = 8;
@@ -1239,6 +1243,11 @@
icon_state = "white"
},
/area/ruin/space/onehalf/dorms_med)
"kV" = (
/obj/item/stack/rods,
/mob/living/simple_animal/hostile/carp,
/turf/template_noop,
/area/space/nearstation)
"xr" = (
/obj/structure/cable{
d2 = 8;
@@ -1436,7 +1445,7 @@ bw
bK
ak
aa
cv
kV
aa
aa
aa
@@ -1483,7 +1492,7 @@ aa
cx
aw
aa
aa
gL
cv
dg
aa
@@ -1502,7 +1511,7 @@ bw
bO
aj
aa
aa
gL
cE
cv
cR
_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
+34 -12
View File
@@ -228,9 +228,9 @@
/turf/simulated/floor/plating/asteroid/ancient,
/area/space/nearstation)
"aZ" = (
/obj/item/radio/beacon,
/turf/simulated/floor/plasteel,
/area/ruin/space/powered/bar)
/mob/living/simple_animal/hostile/carp,
/turf/template_noop,
/area/space)
"ba" = (
/obj/machinery/door/airlock/multi_tile/glass{
dir = 1
@@ -492,6 +492,12 @@
icon_state = "dark"
},
/area/ruin/space/powered/bar)
"rC" = (
/mob/living/simple_animal/hostile/pirate,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/ruin/space/powered/bar)
"rN" = (
/obj/machinery/atmospherics/portable/canister/air{
filled = 1
@@ -502,6 +508,7 @@
/obj/structure/chair/stool{
dir = 4
},
/mob/living/simple_animal/hostile/pirate,
/turf/simulated/floor/plasteel,
/area/ruin/space/powered/bar)
"sq" = (
@@ -563,6 +570,10 @@
},
/turf/simulated/floor/plating/asteroid/ancient,
/area/ruin/space/powered)
"wo" = (
/mob/living/simple_animal/hostile/pirate/ranged,
/turf/simulated/floor/wood,
/area/ruin/space/powered/bar)
"wy" = (
/obj/effect/landmark/damageturf,
/obj/structure/holosign/barrier/engineering,
@@ -581,6 +592,12 @@
icon_state = "dark"
},
/area/ruin/space/powered/bar)
"xZ" = (
/obj/item/radio/beacon,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/ruin/space/powered/bar)
"yC" = (
/obj/machinery/economy/vending/cola,
/turf/simulated/floor/plasteel{
@@ -644,6 +661,7 @@
/obj/structure/chair/stool{
dir = 8
},
/mob/living/simple_animal/hostile/pirate,
/turf/simulated/floor/plasteel,
/area/ruin/space/powered/bar)
"Cx" = (
@@ -890,6 +908,10 @@
/obj/structure/falsewall,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/powered/bar)
"Rc" = (
/mob/living/simple_animal/hostile/carp,
/turf/template_noop,
/area/space/nearstation)
"RL" = (
/obj/structure/girder,
/turf/simulated/floor/plating,
@@ -1323,7 +1345,7 @@ ad
ad
ad
ad
ad
aZ
ad
ad
ad
@@ -1480,7 +1502,7 @@ br
br
br
br
ad
aZ
ad
ad
ad
@@ -1530,7 +1552,7 @@ au
bo
br
br
br
Rc
br
ad
ad
@@ -1584,7 +1606,7 @@ br
br
br
br
ad
aZ
ad
ad
ad
@@ -1739,7 +1761,7 @@ ad
ad
ad
ad
ad
aZ
ad
ad
ad
@@ -2184,11 +2206,11 @@ am
aE
as
as
as
wo
aK
ap
aO
aZ
aO
aV
aO
yC
@@ -2351,7 +2373,7 @@ LU
lO
bg
bk
bk
rC
bk
bk
bk
@@ -2506,7 +2528,7 @@ Is
bf
am
bk
bk
xZ
qZ
bk
Ad
_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm
+30 -26
View File
@@ -138,6 +138,10 @@
"sb" = (
/turf/template_noop,
/area/ruin/space/syndicate_druglab/asteroid)
"st" = (
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot,
/turf/simulated/floor/pod/dark,
/area/ruin/space/syndicate_druglab)
"sD" = (
/obj/structure/closet/crate/hydroponics,
/obj/item/queen_bee/bought,
@@ -686,8 +690,8 @@ sb
vZ
xF
vZ
vZ
vZ
yI
yI
vZ
vZ
vZ
@@ -720,9 +724,9 @@ sb
vZ
vZ
vZ
vZ
vZ
vZ
yI
yI
yI
vZ
vZ
xF
@@ -769,10 +773,10 @@ vZ
vZ
vZ
vZ
vZ
vZ
vZ
vZ
yI
yI
yI
yI
vZ
yI
vZ
@@ -803,12 +807,12 @@ Nr
Nr
Nr
vZ
vZ
vZ
vZ
yI
yI
yI
xF
vZ
vZ
yI
yI
yI
yI
sb
@@ -838,12 +842,12 @@ nP
dL
Nr
vZ
vZ
vZ
yI
yI
xF
xF
ue
vZ
yI
vZ
vZ
sb
@@ -873,7 +877,7 @@ tL
os
Nr
Nr
vZ
yI
xF
ue
xF
@@ -908,7 +912,7 @@ os
os
en
Nr
vZ
yI
xF
DG
qf
@@ -943,8 +947,8 @@ os
os
Ue
Nr
vZ
vZ
yI
yI
Gm
ue
xF
@@ -979,7 +983,7 @@ tL
Nr
Nr
vZ
vZ
yI
Wd
vZ
vZ
@@ -1087,7 +1091,7 @@ ym
te
vz
Nr
vZ
yI
xF
xF
xF
@@ -1109,7 +1113,7 @@ vZ
vZ
Nr
BD
os
st
os
gU
SG
@@ -1122,7 +1126,7 @@ gI
gI
Oy
Nr
vZ
yI
xF
QL
xF
@@ -1157,7 +1161,7 @@ gI
gI
Oy
Nr
vZ
yI
xF
xF
xF
_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm
+46 -43
View File
@@ -7237,6 +7237,9 @@
icon_state = "dark"
},
/area/ruin/unpowered/syndicate_space_base/main)
"OT" = (
/turf/simulated/mineral/random/high_chance,
/area/ruin/unpowered/syndicate_space_base/inner)
"OY" = (
/obj/machinery/light{
dir = 1
@@ -13200,7 +13203,7 @@ nv
Kh
Jo
Vl
kE
OT
kE
kE
kE
@@ -13272,8 +13275,8 @@ nv
Vl
Vl
Vl
kE
kE
OT
OT
kE
Ri
Ri
@@ -13343,8 +13346,8 @@ nv
nv
qT
Vl
kE
kE
OT
OT
Ri
kE
kE
@@ -13396,7 +13399,7 @@ LE
AD
Mf
kE
kE
OT
kE
Vl
Vl
@@ -13416,7 +13419,7 @@ nv
Vl
Vl
kE
kE
OT
kE
kE
kE
@@ -13468,7 +13471,7 @@ AD
kE
AD
kE
kE
OT
kE
kE
Vl
@@ -13489,7 +13492,7 @@ Vl
kE
kE
kE
kE
OT
kE
Ri
Ri
@@ -13612,7 +13615,7 @@ kE
AD
kE
kE
kE
OT
kE
kE
kE
@@ -13632,7 +13635,7 @@ Vl
kE
kE
kE
kE
OT
kE
Ri
Ri
@@ -13684,7 +13687,7 @@ kE
AD
Vs
kE
kE
OT
kE
kE
kE
@@ -13702,9 +13705,9 @@ Vl
Vl
kE
kE
OT
kE
kE
kE
OT
Ri
Ri
Ri
@@ -13756,11 +13759,11 @@ kE
kE
kE
kE
OT
OT
kE
kE
kE
kE
kE
OT
OT
kE
kE
Vl
@@ -13771,13 +13774,13 @@ Vl
Vl
Vl
kE
OT
kE
OT
kE
kE
kE
kE
kE
kE
kE
OT
OT
Ri
Ri
AV
@@ -13827,13 +13830,13 @@ kE
kE
kE
kE
OT
OT
OT
OT
kE
kE
kE
kE
kE
kE
kE
OT
OT
kE
kE
kE
@@ -13842,14 +13845,14 @@ Vl
Vl
kE
kE
OT
OT
kE
kE
kE
kE
kE
kE
kE
kE
OT
OT
OT
Ri
Ri
Ri
@@ -13899,6 +13902,8 @@ Ri
Ri
kE
Ri
OT
OT
kE
kE
kE
@@ -13910,15 +13915,13 @@ kE
kE
kE
kE
OT
OT
kE
kE
kE
kE
kE
kE
kE
kE
kE
OT
Ri
Ri
Ri
@@ -13979,9 +13982,9 @@ kE
kE
Ri
kE
kE
kE
kE
OT
OT
OT
kE
kE
kE
@@ -13990,7 +13993,7 @@ kE
kE
Ri
kE
kE
OT
Ri
Ri
Ri
_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm
+1 -1
View File
@@ -640,7 +640,7 @@
/area/ruin/space/unpowered)
"xW" = (
/obj/structure/rack,
/obj/item/clothing/under/syndicate,
/obj/item/clothing/under/syndicate/silicon_cham,
/turf/simulated/floor/engine,
/area/ruin/space/unpowered)
"yU" = (
_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm
+70 -67
View File
@@ -1168,6 +1168,9 @@
},
/turf/simulated/wall/mineral/plastitanium/nodiagonal,
/area/syndicate_depot/core)
"Te" = (
/turf/simulated/mineral/random/high_chance,
/area/syndicate_depot/outer)
(1,1,1) = {"
aa
@@ -1500,8 +1503,8 @@ ad
ad
ad
ad
ad
ad
Te
Te
ad
ad
ad
@@ -1542,7 +1545,7 @@ ac
ac
ad
ad
ad
Te
ad
af
af
@@ -1552,9 +1555,9 @@ ad
ad
ad
af
ad
ad
ad
Te
Te
Te
ad
ad
ad
@@ -1592,7 +1595,7 @@ ac
ac
ad
ad
ad
Te
af
am
aU
@@ -1643,7 +1646,7 @@ ac
ad
ad
ad
ad
Te
af
af
aV
@@ -1972,8 +1975,8 @@ cM
am
dc
af
ad
ad
Te
Te
ad
ac
ac
@@ -2023,8 +2026,8 @@ af
af
af
af
ad
ad
Te
Te
ad
ad
ac
@@ -2075,7 +2078,7 @@ af
af
af
af
ad
Te
ad
ad
ad
@@ -2126,7 +2129,7 @@ af
af
ap
af
ad
Te
ad
ad
ac
@@ -2303,7 +2306,7 @@ ad
ad
ad
ad
ad
Te
ad
ad
ad
@@ -2355,8 +2358,8 @@ ad
ad
am
af
ad
ad
Te
Te
ad
at
aQ
@@ -2401,12 +2404,12 @@ ac
ac
ac
ad
ad
ad
Te
Te
ad
an
af
ad
Te
ad
ad
at
@@ -2453,7 +2456,7 @@ ac
ad
ad
ac
ad
Te
ad
af
ap
@@ -2498,13 +2501,13 @@ aa
(27,1,1) = {"
ab
ac
ad
Te
ac
ac
ac
ac
ac
ad
Te
ad
af
af
@@ -2537,7 +2540,7 @@ af
af
af
ad
ad
Te
ad
ac
ac
@@ -2587,8 +2590,8 @@ at
af
ap
af
ad
ad
Te
Te
ad
ac
ac
@@ -2755,7 +2758,7 @@ aa
ac
ac
ac
ad
Te
ac
ac
ac
@@ -2842,7 +2845,7 @@ aD
at
af
af
ad
Te
ad
ad
ad
@@ -2893,7 +2896,7 @@ bv
at
af
af
ad
Te
ad
ac
ad
@@ -2944,7 +2947,7 @@ at
at
cM
af
ad
Te
ad
ac
ac
@@ -3221,7 +3224,7 @@ ad
ad
ad
ad
ad
Te
ad
ad
ad
@@ -3241,9 +3244,9 @@ ad
ad
ad
ad
ad
ad
ad
Te
Te
Te
ad
ad
ad
@@ -3269,10 +3272,10 @@ ac
ad
ad
ad
Te
ad
ad
ad
ad
Te
ad
ad
ad
@@ -3291,8 +3294,8 @@ ad
ad
bf
bf
ad
ad
Te
Te
ad
ad
ad
@@ -3320,10 +3323,10 @@ ad
ad
ad
ad
Te
Te
ad
ad
ad
ad
Te
ad
ad
ad
@@ -3371,13 +3374,13 @@ ac
ad
ad
ad
Te
Te
Te
Te
ad
ad
ad
ad
ad
ad
ad
Te
ad
ad
ad
@@ -3421,17 +3424,17 @@ ac
ad
ad
ad
Te
Te
Te
Te
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
Te
Te
Te
Te
Te
ad
bf
bm
@@ -3472,16 +3475,16 @@ ad
ad
ad
ad
Te
Te
Te
ad
ad
ad
ad
ad
ad
ad
ad
ad
ad
Te
Te
Te
Te
ad
ad
bf
@@ -3524,13 +3527,13 @@ ad
ad
ad
ad
Te
ad
ad
ad
ad
ad
ad
ad
Te
Te
Te
ad
ad
ad
@@ -3580,7 +3583,7 @@ ad
ad
ad
ad
ad
Te
ad
ad
ad
_maps/map_files/RandomRuins/SpaceRuins/turretedoutpost.dmm
+3 -1
View File
@@ -57,10 +57,11 @@
/obj/structure/chair{
dir = 8
},
/mob/living/simple_animal/hostile/syndicate/melee/autogib,
/turf/simulated/floor/plasteel,
/area/ruin/space/unpowered)
"o" = (
/obj/machinery/porta_turret,
/obj/machinery/porta_turret/syndicate/exterior,
/turf/simulated/floor/plating/airless,
/area/ruin/space/unpowered)
"p" = (
@@ -131,6 +132,7 @@
/obj/structure/reagent_dispensers/peppertank{
pixel_y = 32
},
/obj/item/salvage/loot/syndicate,
/turf/simulated/floor/plasteel,
/area/ruin/space/unpowered)
"B" = (
_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
+61 -14
View File
@@ -279,6 +279,7 @@
/obj/structure/chair/comfy/red{
dir = 1
},
/mob/living/simple_animal/hostile/russian/ranged/mosin,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/bridge)
"aN" = (
@@ -736,9 +737,8 @@
},
/area/ruin/space/derelict/arrival)
"bU" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/cleanable/dirt,
/obj/item/salvage/ruin/russian,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkred"
@@ -894,8 +894,7 @@
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/arrival)
"cp" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/obj/item/salvage/ruin/russian,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkred"
@@ -2337,6 +2336,7 @@
desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
name = "Human remains"
},
/mob/living/simple_animal/hostile/russian/ranged/mosin,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/arrival)
"fF" = (
@@ -3111,6 +3111,7 @@
/area/ruin/space/derelict/hallway/primary)
"hC" = (
/obj/structure/chair/stool,
/mob/living/simple_animal/hostile/russian,
/turf/simulated/floor/plasteel,
/area/ruin/space/derelict/hallway/primary)
"hD" = (
@@ -4192,7 +4193,7 @@
/turf/simulated/floor/engine/vacuum,
/area/ruin/space/derelict/hallway/primary)
"ko" = (
/obj/item/stack/ore/iron,
/obj/item/stack/ore/uranium,
/turf/simulated/floor/plating/airless,
/area/ruin/space/derelict/hallway/primary)
"kp" = (
@@ -4382,6 +4383,7 @@
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/hostile/russian,
/turf/simulated/floor/wood,
/area/ruin/space/derelict/crew_quarters)
"kF" = (
@@ -7549,6 +7551,20 @@
},
/turf/simulated/wall/mineral/titanium/nodecon/nodiagonal,
/area/ruin/space/derelict/arrival)
"vm" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/flag/ussp,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "red"
},
/area/ruin/space/derelict/arrival)
"Ci" = (
/mob/living/simple_animal/hostile/pirate/ranged,
/turf/simulated/floor/plasteel/airless{
icon_state = "white"
},
/area/ruin/space/derelict/arrival)
"Ef" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/barsign{
@@ -7575,9 +7591,22 @@
},
/turf/simulated/wall/mineral/titanium/nodecon/nodiagonal,
/area/ruin/space/derelict/crew_quarters)
"PR" = (
/mob/living/simple_animal/hostile/pirate,
/turf/simulated/floor/plasteel/airless{
icon_state = "white"
},
/area/ruin/space/derelict/arrival)
"QN" = (
/turf/simulated/wall/mineral/titanium/nodecon/nosmooth,
/area/ruin/space/derelict/arrival)
"Sv" = (
/obj/item/flag/ussp,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "red"
},
/area/ruin/space/derelict/arrival)
"Ud" = (
/obj/effect/spawner/airlock{
req_access_txt = 0
@@ -7595,6 +7624,24 @@
icon_state = "wood-broken"
},
/area/ruin/space/derelict/crew_quarters)
"XQ" = (
/obj/structure/chair/wood{
dir = 4
},
/mob/living/simple_animal/hostile/russian,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/crew_quarters)
"Yi" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/mob/living/simple_animal/hostile/pirate/ranged,
/turf/simulated/floor/plasteel/airless{
icon_state = "white"
},
/area/ruin/space/derelict/arrival)
(1,1,1) = {"
ac
@@ -8664,7 +8711,7 @@ mS
nk
mU
nG
mS
PR
mS
oF
oS
@@ -8754,7 +8801,7 @@ iy
mJ
mT
mT
mT
Yi
nH
mS
nG
@@ -9685,7 +9732,7 @@ ac
aW
aW
pI
mS
Ci
mS
nl
oF
@@ -9780,7 +9827,7 @@ pJ
pS
qa
mS
mS
Ci
qC
mU
qY
@@ -10978,7 +11025,7 @@ ac
ac
aW
sv
qt
Sv
ka
rq
rq
@@ -11316,7 +11363,7 @@ eg
ac
ac
ac
ih
hq
ii
ii
ii
@@ -11346,7 +11393,7 @@ ac
ac
aW
bn
qv
vm
hY
ru
ru
@@ -13528,9 +13575,9 @@ Ef
in
iK
je
je
XQ
kC
je
XQ
je
lX
ms
_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm
+24 -7
View File
@@ -170,6 +170,23 @@
icon_state = "floorgrime"
},
/area/ruin/space/derelict/teleporter)
"I" = (
/mob/living/simple_animal/hostile/carp,
/turf/template_noop,
/area/template_noop)
"M" = (
/mob/living/simple_animal/hostile/carp/megacarp,
/turf/template_noop,
/area/template_noop)
"R" = (
/obj/item/salvage/ruin/russian,
/turf/simulated/floor/plating/airless,
/area/ruin/space/derelict/teleporter)
"U" = (
/obj/structure/lattice,
/mob/living/simple_animal/hostile/carp,
/turf/template_noop,
/area/space/nearstation)
(1,1,1) = {"
a
@@ -242,7 +259,7 @@ g
a
"}
(6,1,1) = {"
a
I
a
a
a
@@ -266,17 +283,17 @@ l
m
m
y
f
R
g
"}
(8,1,1) = {"
a
a
M
a
b
f
h
f
R
m
r
f
@@ -369,7 +386,7 @@ a
"}
(15,1,1) = {"
a
a
I
a
b
b
@@ -426,7 +443,7 @@ a
(19,1,1) = {"
a
b
b
U
b
b
b
@@ -449,7 +466,7 @@ a
a
a
a
a
I
"}
(21,1,1) = {"
a
_maps/map_files/RandomRuins/SpaceRuins/voyager.dmm
+5 -1
View File
@@ -16,6 +16,10 @@
},
/turf/template_noop,
/area/template_noop)
"k" = (
/mob/living/simple_animal/hostile/carp,
/turf/template_noop,
/area/template_noop)
"q" = (
/obj/structure/safe/floor,
/obj/item/golden_record,
@@ -42,7 +46,7 @@ c
S
S
S
S
k
"}
(2,1,1) = {"
S
_maps/map_files/RandomRuins/SpaceRuins/way_home.dmm
+75 -49
View File
@@ -14,6 +14,32 @@
},
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered/no_grav/way_home)
"g" = (
/obj/structure/spawner/mining/hivelord,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered/no_grav/way_home)
"n" = (
/turf/simulated/mineral/random/high_chance/clown,
/area/ruin/space/unpowered/no_grav/way_home)
"s" = (
/mob/living/simple_animal/hostile/carp/megacarp,
/turf/template_noop,
/area/template_noop)
"z" = (
/obj/structure/spawner/mining/basilisk,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered/no_grav/way_home)
"O" = (
/obj/item/salvage/ruin/tablet,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered/no_grav/way_home)
"P" = (
/mob/living/simple_animal/hostile/carp,
/turf/template_noop,
/area/template_noop)
"R" = (
/turf/simulated/mineral/random/high_chance,
/area/ruin/space/unpowered/no_grav/way_home)
(1,1,1) = {"
a
@@ -75,7 +101,7 @@ a
a
a
a
a
P
a
a
"}
@@ -104,8 +130,8 @@ a
a
a
a
b
b
R
R
a
a
a
@@ -136,9 +162,9 @@ a
a
a
a
b
b
b
R
R
R
a
a
a
@@ -169,10 +195,10 @@ a
a
a
a
b
a
R
a
a
P
a
"}
(6,1,1) = {"
@@ -234,7 +260,7 @@ a
a
a
a
a
P
a
a
a
@@ -252,7 +278,7 @@ a
a
b
b
b
R
b
b
b
@@ -282,10 +308,10 @@ a
a
a
b
b
b
b
b
R
R
R
R
b
b
a
@@ -315,13 +341,13 @@ b
b
b
b
b
b
R
R
b
b
a
a
a
P
a
a
a
@@ -348,7 +374,7 @@ b
b
b
b
b
R
b
c
a
@@ -356,7 +382,7 @@ a
a
a
a
a
s
a
a
a
@@ -376,8 +402,8 @@ b
b
b
b
b
b
R
R
b
b
b
@@ -407,8 +433,8 @@ a
b
b
b
b
b
R
R
b
b
b
@@ -423,7 +449,7 @@ a
a
a
a
a
P
a
a
a
@@ -438,15 +464,15 @@ a
b
b
b
b
b
R
R
b
b
b
b
b
c
c
g
c
c
c
@@ -469,10 +495,10 @@ a
b
b
b
R
R
b
b
b
b
R
b
b
c
@@ -507,7 +533,7 @@ b
b
b
c
c
O
c
a
a
@@ -546,7 +572,7 @@ a
a
c
c
c
O
c
c
c
@@ -583,7 +609,7 @@ c
b
b
b
b
n
b
b
a
@@ -612,11 +638,11 @@ a
a
c
c
c
b
b
b
z
b
R
n
n
b
a
a
@@ -647,8 +673,8 @@ c
c
c
b
b
b
n
n
b
b
a
@@ -680,8 +706,8 @@ a
c
b
b
b
b
n
n
b
a
a
@@ -777,8 +803,8 @@ a
a
a
a
b
b
R
R
a
a
a
@@ -817,7 +843,7 @@ a
"}
(26,1,1) = {"
a
a
P
a
a
a
@@ -850,7 +876,7 @@ a
(27,1,1) = {"
a
a
a
P
a
a
a
@@ -882,7 +908,7 @@ a
(28,1,1) = {"
a
a
a
P
a
a
a
@@ -913,8 +939,8 @@ a
"}
(29,1,1) = {"
a
a
a
P
P
a
a
a
@@ -944,7 +970,7 @@ a
a
"}
(30,1,1) = {"
a
s
a
a
a
_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm
+17 -4
View File
@@ -121,7 +121,7 @@
/area/shuttle/abandoned)
"qK" = (
/obj/structure/table/reinforced,
/obj/item/gun/energy/laser/retro,
/obj/item/whiteship_port_generator,
/turf/simulated/floor/mineral/plastitanium,
/area/shuttle/abandoned)
"ri" = (
@@ -214,6 +214,13 @@
},
/turf/simulated/floor/plating,
/area/shuttle/abandoned)
"xz" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/mob/living/simple_animal/hostile/pirate,
/turf/simulated/floor/mineral/plastitanium,
/area/shuttle/abandoned)
"ys" = (
/obj/structure/table,
/obj/item/storage/box/lights/mixed,
@@ -269,6 +276,7 @@
/obj/machinery/light/small{
dir = 4
},
/obj/item/salvage/ruin/pirate,
/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"Ct" = (
@@ -400,6 +408,11 @@
},
/turf/simulated/floor/mineral/plastitanium,
/area/shuttle/abandoned)
"YH" = (
/obj/structure/table/wood/poker,
/obj/item/gun/energy/laser/retro,
/turf/simulated/floor/wood,
/area/shuttle/abandoned)
(1,1,1) = {"
zM
@@ -435,8 +448,8 @@ zM
zM
zO
Gs
SS
SS
xz
xz
qK
zO
zM
@@ -545,7 +558,7 @@ zO
zO
Pe
sK
sK
YH
zO
vB
vB
_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm
+16 -9
View File
@@ -165,13 +165,6 @@
/obj/item/book/manual/hydroponics_pod_people,
/turf/simulated/floor/wood,
/area/ruin/space/unpowered)
"aF" = (
/obj/structure/table/wood,
/obj/item/blank_tarot_card,
/turf/simulated/floor/wood{
icon_state = "wood-broken6"
},
/area/ruin/space/unpowered)
"aG" = (
/obj/structure/table/wood,
/obj/item/candle/eternal,
@@ -220,8 +213,15 @@
/turf/simulated/floor/wood,
/area/ruin/space/unpowered)
"aO" = (
/obj/item/storage/bag/books,
/obj/item/storage/bag/books{
pixel_y = 4;
pixel_x = 1
},
/obj/structure/table/wood,
/obj/item/salvage/ruin/tablet{
pixel_x = -5;
pixel_y = 4
},
/turf/simulated/floor/wood,
/area/ruin/space/unpowered)
"aP" = (
@@ -510,6 +510,13 @@
/obj/structure/table,
/turf/simulated/floor/plating,
/area/ruin/space/unpowered)
"YM" = (
/obj/structure/table/wood,
/obj/item/blank_tarot_card,
/turf/simulated/floor/wood{
icon_state = "wood-broken6"
},
/area/ruin/space/unpowered)
(1,1,1) = {"
aa
@@ -748,7 +755,7 @@ ah
an
av
aC
aF
YM
aC
aO
aC
_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm
+19 -2
View File
@@ -146,6 +146,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/mob/living/simple_animal/hostile/pirate/ranged,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -182,6 +183,7 @@
/obj/structure/chair/comfy/corp{
dir = 8
},
/mob/living/simple_animal/hostile/pirate,
/turf/simulated/floor/plasteel,
/area/ruin/space/wreck_cargoship)
"hO" = (
@@ -466,6 +468,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
/mob/living/simple_animal/parrot,
/turf/simulated/floor/plasteel{
icon_state = "titanium";
dir = 4
@@ -593,6 +596,7 @@
},
/area/ruin/space/wreck_cargoship)
"vq" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "black"
@@ -908,6 +912,7 @@
/area/ruin/space/wreck_cargoship)
"Ll" = (
/obj/effect/decal/cleanable/blood/old,
/obj/item/salvage/ruin/pirate,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "black"
@@ -1054,6 +1059,14 @@
icon_state = "black"
},
/area/ruin/space/wreck_cargoship)
"RM" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/hostile/pirate,
/turf/simulated/floor/plasteel{
icon_state = "titanium";
dir = 4
},
/area/ruin/space/wreck_cargoship)
"RZ" = (
/obj/structure/rack,
/mob/living/simple_animal/bot/secbot/griefsky/toy,
@@ -1185,6 +1198,10 @@
icon_state = "caution"
},
/area/ruin/space/wreck_cargoship)
"Vo" = (
/mob/living/simple_animal/hostile/pirate/ranged,
/turf/simulated/floor/plating,
/area/ruin/space/wreck_cargoship)
"Vs" = (
/turf/simulated/floor/plating,
/area/ruin/space/wreck_cargoship)
@@ -1503,7 +1520,7 @@ ea
qg
gE
Yz
Vs
Vo
Sj
gE
qg
@@ -1735,7 +1752,7 @@ NI
NM
cT
NM
NM
RM
qY
NM
xX
_maps/map_files/generic/centcomm.dmm
+5 -5
View File
@@ -6851,7 +6851,7 @@
/area/admin)
"xf" = (
/obj/machinery/computer/security{
network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome")
network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome")
},
/turf/simulated/floor/plasteel,
/area/admin)
@@ -9095,7 +9095,7 @@
"Gs" = (
/obj/machinery/computer/security{
dir = 4;
network = list("SS13","Telecomms","Research Outpost","Mining Outpost")
network = list("SS13","Telecomms","Research Outpost","Mining Outpost")
},
/obj/structure/sign/poster/official/nanotrasen_logo{
pixel_x = -32
@@ -10217,7 +10217,7 @@
"Kd" = (
/obj/machinery/computer/security{
dir = 1;
network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome")
network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome")
},
/turf/simulated/floor/plasteel/dark,
/area/centcom/control)
@@ -10492,7 +10492,7 @@
"Lb" = (
/obj/machinery/computer/security{
dir = 1;
network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome")
network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome")
},
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/specops)
@@ -14305,7 +14305,7 @@
"Yu" = (
/obj/machinery/computer/security{
dir = 1;
network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome")
network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome")
},
/turf/simulated/floor/wood,
/area/centcom/control)
_maps/map_files/stations/boxstation.dmm
+772 -721
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/stations/cerestation.dmm
+560 -680
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/stations/deltastation.dmm
+260 -361
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/stations/metastation.dmm
+242 -375
View File
@@ -7362,11 +7362,6 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/fore/north)
"aKI" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/se)
@@ -22460,6 +22455,7 @@
},
/obj/item/folder/blue,
/obj/item/pen/multi,
/obj/item/hand_tele,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -25003,11 +24999,6 @@
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -25751,6 +25742,11 @@
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -25898,7 +25894,7 @@
/area/station/engineering/controlroom)
"bNh" = (
/turf/simulated/wall/r_wall,
/area/station/service/expedition)
/area/station/supply/expedition)
"bNi" = (
/turf/simulated/wall,
/area/station/public/storage/emergency/port)
@@ -25908,11 +25904,12 @@
},
/area/station/medical/reception)
"bNl" = (
/obj/machinery/economy/vending/coffee,
/obj/structure/closet/secure_closet/explorer,
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
dir = 6;
icon_state = "darkyellow"
},
/area/station/hallway/secondary/bridge)
/area/station/supply/expedition)
"bNm" = (
/obj/machinery/status_display{
layer = 4;
@@ -25933,17 +25930,6 @@
icon_state = "arrival"
},
/area/station/hallway/secondary/entry/south)
"bNo" = (
/obj/machinery/door/airlock/maintenance,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/mapping_helpers/airlock/autoname,
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/maintcentral)
"bNp" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -26048,23 +26034,12 @@
/turf/simulated/floor/carpet,
/area/station/command/bridge)
"bNU" = (
/obj/machinery/door_control{
id = "gateshutter";
name = "Expedition Shutter Control";
pixel_y = -26;
req_access_txt = "62"
},
/obj/machinery/firealarm{
dir = 8;
name = "west bump";
pixel_x = -24
},
/obj/machinery/recharge_station,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkblue"
dir = 10;
icon_state = "darkyellow"
},
/area/station/service/expedition)
/area/station/supply/expedition)
"bNX" = (
/obj/structure/window/reinforced{
dir = 4
@@ -26392,16 +26367,22 @@
/turf/simulated/floor/plating,
/area/station/security/permabrig)
"bOY" = (
/obj/machinery/newscaster{
dir = 1;
name = "south bump";
pixel_y = -28
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/access/any/supply/expedition,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/airlock/mining{
name = "Expedition Headquarters"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/economy/vending/cigarette,
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
icon_state = "darkyellowfull"
},
/area/station/hallway/secondary/bridge)
/area/station/supply/expedition)
"bOZ" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -26542,7 +26523,6 @@
icon_state = "2-8"
},
/obj/item/radio/beacon,
/obj/item/hand_tele,
/turf/simulated/floor/plasteel,
/area/station/command/teleporter)
"bPB" = (
@@ -26701,10 +26681,6 @@
/turf/simulated/floor/plasteel,
/area/station/science/xenobiology)
"bQm" = (
/obj/structure/table,
/obj/machinery/recharger{
pixel_y = 4
},
/obj/item/radio/intercom{
name = "west bump";
pixel_x = -28
@@ -26712,11 +26688,12 @@
/obj/machinery/camera{
c_tag = "Expedition"
},
/obj/machinery/mineral/equipment_vendor/explorer,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "darkblue"
icon_state = "darkyellow"
},
/area/station/service/expedition)
/area/station/supply/expedition)
"bQn" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/wood,
@@ -26755,11 +26732,16 @@
/turf/simulated/floor/engine/vacuum,
/area/station/maintenance/turbine)
"bQB" = (
/obj/structure/closet/secure_closet/personal,
/turf/simulated/floor/plasteel{
icon_state = "dark"
/obj/machinery/firealarm{
dir = 8;
name = "west bump";
pixel_x = -24
},
/area/station/service/expedition)
/turf/simulated/floor/plasteel{
icon_state = "darkyellow";
dir = 8
},
/area/station/supply/expedition)
"bQC" = (
/obj/structure/table,
/obj/machinery/kitchen_machine/microwave,
@@ -26773,13 +26755,11 @@
},
/area/station/service/kitchen)
"bQD" = (
/obj/structure/table,
/obj/item/storage/firstaid/regular,
/obj/item/storage/firstaid/regular,
/turf/simulated/floor/plasteel{
icon_state = "dark"
icon_state = "darkyellow";
dir = 1
},
/area/station/service/expedition)
/area/station/supply/expedition)
"bQF" = (
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
@@ -27133,15 +27113,12 @@
},
/area/station/hallway/primary/central/west)
"bRP" = (
/obj/machinery/status_display{
layer = 4;
pixel_y = 32
},
/obj/effect/landmark/start/explorer,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/station/service/expedition)
/area/station/supply/expedition)
"bRQ" = (
/obj/machinery/atmospherics/portable/canister/oxygen,
/obj/effect/turf_decal/stripes/line{
@@ -27273,40 +27250,23 @@
/turf/simulated/floor/engine/vacuum,
/area/station/maintenance/turbine)
"bSo" = (
/obj/structure/table,
/obj/item/radio{
pixel_x = 7;
pixel_y = 4
},
/obj/item/radio{
pixel_x = 7;
pixel_y = 4
},
/obj/item/radio{
pixel_x = 7;
pixel_y = 4
},
/obj/item/radio{
pixel_x = 7;
pixel_y = 4
},
/obj/machinery/requests_console{
department = "Expedition";
pixel_x = 30
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/station/service/expedition)
/area/station/supply/expedition)
"bSp" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
/obj/machinery/camera{
c_tag = "Research Test Lab North";
dir = 8;
network = list("RD","SS13");
pixel_y = -22
},
/obj/effect/landmark/spawner/nukedisc_respawn,
/turf/simulated/floor/plating,
/area/station/maintenance/maintcentral)
/obj/machinery/suit_storage_unit/expedition,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkyellow"
},
/area/station/supply/expedition)
"bSr" = (
/obj/machinery/light,
/obj/structure/extinguisher_cabinet{
@@ -27813,36 +27773,25 @@
/turf/simulated/floor/carpet/royalblack,
/area/station/command/office/ntrep)
"bTS" = (
/obj/machinery/light{
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = -32
},
/obj/structure/weightmachine/weightlifter,
/obj/effect/landmark/start/explorer,
/turf/simulated/floor/plasteel{
icon_state = "darkyellow";
dir = 8
},
/obj/structure/closet/secure_closet/personal,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/station/service/expedition)
/area/station/supply/expedition)
"bTU" = (
/obj/machinery/light{
dir = 4
/obj/effect/spawner/random_spawners/dirt_maybe,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
/obj/structure/table,
/obj/item/pickaxe,
/obj/item/pickaxe,
/obj/item/pickaxe,
/obj/item/pickaxe,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/station/service/expedition)
"bTV" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/landmark/burnturf,
/turf/simulated/floor/plating,
/area/station/maintenance/maintcentral)
/area/station/supply/expedition)
"bTW" = (
/obj/item/radio/intercom{
name = "west bump";
@@ -28669,65 +28618,40 @@
/turf/simulated/floor/wood,
/area/station/command/office/blueshield)
"bWV" = (
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
},
/obj/machinery/power/apc/directional/west,
/obj/structure/table,
/obj/item/storage/fancy/donut_box,
/obj/item/storage/fancy/donut_box,
/obj/structure/dispenser/oxygen,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkblue"
icon_state = "darkyellow";
dir = 8
},
/area/station/service/expedition)
/area/station/supply/expedition)
"bWW" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/landmark/start/explorer,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/station/service/expedition)
/area/station/supply/expedition)
"bWX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/hologram/holopad,
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/station/service/expedition)
"bWY" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
/obj/machinery/light{
dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "darkyellow";
dir = 8
},
/area/station/supply/expedition)
"bWY" = (
/obj/machinery/suit_storage_unit/expedition,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "darkyellow"
},
/area/station/supply/expedition)
"bWZ" = (
/obj/effect/spawner/random_spawners/dirt_maybe,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/station/service/expedition)
"bWZ" = (
/obj/machinery/door/airlock/maintenance{
name = "Expedition Maintenance"
},
/obj/effect/mapping_helpers/airlock/autoname,
/obj/effect/mapping_helpers/airlock/access/all/command/expedition,
/turf/simulated/floor/plating,
/area/station/maintenance/maintcentral)
/area/station/supply/expedition)
"bXb" = (
/obj/machinery/plantgenes,
/obj/effect/turf_decal/stripes/line,
@@ -29184,16 +29108,16 @@
/turf/simulated/floor/carpet/royalblack,
/area/station/command/office/ntrep)
"bYp" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/turf_decal/stripes/line{
/obj/machinery/requests_console{
department = "Expedition";
pixel_x = 30;
dir = 8
},
/turf/simulated/floor/plating,
/area/station/maintenance/maintcentral)
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkyellow"
},
/area/station/supply/expedition)
"bYq" = (
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -29471,32 +29395,22 @@
},
/area/station/maintenance/asmaint)
"bZz" = (
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/station/service/expedition)
"bZD" = (
/obj/machinery/light_switch{
dir = 8;
name = "east bump";
pixel_x = 24
},
/obj/effect/spawner/random_spawners/dirt_maybe,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
/obj/effect/landmark/start/explorer,
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
dir = 5
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/station/service/expedition)
/area/station/supply/expedition)
"bZD" = (
/obj/machinery/light,
/obj/structure/closet/secure_closet/explorer,
/turf/simulated/floor/plasteel{
icon_state = "darkyellow"
},
/area/station/supply/expedition)
"bZH" = (
/obj/structure/bookcase,
/turf/simulated/floor/wood,
@@ -29533,23 +29447,8 @@
/turf/simulated/floor/wood,
/area/station/service/library)
"bZX" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
name = "Expedition Access"
},
/obj/effect/mapping_helpers/airlock/access/all/command/expedition,
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/station/service/expedition)
/turf/simulated/wall,
/area/station/supply/expedition)
"bZZ" = (
/obj/structure/chair/office/dark{
dir = 4
@@ -29918,19 +29817,25 @@
/turf/simulated/floor/plasteel/dark/telecomms,
/area/station/science/server/coldroom)
"cbi" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/stripes/corner{
dir = 4
/obj/machinery/light_switch{
name = "custom placement";
pixel_x = 6;
pixel_y = 24
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/south)
/obj/machinery/power/apc/directional/west,
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
},
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "darkyellow"
},
/area/station/supply/expedition)
"cbj" = (
/obj/structure/sign/securearea{
pixel_y = 32
},
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/se)
"cbl" = (
@@ -30241,24 +30146,24 @@
/turf/simulated/floor/engine/co2,
/area/station/engineering/atmos)
"ccl" = (
/obj/structure/closet/secure_closet/personal,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkblue"
icon_state = "darkyellowcorners"
},
/area/station/service/expedition)
/area/station/supply/expedition)
"ccm" = (
/obj/machinery/alarm/directional/east,
/obj/structure/table,
/obj/item/flashlight,
/obj/item/flashlight,
/obj/item/flashlight,
/obj/item/flashlight,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkblue"
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/area/station/service/expedition)
/turf/simulated/floor/plasteel{
icon_state = "darkyellow";
dir = 1
},
/area/station/supply/expedition)
"ccn" = (
/obj/structure/cable{
d1 = 4;
@@ -30562,12 +30467,14 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
"cdB" = (
/obj/effect/landmark/start/explorer,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkblue"
/obj/effect/spawner/random_spawners/dirt_maybe,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
/area/station/service/expedition)
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/station/supply/expedition)
"cdC" = (
/obj/structure/sign/poster/official/ian,
/turf/simulated/wall,
@@ -31699,6 +31606,28 @@
/obj/effect/spawner/window,
/turf/simulated/floor/plating,
/area/station/medical/reception)
"chF" = (
/obj/structure/table,
/obj/item/radio{
pixel_x = 7;
pixel_y = 4
},
/obj/item/radio{
pixel_y = 4;
pixel_x = -2
},
/obj/item/radio{
pixel_x = -7;
pixel_y = 4
},
/obj/item/radio{
pixel_x = 4;
pixel_y = 4
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/station/supply/expedition)
"chH" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -38909,17 +38838,12 @@
},
/area/station/medical/paramedic)
"cJT" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
/obj/machinery/suit_storage_unit/expedition,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkyellow"
},
/obj/effect/spawner/lootdrop{
loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
name = "trash spawner"
},
/turf/simulated/floor/plating,
/area/station/maintenance/maintcentral)
/area/station/supply/expedition)
"cJU" = (
/obj/structure/sign/poster/contraband/random{
pixel_x = 32
@@ -39564,11 +39488,6 @@
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -40385,16 +40304,6 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"cPD" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/se)
"cPF" = (
@@ -50876,12 +50785,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"fXz" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/se)
"fYb" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 10
@@ -57988,17 +57891,11 @@
/turf/simulated/floor/plasteel,
/area/station/security/processing)
"iSE" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/shutters{
dir = 2;
id_tag = "gateshutter";
name = "Expedition Access Shutter"
},
/obj/effect/turf_decal/caution/stand_clear,
/obj/structure/closet/secure_closet/explorer,
/turf/simulated/floor/plasteel{
icon_state = "dark"
icon_state = "darkyellow"
},
/area/station/service/expedition)
/area/station/supply/expedition)
"iSH" = (
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 5
@@ -75855,11 +75752,10 @@
/turf/simulated/floor/plating,
/area/station/hallway/primary/fore/east)
"qrT" = (
/obj/effect/landmark/start/explorer,
/turf/simulated/floor/plasteel{
icon_state = "dark"
icon_state = "darkyellow"
},
/area/station/service/expedition)
/area/station/supply/expedition)
"qse" = (
/obj/machinery/hologram/holopad,
/obj/effect/turf_decal/delivery/blue/hollow,
@@ -78992,21 +78888,20 @@
/area/station/medical/morgue)
"rFL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
/obj/structure/disposalpipe/segment/corner{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/light_switch{
dir = 8;
name = "east bump";
pixel_x = 24
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/wood,
/area/station/command/office/ntrep)
"rGd" = (
@@ -84140,21 +84035,12 @@
},
/area/station/medical/surgery/secondary)
"tST" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/structure/closet/secure_closet/explorer,
/obj/machinery/alarm/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "dark"
icon_state = "darkyellow"
},
/area/station/service/expedition)
/area/station/supply/expedition)
"tSX" = (
/obj/machinery/photocopier,
/obj/machinery/newscaster/security_unit{
@@ -84929,20 +84815,12 @@
},
/area/station/service/bar)
"uhY" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
/obj/effect/landmark/start/explorer,
/turf/simulated/floor/plasteel{
icon_state = "darkyellow";
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/se)
/area/station/supply/expedition)
"uiK" = (
/obj/item/radio/intercom{
name = "south bump";
@@ -87752,17 +87630,12 @@
/turf/simulated/floor/plasteel,
/area/station/security/main)
"vtR" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/caution/stand_clear,
/obj/machinery/door/poddoor/shutters{
dir = 2;
id_tag = "gateshutter";
name = "Expedition Access Shutter"
},
/obj/machinery/economy/vending/exploredrobe,
/turf/simulated/floor/plasteel{
icon_state = "dark"
dir = 4;
icon_state = "darkyellow"
},
/area/station/service/expedition)
/area/station/supply/expedition)
"vtY" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate,
@@ -89429,12 +89302,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/engine,
/area/station/engineering/control)
"wkM" = (
/obj/machinery/economy/vending/cola,
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
},
/area/station/hallway/secondary/bridge)
"wlo" = (
/obj/structure/closet/crate/trashcart,
/obj/effect/spawner/lootdrop{
@@ -124053,7 +123920,7 @@ bNh
bNh
bNh
bNh
bNh
bZX
caN
jdP
bdb
@@ -124310,8 +124177,8 @@ bNh
bQm
bWV
bNU
bNh
cbi
bZX
cIA
ben
bqb
fXo
@@ -124559,16 +124426,16 @@ bHC
qgk
bJp
bLg
wkM
bNh
bQB
bZX
cbi
bWX
bQB
bTS
ccl
bWW
bSo
qrT
iSE
fXz
bZX
cPD
ixQ
eOI
bbg
@@ -124815,17 +124682,17 @@ bEm
bIy
qgk
bMG
bLg
bLq
bOY
bNh
ccm
bRP
bRP
bZz
bZz
cdB
bWX
bWZ
tST
vtR
fXz
bZX
cPD
sZY
eOI
dbb
@@ -125073,17 +124940,17 @@ bHH
qgk
bJB
bLg
bNl
bNh
bZX
bQD
bSo
chF
bTU
ccm
bWY
bWZ
bWZ
bZD
bZX
cPD
uhY
sZY
eOI
dbb
cmo
@@ -125330,15 +125197,15 @@ qgk
qgk
bJp
daF
bNh
bNh
bNh
bNh
bNh
bNh
bZX
uhY
bWW
bWW
bWZ
bNh
bNh
bWZ
bWZ
iSE
bZX
cbj
nJC
bhp
@@ -125586,16 +125453,16 @@ cdO
cPt
bHK
bJC
bLq
bNo
clO
bTV
bLg
bZX
bWY
cJT
bSp
cJT
cdO
vtR
bYp
cPt
bHK
bNl
bZX
aKI
cMh
cdE
@@ -125844,15 +125711,15 @@ bht
bht
bJD
bLr
bht
bht
bht
bht
bht
bht
bht
bht
bht
bZX
bZX
bZX
bZX
bZX
bZX
bZX
bZX
bZX
xki
jAV
bqR
code/controllers/subsystem/SSeconomy.dm
+2
View File
@@ -56,6 +56,8 @@ SUBSYSTEM_DEF(economy)
var/credits_per_plasma = 10
/// credits gained per research design sold
var/credits_per_design = 20
/// points gained per salvage sold
var/credits_per_salvage = 100
/// credits gained per working mech sold
var/credits_per_mech = 100
/// credits gained for each secondary goal completed
code/controllers/subsystem/non_firing/SSmapping.dm
+56 -1
View File
@@ -139,6 +139,59 @@ SUBSYSTEM_DEF(mapping)
if(HAS_TRAIT(SSstation, STATION_TRAIT_HANGOVER))
generate_themed_messes(list(/obj/effect/spawner/themed_mess/party))
/datum/controller/subsystem/mapping/proc/seed_space_salvage(space_z_levels)
log_startup_progress("Seeding space salvage...")
var/space_salvage_timer = start_watch()
var/seeded_salvage_surfaces = list()
var/seeded_salvage_closets = list()
var/list/small_salvage_items = list(
/obj/item/salvage/ruin/brick,
/obj/item/salvage/ruin/nanotrasen,
/obj/item/salvage/ruin/carp,
/obj/item/salvage/ruin/tablet,
/obj/item/salvage/ruin/pirate,
/obj/item/salvage/ruin/russian
)
for(var/z_level in space_z_levels)
var/list/turf/z_level_turfs = block(locate(1, 1, z_level), locate(world.maxx, world.maxy, z_level))
for(var/z_level_turf in z_level_turfs)
var/turf/T = z_level_turf
var/area/A = get_area(T)
if(istype(A, /area/ruin/space))
// cardboard boxes are blacklisted otherwise deepstorage.dmm ends up hogging all the loot
var/list/closet_blacklist = list(/obj/structure/closet/cardboard, /obj/structure/closet/fireaxecabinet, /obj/structure/closet/walllocker/emerglocker, /obj/structure/closet/crate/can, /obj/structure/closet/body_bag, /obj/structure/closet/coffin)
for(var/obj/structure/closet/closet in T)
if(is_type_in_list(closet, closet_blacklist))
continue
seeded_salvage_closets |= closet
for(var/obj/structure/table/table in T)
if(locate(/obj/machinery) in T)
continue // Machinery on tables tend to take up all the visible space
seeded_salvage_surfaces |= table
var/max_salvage_attempts = rand(10, 15)
while(max_salvage_attempts > 0 && length(seeded_salvage_closets) > 0)
var/obj/structure/closet/C = pick_n_take(seeded_salvage_closets)
var/salvage_item_type = pick(small_salvage_items)
var/obj/salvage_item = new salvage_item_type(C)
salvage_item.pixel_x = rand(-5, 5)
salvage_item.pixel_y = rand(-5, 5)
max_salvage_attempts -= 1
max_salvage_attempts = rand(10, 15)
while(max_salvage_attempts > 0 && length(seeded_salvage_surfaces) > 0)
var/obj/T = pick_n_take(seeded_salvage_surfaces)
var/salvage_item_type = pick(small_salvage_items)
var/obj/salvage_item = new salvage_item_type(T.loc)
salvage_item.pixel_x = rand(-5, 5)
salvage_item.pixel_y = rand(-5, 5)
max_salvage_attempts -= 1
log_startup_progress("Successfully seeded space salvage in [stop_watch(space_salvage_timer)]s.")
// Do not confuse with seedRuins()
/datum/controller/subsystem/mapping/proc/handleRuins()
// load in extra levels of space ruins
@@ -156,8 +209,10 @@ SUBSYSTEM_DEF(mapping)
// Note that this budget is not split evenly accross all zlevels
log_startup_progress("Seeding ruins...")
var/seed_ruins_timer = start_watch()
seedRuins(levels_by_trait(SPAWN_RUINS), rand(20, 30), /area/space, GLOB.space_ruins_templates)
var/space_z_levels = levels_by_trait(SPAWN_RUINS)
seedRuins(space_z_levels, rand(20, 30), /area/space, GLOB.space_ruins_templates)
log_startup_progress("Successfully seeded ruins in [stop_watch(seed_ruins_timer)]s.")
seed_space_salvage(space_z_levels)
// Loads in the station
/datum/controller/subsystem/mapping/proc/loadStation()
code/datums/outfits/plasmamen_outfits.dm
+6
View File
@@ -70,6 +70,12 @@
head = /obj/item/clothing/head/helmet/space/plasmaman/cargo
uniform = /obj/item/clothing/under/plasmaman/cargo
/datum/outfit/plasmaman/expedition
name = "Plasmaman Expedition"
head = /obj/item/clothing/head/helmet/space/plasmaman/expedition
uniform = /obj/item/clothing/under/plasmaman/expedition
/datum/outfit/plasmaman/mining
name = "Plasmaman Mining"
code/datums/ruins/space_ruins.dm
+3 -1
View File
@@ -82,6 +82,7 @@
name = "Derelict 3"
description = "These hulks were once part of a larger structure, where \
the three great \[REDACTED\] were forged."
allow_duplicates = FALSE
/datum/map_template/ruin/space/derelict4
id = "derelict4"
@@ -146,7 +147,8 @@
No tabs. No violence in the inside areas. That's it. Welcome to the \
Rampant Golem and Yellow Hound. Can I take your order?"
allow_duplicates = FALSE //it spawn ship docking, no more than one to avoid duplication in console.
cost = 2
always_place = TRUE
cost = 0
/datum/map_template/ruin/space/turreted_outpost
id = "turreted-outpost"
code/datums/uplink_items/uplink_traitor.dm
+1 -1
View File
@@ -84,7 +84,7 @@
reference = "KPM"
item = /obj/item/borg/upgrade/modkit/indoors
cost = 25 //you need two for full damage, so total of 50 for maximum damage
job = list("Shaft Miner")
job = list("Shaft Miner", "Explorer")
surplus = 0 // Requires a KA to even be used.
/datum/uplink_item/jobspecific/mining_charge_hacker
code/game/area/ss13_areas/service_areas.dm
-6
View File
@@ -59,9 +59,3 @@
name = "Hydroponics"
icon_state = "hydro"
sound_environment = SOUND_AREA_STANDARD_STATION
/area/station/service/expedition
name = "\improper Expedition room"
icon_state = "expedition"
ambientsounds = ENGINEERING_SOUNDS
sound_environment = SOUND_AREA_STANDARD_STATION
code/game/area/ss13_areas/supply_areas.dm
+6
View File
@@ -37,3 +37,9 @@
/area/station/supply/mechbay
name = "\improper Mech Bay"
icon_state = "yellow"
/area/station/supply/expedition
name = "\improper Expedition Room"
icon_state = "expedition"
ambientsounds = list('sound/ambience/ambiexp.ogg')
sound_environment = SOUND_AREA_SMALL_ENCLOSED
code/game/gamemodes/steal_items.dm
+1 -1
View File
@@ -64,7 +64,7 @@
name = "a hand teleporter"
typepath = /obj/item/hand_tele
protected_jobs = list("Captain", "Research Director", "Chief Engineer")
location_override = "Teleporter"
location_override = "the AI Satellite, or the Captain's Office"
/datum/theft_objective/defib
name = "the chief medical officer's advanced compact defibrillator"
code/game/jobs/job/support.dm
+41 -24
View File
@@ -27,7 +27,9 @@
ACCESS_RC_ANNOUNCE,
ACCESS_SEC_DOORS,
ACCESS_SUPPLY_SHUTTLE,
ACCESS_WEAPONS
ACCESS_WEAPONS,
ACCESS_TELEPORTER,
ACCESS_EXPEDITION
)
blacklisted_disabilities = list(DISABILITY_FLAG_BLIND, DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_DIZZY)
outfit = /datum/outfit/job/qm
@@ -161,7 +163,45 @@
back = /obj/item/mod/control/pre_equipped/mining/asteroid
mask = /obj/item/clothing/mask/breath
/datum/job/explorer
title = "Explorer"
flag = JOB_EXPLORER
department_flag = JOBCAT_SUPPORT
job_department_flags = DEP_FLAG_SUPPLY
total_positions = 4
spawn_positions = 4
supervisors = "the quartermaster"
department_head = list("Quartermaster")
selection_color = "#eeddbe"
access = list(
ACCESS_MAINT_TUNNELS,
ACCESS_EXPEDITION,
ACCESS_EVA,
ACCESS_EXTERNAL_AIRLOCKS,
ACCESS_TELEPORTER,
ACCESS_CARGO,
ACCESS_CARGO_BAY,
ACCESS_MINERAL_STOREROOM,
ACCESS_SUPPLY_SHUTTLE,
ACCESS_MINING_STATION
)
alt_titles = list("Salvage Technician", "Scavenger")
outfit = /datum/outfit/job/explorer
/datum/outfit/job/explorer
name = "Explorer"
jobtype = /datum/job/explorer
l_ear = /obj/item/radio/headset/headset_cargo/expedition
head = /obj/item/clothing/head/soft/expedition
uniform = /obj/item/clothing/under/rank/cargo/expedition
gloves = /obj/item/clothing/gloves/color/black
shoes = /obj/item/clothing/shoes/jackboots
belt = /obj/item/storage/belt/utility/expedition
id = /obj/item/card/id/explorer
pda = /obj/item/pda/explorer
backpack = /obj/item/storage/backpack/explorer
satchel = /obj/item/storage/backpack/satchel/explorer
box = /obj/item/storage/box/survival_mining
//Food
/datum/job/bartender
@@ -500,26 +540,3 @@
if(new_language.flags & (HIVEMIND|NOLIBRARIAN))
continue
H.add_language(la)
/datum/job/explorer
title = "Explorer"
flag = JOB_EXPLORER
department_flag = JOBCAT_SUPPORT
total_positions = 4
spawn_positions = 4
supervisors = "the head of personnel"
department_head = list("Head of Personnel")
selection_color = "#dddddd"
access = list(ACCESS_MAINT_TUNNELS, ACCESS_EXPEDITION, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS)
outfit = /datum/outfit/job/explorer
/datum/outfit/job/explorer
name = "Explorer"
jobtype = /datum/job/explorer
uniform = /obj/item/clothing/under/color/orange
gloves = /obj/item/clothing/gloves/color/black
shoes = /obj/item/clothing/shoes/workboots
glasses = /obj/item/clothing/glasses/welding
belt = /obj/item/storage/belt/utility
l_pocket = /obj/item/gps
id = /obj/item/card/id/explorer
code/game/jobs/job_globals.dm
+3 -3
View File
@@ -65,14 +65,14 @@ GLOBAL_LIST_INIT(service_positions, list(
"Internal Affairs Agent",
"Chaplain",
"Clown",
"Mime",
"Explorer"
"Mime"
))
GLOBAL_LIST_INIT(supply_positions, list(
"Quartermaster",
"Cargo Technician",
"Shaft Miner"
"Shaft Miner",
"Explorer"
))
/// Roles that include any semblence of security, mostly for jobbans
code/game/machinery/computer/card.dm
-1
View File
@@ -34,7 +34,6 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
/datum/job/ntspecops/solgovspecops,
/datum/job/assistant,
/datum/job/syndicateofficer,
/datum/job/explorer // blacklisted so that HOPs don't try prioritizing it, then wonder why that doesn't work
)
// Jobs that appear in the list, and you can prioritize, but not open/close slots for
var/list/blacklisted_partial = list(
code/game/machinery/constructable_frame.dm
+6
View File
@@ -277,6 +277,7 @@ to destroy them and players will be able to make replacements.
"EngiDrobe" = /obj/machinery/economy/vending/engidrobe,
"AtmosDrobe" = /obj/machinery/economy/vending/atmosdrobe,
"CargoDrobe" = /obj/machinery/economy/vending/cargodrobe,
"ExploreDrobe" = /obj/machinery/economy/vending/exploredrobe,
"ChefDrobe" = /obj/machinery/economy/vending/chefdrobe,
"BarDrobe" = /obj/machinery/economy/vending/bardrobe,
"HydroDrobe" = /obj/machinery/economy/vending/hydrodrobe,
@@ -1052,6 +1053,11 @@ to destroy them and players will be able to make replacements.
icon_state = "generic"
build_path = /obj/machinery/mineral/equipment_vendor/labor
/obj/item/circuitboard/mining_equipment_vendor/explorer
board_name = "Explorer Equipment Vendor"
icon_state = "supply"
build_path = /obj/machinery/mineral/equipment_vendor/explorer
/obj/item/circuitboard/clawgame
board_name = "Claw Game"
icon_state = "generic"
code/game/machinery/suit_storage_unit.dm
+5
View File
@@ -179,6 +179,11 @@
helmet_type = /obj/item/clothing/head/space/prisoner_gulag
mask_type = /obj/item/clothing/mask/breath
/obj/machinery/suit_storage_unit/expedition
name = "explorer modsuit storage unit"
mask_type = /obj/item/clothing/mask/gas/explorer
suit_type = /obj/item/mod/control/pre_equipped/standard/explorer
req_access = list(ACCESS_EXPEDITION)
/obj/machinery/suit_storage_unit/cmo
name = "chief medical officer's suit storage unit"
mask_type = /obj/item/clothing/mask/breath
code/game/machinery/tcomms/nttc.dm
+3
View File
@@ -111,6 +111,9 @@
"Cargo Technician" = "supradio",
"Shaft Miner" = "supradio",
"Spelunker" = "supradio",
"Explorer" = "supradio",
"Salvage Technician" = "supradio",
"Scavenger" = "supradio",
// Service
"Bartender" = "srvradio",
"Beautician" = "srvradio",
code/game/machinery/vendors/wardrobe_vendors.dm
Vendored
+44 -1
View File
@@ -562,7 +562,8 @@
/obj/item/clothing/shoes/workboots = 3)
contraband = list(/obj/item/toy/figure/crew/qm = 1,
/obj/item/toy/figure/crew/cargotech = 1)
/obj/item/toy/figure/crew/cargotech = 1,
/obj/item/toy/figure/crew/miner = 1)
prices = list(/obj/item/clothing/under/rank/cargo/tech = 50,
/obj/item/clothing/under/rank/cargo/tech/skirt = 50,
@@ -580,6 +581,48 @@
refill_canister = /obj/item/vending_refill/cargodrobe
/obj/machinery/economy/vending/exploredrobe
name = "\improper ExploreDrobe"
desc = "This vending machine dispense clothing for the expedition team, though wearing any of the contents in place of a space suit may not go well for you."
icon_state = "exploredrobe"
icon_lightmask = "base_drobe"
icon_panel = "drobe"
icon_broken = "base_drobe"
icon_off = "base_drobe"
category = VENDOR_TYPE_CLOTHING
ads_list = list("Not guaranteed to protect the user from space. We are not liable!")
vend_reply = "Thank you for using the ExploreDrobe!"
products = list(/obj/item/clothing/under/rank/cargo/expedition = 3,
/obj/item/clothing/under/rank/cargo/expedition/skirt = 3,
/obj/item/clothing/under/rank/cargo/expedition/overalls = 3,
/obj/item/clothing/head/soft/expedition = 3,
/obj/item/clothing/head/beret/expedition = 3,
/obj/item/clothing/suit/jacket/expeditionbomber = 3,
/obj/item/mod/skin_applier = 3,
/obj/item/clothing/gloves/color/black = 3,
/obj/item/clothing/accessory/armband/cargo = 3,
/obj/item/clothing/shoes/jackboots = 3,
/obj/item/clothing/mask/gas/explorer = 3,
/obj/item/storage/backpack/explorer = 2,
/obj/item/storage/backpack/satchel/explorer = 2)
contraband = list(/obj/item/toy/figure/crew/explorer = 1)
prices = list(/obj/item/clothing/under/rank/cargo/expedition = 50,
/obj/item/clothing/under/rank/cargo/expedition/skirt = 50,
/obj/item/clothing/under/rank/cargo/expedition/overalls = 50,
/obj/item/clothing/head/soft/expedition = 20,
/obj/item/clothing/head/beret/expedition = 20,
/obj/item/clothing/suit/jacket/expeditionbomber = 75,
/obj/item/clothing/gloves/color/black = 20,
/obj/item/clothing/accessory/armband/cargo = 20,
/obj/item/clothing/shoes/jackboots = 20,
/obj/item/storage/backpack/explorer = 50,
/obj/item/storage/backpack/satchel/explorer = 50)
refill_canister = /obj/item/vending_refill/exploredrobe
/obj/machinery/economy/vending/chefdrobe
name = "\improper ChefDrobe"
desc = "This vending machine might not dispense meat, but it certainly dispenses chef related clothing."
code/game/objects/effects/spawners/random_spawners.dm
+32 -48
View File
@@ -253,11 +253,11 @@
/obj/item/toy/syndicateballoon = 1,
/obj/item/soap/syndie = 1,
/obj/item/clothing/under/syndicate = 1,
/obj/item/clothing/under/syndicate/tacticool = 1,
/obj/item/clothing/mask/gas/syndicate = 1,
/obj/item/suppressor = 1,
/obj/item/coin/antagtoken/syndicate = 1,
/obj/item/storage/box/syndie_kit/cutouts = 1)
/obj/item/storage/box/syndie_kit/space = 1,
/obj/item/clothing/shoes/magboots/syndie = 1)
/obj/effect/spawner/random_spawners/syndicate/loot/stetchkin
name = "20pc stetchkin"
@@ -271,88 +271,72 @@
/obj/effect/spawner/random_spawners/syndicate/loot/level2
name = "rare loot"
// Loot schema: space gear, basic armor, basic ammo (10mm, rcd), drugs, more dangerous/useful gimmick items, lower-value minerals
// Basic stealth, utility and environmental gear.
result = list(/datum/nothing = 27,
/obj/item/storage/box/syndie_kit/space = 1,
/obj/item/mod/control/pre_equipped/traitor = 1,
/obj/item/clothing/shoes/magboots/syndie = 1,
/obj/item/clothing/suit/armor/vest/combat = 1,
/obj/item/ammo_box/magazine/m10mm = 1,
/obj/item/storage/pill_bottle/happy = 1,
/obj/item/storage/pill_bottle/zoom = 1,
/obj/item/storage/pill_bottle/random_drug_bottle = 2,
/obj/item/storage/backpack/duffel/syndie/med/surgery = 1,
/obj/item/clothing/shoes/chameleon/noslip = 1,
/obj/item/storage/belt/military = 1,
/obj/item/clothing/under/chameleon = 1,
/obj/item/storage/backpack/satchel_flat = 1,
/obj/item/rcd = 1,
/obj/item/rcd_ammo = 1,
/obj/item/stamp/chameleon = 1,
/obj/item/flag/chameleon = 1,
/obj/item/lighter/zippo/gonzofist = 1,
/obj/item/clothing/gloves/fingerless/rapid = 1,
/obj/item/grenade/spawnergrenade/manhacks = 1,
/obj/item/grenade/syndieminibomb = 1,
/obj/item/storage/box/syndie_kit/throwing_weapons = 1,
/obj/item/pen/edagger = 1,
/obj/item/stack/sheet/mineral/plasma{amount = 20} = 1,
/obj/item/stack/sheet/mineral/silver{amount = 20} = 1,
/obj/item/stack/sheet/mineral/gold{amount = 20} = 1,
/obj/item/stack/sheet/mineral/uranium{amount = 20} = 1,
/obj/item/mod/module/noslip = 1,
/obj/item/mod/module/visor/night = 1)
/obj/item/mod/module/visor/night = 1,
/obj/item/clothing/gloves/color/black/thief = 1,
/obj/item/clothing/suit/storage/iaa/blackjacket/armored = 1,
/obj/item/clothing/suit/jacket/syndicatebomber = 1,
/obj/item/mod/module/holster/hidden = 1,
/obj/item/storage/firstaid/tactical = 1,
/obj/item/clothing/under/syndicate/silicon_cham = 1,
/obj/item/storage/box/syndie_kit/camera_bug = 1,
/obj/item/gun/projectile/automatic/toy/pistol/riot = 1,
/obj/item/flash/cameraflash = 1,
/obj/item/mod/module/chameleon = 1,
/obj/item/reagent_containers/hypospray/autoinjector/nanocalcium = 1)
/obj/effect/spawner/random_spawners/syndicate/loot/level3
name = "officer loot"
// Loot schema: medkits, very useful devices (jammer, illegal upgrade, RCD), better quality ammo (AP, fire), basic weapons (pistol, empgrenade), high value ores (diamond, uranium)
// Primarily utility items with occasional low damage weaponry.
result = list(/datum/nothing = 25,
/obj/item/jammer = 1,
/obj/item/storage/firstaid/regular = 1,
/obj/item/reagent_containers/hypospray/autoinjector/nanocalcium = 1,
/obj/item/gun/projectile/automatic/pistol = 1,
/obj/item/stock_parts/cell/bluespace = 1,
/obj/item/card/emag = 1,
/obj/item/encryptionkey/binary = 1,
/obj/item/pinpointer/advpinpointer = 1,
/obj/item/borg/upgrade/vtec = 1,
/obj/item/borg/upgrade/syndicate = 1,
/obj/item/borg/upgrade/selfrepair = 1,
/obj/item/storage/box/syndie_kit/stechkin = 1,
/obj/item/stack/sheet/mineral/diamond{amount = 10} = 1,
/obj/item/stack/sheet/mineral/uranium{amount = 10} = 1,
/obj/item/clothing/shoes/magboots/elite = 1,
/obj/item/grenade/empgrenade = 1,
/obj/item/grenade/clown_grenade = 1,
/obj/item/grenade/spawnergrenade/feral_cats = 1,
/obj/item/ammo_box/magazine/m10mm/ap = 1,
/obj/item/ammo_box/magazine/m10mm/fire = 1,
/obj/item/ammo_box/magazine/m10mm/hp = 1,
/obj/item/storage/box/syndie_kit/emp = 1,
/obj/item/toy/plushie/carpplushie/dehy_carp = 1,
/obj/item/clothing/glasses/hud/security/chameleon = 1,
/obj/item/mod/module/visor/thermal = 1,
/obj/item/mod/module/stealth = 1,
/obj/item/mod/module/power_kick = 1)
/obj/item/mod/module/power_kick = 1,
/obj/item/storage/box/syndidonkpockets = 1,
/obj/item/pen/edagger = 1,
/obj/item/door_remote/omni/access_tuner = 1,
/obj/item/clothing/glasses/thermal = 1)
/obj/effect/spawner/random_spawners/syndicate/loot/level4
name = "armory loot"
spawn_inside = /obj/structure/closet/secure_closet/syndicate/depot/armory
// Loot schema: high-power weapons (m90, esword, ebow, revolver), devices that negate depot challenges (thermal glasses, chameleon device), explosives
result = list(/obj/item/gun/projectile/automatic/c20r = 1,
/obj/item/gun/projectile/automatic/m90 = 1,
/obj/item/gun/projectile/automatic/sniper_rifle/syndicate = 1,
/obj/item/melee/energy/sword/saber = 1,
/obj/item/gun/energy/kinetic_accelerator/crossbow = 1,
/obj/item/gun/projectile/revolver = 1,
/obj/item/bio_chip_implanter/shock = 1,
/obj/item/butcher_chainsaw = 1,
/obj/item/bee_briefcase = 1,
/obj/item/fireaxe/energized = 1,
/obj/item/clothing/glasses/thermal = 1,
// Combat orientated items that could give the player an advantage if an antag messes with them.
result = list(/obj/item/melee/energy/sword/saber = 1,
/obj/item/autosurgeon/organ/syndicate/razorwire = 1,
/obj/item/chameleon = 1,
/obj/item/CQC_manual = 1,
/obj/item/reagent_containers/hypospray/autoinjector/stimulants = 1,
/obj/item/grenade/plastic/c4/x4 = 1,
/obj/item/mod/control/pre_equipped/traitor_elite = 1)// Adding this as it is something an explorer can use to explore space better, that isn't a high powered murder weapon.
/obj/item/clothing/gloves/fingerless/rapid = 1,
/obj/item/gun/medbeam = 1,
/obj/item/shield/energy = 1,
/obj/item/storage/box/syndie_kit/teleporter = 1,
/obj/item/weaponcrafting/gunkit/universal_gun_kit = 1)
// Layout-affecting spawns
code/game/objects/items/devices/radio/headset.dm
+5
View File
@@ -289,6 +289,11 @@
desc = "Headset used by shaft miners."
icon_state = "mine_headset"
/obj/item/radio/headset/headset_cargo/expedition
name = "expedition radio headset"
desc = "Headset used by space explorers."
icon_state = "mine_headset"
/obj/item/radio/headset/headset_service
name = "service radio headset"
desc = "Headset used by the service staff, tasked with keeping the station full, happy and clean."
code/game/objects/items/salvage.dm
+101
View File
@@ -0,0 +1,101 @@
/obj/item/salvage
name = "salvage"
desc = "A tonne of salvage looted from bad mapping practices. Who spawned the base type? Report this on the github."
icon = 'icons/obj/sellable.dmi'
force = 5
throwforce = 5
throw_speed = 1
throw_range = 4
hitsound = 'sound/items/handling/salvagepickup.ogg'
pickup_sound = 'sound/items/handling/salvagepickup.ogg'
drop_sound = 'sound/items/handling/salvagedrop.ogg'
w_class = WEIGHT_CLASS_NORMAL
/obj/item/salvage/examine(mob/user)
. = ..()
. += "<span class='notice'>You can bring this back to Cargo to sell to Central Command onboard the 'NTV Arion' Supply shuttle.</span>"
/// Ruin Salvage, misc loot gained from looking around ruins.
/obj/item/salvage/ruin
desc = "A tonne of salvage recovered from an abandoned ruin. Who spawned the base type? Report this on the github."
/obj/item/salvage/ruin/pirate
name = "rum keg"
desc = "A highly valued keg of aged space rum. Limited edition and sure to be a collector's item."
icon = 'icons/obj/objects.dmi'
icon_state = "barrel"
color = "#7e5c00" // So that it's slightly different from normal kegs
/obj/item/salvage/ruin/russian
name = "armaments cache"
desc = "A crate of old disused Belastrav ballistic firearms clearly long past their usability. This crate would make good scrap metal for shuttle construction."
icon_state = "weapon_crate"
/obj/item/salvage/ruin/brick
name = "mysterious brick"
desc = "A peculier brick formed out of what appears to be plastic. This would make a fantastic collector's item."
icon_state = "lego_brick"
hitsound = 'sound/items/handling/taperecorder_drop.ogg'
pickup_sound = 'sound/items/handling/taperecorder_pickup.ogg'
drop_sound = 'sound/items/handling/taperecorder_drop.ogg'
/obj/item/salvage/ruin/brick/Initialize(mapload)
. = ..()
AddComponent(/datum/component/caltrop, 5, 10) // 5 to 10 damage, hits like a truck
/obj/item/salvage/ruin/nanotrasen
name = "lost research notes"
desc = "A collection of research notes penned by old Nanotrasen scientists from decades past, technology lost in time- until you found them. It is a mystery what technology Central Command will push if they could just get their hands on these notes."
icon_state = "research_doc"
hitsound = 'sound/items/handling/paper_pickup.ogg'
pickup_sound = 'sound/items/handling/paper_pickup.ogg'
drop_sound = 'sound/items/handling/paper_drop.ogg'
/obj/item/salvage/ruin/nanotrasen/Initialize(mapload)
. = ..()
origin_tech = pick(list("combat=5", "materials=5", "engineering=5", "biotech=5", "power=5", "data=5"))
/obj/item/salvage/ruin/carp
name = "carp scales"
desc = "A collection of scales shed from a corrupted space carp. Their culinary potential could mean untold riches for Nanotrasen."
icon_state = "dragon_scales"
hitsound = sound('sound/effects/hit_on_shattered_glass.ogg', 20)
pickup_sound = sound('sound/hallucinations/im_here2.ogg', 10)
drop_sound = sound('sound/hallucinations/look_up2.ogg', 10)
/obj/item/salvage/ruin/tablet
name = "mysterious tablet"
desc = "A mysterious and old stone tablet. When you read the text on it, you start getting chills."
icon_state = "stone_tablet"
hitsound = sound('sound/effects/break_stone.ogg', 20)
pickup_sound = sound('sound/hallucinations/im_here2.ogg', 10)
drop_sound = sound('sound/hallucinations/look_up2.ogg', 10)
/// Loot salvage, gained from fighting space simplemobs.
/obj/item/salvage/loot
desc = "A tonne of salvage looted from a fallen foe. Who spawned the base type? Report this on the github."
/obj/item/salvage/loot/pirate
name = "stolen jewellery"
desc = "A collection of stolen jewellery, fashioned from pilfered bluespace crystals and gems. Rumour has it, local pirates have been known to use these accessories to avoid capture."
icon_state = "pirate_treasure"
hitsound = 'sound/items/handling/taperecorder_drop.ogg'
pickup_sound = 'sound/items/handling/taperecorder_pickup.ogg'
drop_sound = 'sound/items/handling/taperecorder_drop.ogg'
/obj/item/salvage/loot/russian
name = "siosp manual"
desc = "A small manual, written in Neo-Russkyia, detailing the manifesto of Malfoy Ames, father of The Cygni Rebellion. Central Command may wish to share this with their allies in the Trans-Solar Federation."
icon_state = "ussp_manual"
hitsound = 'sound/items/handling/paper_pickup.ogg'
pickup_sound = 'sound/items/handling/paper_pickup.ogg'
drop_sound = 'sound/items/handling/paper_drop.ogg'
/obj/item/salvage/loot/syndicate
name = "syndicate intel"
desc = "A folder detailing Syndicate plans to infiltrate and sabotage operations in the Epsilon Eridani sector. Central Command may find use of this to aid them in counter-intelligence."
icon_state = "syndie_doc"
hitsound = 'sound/items/handling/paper_pickup.ogg'
pickup_sound = 'sound/items/handling/paper_pickup.ogg'
drop_sound = 'sound/items/handling/paper_drop.ogg'
code/game/objects/items/toys.dm
+6
View File
@@ -1367,6 +1367,12 @@
icon_state = "cargotech"
toysay = "For Cargonia!"
/obj/item/toy/figure/crew/explorer
name = "\improper Explorer action figure"
desc = "The oblivious explorer, from Space Life's SS12 figurine collection."
icon_state = "explorer"
toysay = "I f-foun-nd-d it-t in-n s-spac-ce!"
/obj/item/toy/figure/crew/ce
name = "\improper Chief Engineer action figure"
desc = "The expert Chief Engineer, from Space Life's SS12 figurine collection."
code/game/objects/items/weapons/melee/energy_melee_weapons.dm
+2
View File
@@ -254,9 +254,11 @@
/obj/item/melee/energy/sword/pirate
name = "energy cutlass"
desc = "Arrrr matey."
force_on = 20
icon_state = "cutlass0"
icon_state_on = "cutlass1"
light_color = LIGHT_COLOR_RED
origin_tech = "combat=3;magnets=4;syndicate=2"
/obj/item/melee/energy/blade
name = "energy blade"
code/game/objects/items/weapons/storage/bags.dm
+25
View File
@@ -462,3 +462,28 @@
w_class = WEIGHT_CLASS_TINY
can_hold = list(/obj/item/airlock_electronics, /obj/item/firelock_electronics, /obj/item/firealarm_electronics, /obj/item/apc_electronics, /obj/item/airalarm_electronics, /obj/item/camera_assembly, /obj/item/stock_parts/cell, /obj/item/circuitboard, /obj/item/stack/cable_coil)
resistance_flags = FLAMMABLE
/*
* Treasure bag
*/
/obj/item/storage/bag/expedition
name = "treasure satchel"
desc = "A satchel for storing scavenged salvage. There be treasure."
icon = 'icons/obj/mining.dmi'
icon_state = "satchel" // placeholder
origin_tech = "engineering=2"
slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_POCKET
w_class = WEIGHT_CLASS_NORMAL
storage_slots = 15
max_combined_w_class = 60
max_w_class = WEIGHT_CLASS_NORMAL
can_hold = list(/obj/item/salvage)
/obj/item/storage/bag/expedition/robust
name = "robust treasure satchel"
desc = "We heard you liked booty so we put booty in your booty so ye could carry more booty."
storage_slots = 30
max_combined_w_class = 120
origin_tech = "materials=3;engineering=3"
icon_state = "satchel_bspace" // placeholder
code/game/objects/items/weapons/storage/belt.dm
+15
View File
@@ -164,6 +164,21 @@
new /obj/item/stack/cable_coil(src, 30, COLOR_RED)
update_icon()
/obj/item/storage/belt/utility/expedition
desc = "A belt for holding tools, but with style."
icon_state = "assaultbelt"
item_state = "assault"
/obj/item/storage/belt/utility/expedition/populate_contents()
new /obj/item/screwdriver(src, "blue")
new /obj/item/wrench(src)
new /obj/item/weldingtool/hugetank(src)
new /obj/item/crowbar(src)
new /obj/item/wirecutters(src)
new /obj/item/multitool(src)
new /obj/item/stack/cable_coil(src, 30, COLOR_BLUE)
update_icon()
/obj/item/storage/belt/medical
name = "medical belt"
desc = "Can hold various medical equipment."
code/game/objects/items/weapons/storage/boxes.dm
+11
View File
@@ -949,6 +949,17 @@
return
return ..()
/obj/item/storage/box/relay_kit
name = "telecommunications relay kit"
desc = "Contains everything you need to set up your own telecommunications array!"
/obj/item/storage/box/relay_kit/populate_contents()
new /obj/item/paper/tcommskey(src)
new /obj/item/stack/sheet/metal/(src, 5)
new /obj/item/circuitboard/tcomms/relay(src)
new /obj/item/stock_parts/manipulator(src)
new /obj/item/stock_parts/manipulator(src)
new /obj/item/stack/cable_coil(src, 7)
/obj/item/storage/box/centcomofficer
name = "officer kit"
code/game/objects/items/weapons/storage/garment.dm
+11
View File
@@ -298,4 +298,15 @@
new /obj/item/clothing/gloves/color/latex/nitrile(src)
new /obj/item/clothing/shoes/black(src)
/obj/item/storage/bag/garment/explorer
name = "explorer's garment bag"
desc = "A bag for storing extra clothes and shoes. This one belongs to the explorer."
/obj/item/storage/bag/garment/explorer/populate_contents()
new /obj/item/clothing/under/rank/cargo/expedition(src)
new /obj/item/clothing/under/rank/cargo/expedition/overalls(src)
new /obj/item/clothing/head/soft/expedition(src)
new /obj/item/clothing/head/beret/expedition(src)
new /obj/item/clothing/gloves/color/black(src)
new /obj/item/clothing/shoes/jackboots(src)
new /obj/item/clothing/mask/gas/explorer(src)
code/game/objects/items/weapons/vending_items.dm
+4
View File
@@ -200,6 +200,10 @@
machine_name = "CargoDrobe"
icon_state = "refill_clothes"
/obj/item/vending_refill/exploredrobe
machine_name = "ExploreDrobe"
icon_state = "refill_clothes"
/obj/item/vending_refill/chefdrobe
machine_name = "ChefDrobe"
icon_state = "refill_clothes"
code/game/objects/mail.dm
+3 -2
View File
@@ -107,10 +107,11 @@
/obj/item/clothing/mask/cigarette/cigar,
/obj/item/stack/wrapping_paper,
/obj/item/toy/figure/crew/cargotech,
/obj/item/toy/figure/crew/explorer,
/obj/item/toy/figure/crew/qm,
/obj/item/toy/figure/crew/miner,
/obj/item/storage/box/scratch_cards)
job_list = list("Quartermaster", "Cargo Technician", "Shaft Miner")
job_list = list("Quartermaster", "Cargo Technician", "Shaft Miner", "Explorer")
/obj/item/envelope/medical
icon_state = "mail_med"
@@ -211,7 +212,7 @@
/obj/item/toy/figure/owl,
/obj/item/toy/figure/griffin,
/obj/item/storage/box/scratch_cards)
job_list = list("Assistant", "Explorer")
job_list = list("Assistant")
/*//////////////////////\/
code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm
+18
View File
@@ -13,6 +13,24 @@
new /obj/item/clothing/head/soft/cargo(src)
new /obj/item/storage/bag/mail(src)
/obj/structure/closet/secure_closet/explorer
name = "explorer's locker"
req_access = list(ACCESS_EXPEDITION)
icon_state = "explorer"
open_door_sprite = "mining_door"
/obj/structure/closet/secure_closet/explorer/populate_contents()
new /obj/item/radio/headset/headset_cargo/expedition(src)
new /obj/item/gun/energy/kinetic_accelerator/pistol(src)
new /obj/item/storage/firstaid/regular(src)
new /obj/item/clothing/accessory/holster(src)
new /obj/item/radio/beacon(src)
new /obj/item/storage/box/relay_kit(src)
new /obj/item/gps(src)
new /obj/item/storage/bag/ore(src)
new /obj/item/t_scanner/adv_mining_scanner/lesser(src)
new /obj/item/storage/bag/expedition(src)
/obj/structure/closet/secure_closet/quartermaster
name = "quartermaster's locker"
req_access = list(ACCESS_QM)
code/modules/client/preference/character.dm
+6 -4
View File
@@ -1188,15 +1188,17 @@
if(4)
clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_EXPLORER)
clothes_s = new /icon('icons/mob/clothing/under/color.dmi', "orange_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "workboots"), ICON_UNDERLAY)
clothes_s = new /icon('icons/mob/clothing/under/cargo.dmi', "expedition_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_OVERLAY)
has_gloves = TRUE
if(prob(1))
clothes_s.Blend(new /icon('icons/mob/clothing/under/syndicate.dmi', "tactifool_s"), ICON_OVERLAY)
switch(backbag)
if(2)
clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "explorerpack"), ICON_OVERLAY)
if(3)
clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY)
clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-explorer"), ICON_OVERLAY)
if(4)
clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
else if(job_medsci_high)
code/modules/client/preference/loadout/loadout_suit.dm
+5
View File
@@ -106,6 +106,11 @@
path = /obj/item/clothing/suit/jacket/miningbomber
allowed_roles = list("Quartermaster", "Shaft Miner")
/datum/gear/suit/bomber/job/expedition
display_name = "Bomber jacket, expedition"
path = /obj/item/clothing/suit/jacket/expeditionbomber
allowed_roles = list("Quartermaster", "Explorer")
/datum/gear/suit/bomber/job/engi
display_name = "Bomber jacket, engineering"
path = /obj/item/clothing/suit/jacket/engibomber
code/modules/client/preference/loadout/loadout_uniform.dm
+5
View File
@@ -183,6 +183,11 @@
path = /obj/item/clothing/under/rank/cargo/tech/skirt
allowed_roles = list("Quartermaster","Cargo Technician")
/datum/gear/uniform/skirt/job/expedition
display_name = "Skirt, expedition"
path = /obj/item/clothing/under/rank/cargo/expedition/skirt
allowed_roles = list("Quartermaster", "Explorer")
/datum/gear/uniform/skirt/job/qm
display_name = "Skirt, quartermaster"
path = /obj/item/clothing/under/rank/cargo/qm/skirt
code/modules/clothing/head/beret.dm
+13
View File
@@ -156,6 +156,19 @@
"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi'
)
/obj/item/clothing/head/beret/expedition
name = "expedition beret"
desc = "A brown beret with a blue Nanotrasen insignia emblazoned on it. Not much good for space protection, but stylish all the same."
icon_state = "beret_expedition"
item_color = "beret_expedition"
armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 10, ACID = 50)
strip_delay = 6 SECONDS
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi'
)
//Special Roles
/obj/item/clothing/head/beret/solgov/command
name = "\improper Trans-Solar Federation Lieutenant's beret"
code/modules/clothing/head/job_hats.dm
-1
View File
@@ -194,4 +194,3 @@
desc = "A cap coroners wear during autopsies. Keeps their hair from falling into the cadavers. It is as dark as the coroner's humor."
icon_state = "surgcap_black"
dog_fashion = /datum/dog_fashion/head/surgery
code/modules/clothing/head/soft_caps.dm
+10
View File
@@ -117,6 +117,16 @@
"Grey" = 'icons/mob/clothing/species/grey/head/softcap.dmi'
)
/obj/item/clothing/head/soft/expedition
name = "expedition cap"
desc = "It's a baseball hat in the brown and blue markings of the expedition team."
icon_state = "expeditionsoft"
item_color = "expedition"
armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 10, ACID = 50)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head/softcap.dmi'
)
/obj/item/clothing/head/soft/janitorgrey
name = "grey janitor's cap"
desc = "It's a grey baseball hat with a purple custodial shield."
code/modules/clothing/spacesuits/plasmamen.dm
+7
View File
@@ -187,6 +187,13 @@
item_state = "explorer_envirohelm"
visor_icon = "explorer_envisor"
/obj/item/clothing/head/helmet/space/plasmaman/expedition
name = "expedition plasma envirosuit helmet"
desc = "A brown and blue helmet given to plasmaman explorers operating in Space.."
icon_state = "expedition_envirohelm"
item_state = "expedition_envirohelm"
armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = INFINITY, ACID = 150)
/obj/item/clothing/head/helmet/space/plasmaman/chaplain
name = "chaplain's plasma envirosuit helmet"
desc = "An envirohelmet specially designed for only the most pious of plasmamen."
code/modules/clothing/suits/misc_suits.dm
+61 -1
View File
@@ -305,10 +305,63 @@
icon_state = "carp_casual"
body_parts_covered = HEAD
cold_protection = HEAD
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
flags = BLOCKHAIR
flags_inv = HIDEEARS
/obj/item/clothing/suit/hooded/carp_costume/dragon
name = "space carp poncho"
desc = "A poncho fashioned from the scales of a corrupted space carp, it still smells."
armor = list(MELEE = 30, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 15, RAD = 15, FIRE = INFINITY, ACID = INFINITY)
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS|HANDS|FEET
flags = STOPSPRESSUREDMAGE
min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
hoodtype = /obj/item/clothing/head/hooded/carp_hood/dragon
/obj/item/clothing/suit/hooded/carp_costume/dragon/equipped(mob/user, slot, initial)
. = ..()
if(slot == SLOT_HUD_OUTER_SUIT)
user.faction += "carp"
to_chat(user, "<span class='cult'>You feel a something gnash in the back of your mind- the carp are your friends, not your foe.</span>")
playsound(loc, 'sound/weapons/bite.ogg', 35, TRUE)
/obj/item/clothing/suit/hooded/carp_costume/dragon/dropped(mob/user)
. = ..()
if(user)
user.faction -= "carp"
to_chat(user, "<span class='cult'>A sudden calm fills the gnashing void of your mind- you're alone now.</span>")
/mob/living/carbon/human/Process_Spacemove(movement_dir = 0)
if(..())
return TRUE
if(istype(wear_suit, /obj/item/clothing/suit/hooded/carp_costume/dragon))
return TRUE
//Do we have a working jetpack?
var/obj/item/tank/jetpack/thrust
if(istype(back, /obj/item/tank/jetpack))
thrust = back
else if(istype(wear_suit, /obj/item/clothing/suit/space/hardsuit))
var/obj/item/clothing/suit/space/hardsuit/C = wear_suit
thrust = C.jetpack
else if(ismodcontrol(back))
var/obj/item/mod/control/C = back
thrust = locate(/obj/item/mod/module/jetpack) in C
if(thrust)
if((movement_dir || thrust.stabilizers) && thrust.allow_thrust(0.01, src))
return TRUE
if(dna.species.spec_Process_Spacemove(src))
return TRUE
return FALSE
/obj/item/clothing/head/hooded/carp_hood/dragon
name = "space carp hood"
desc = "Fashioned from the maw of a carp, this outfit makes you feel like a fish out of water."
armor = list(MELEE = 55, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 15, RAD = 15, FIRE = INFINITY, ACID = INFINITY)
flags = STOPSPRESSUREDMAGE
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
/obj/item/clothing/suit/hooded/salmon_costume
name = "salmon suit"
desc = "A costume made from authentic salmon scales, it reeks!"
@@ -929,6 +982,13 @@
allowed = list(/obj/item/pickaxe, /obj/item/t_scanner/adv_mining_scanner, /obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/energy/kinetic_accelerator, /obj/item/shovel, /obj/item/storage/bag/ore)
armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0)
/obj/item/clothing/suit/jacket/expeditionbomber
name = "expedition bomber jacket"
desc = "A stylish jacket for station-side explorers. Won't do much to protect you from space."
icon_state = "bomberexpedition"
item_state = "bomberexpedition"
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/energy/kinetic_accelerator, /obj/item/t_scanner/adv_mining_scanner, /obj/item/shovel, /obj/item/pickaxe, /obj/item/storage/bag/ore, /obj/item/gps)
/obj/item/clothing/suit/jacket/hydrobomber
name = "hydroponics bomber jacket"
desc = "A stylish choice for the workers of the hydroponics lab."
code/modules/clothing/under/jobs/cargo.dm
+22
View File
@@ -77,3 +77,25 @@
icon_state = "explorer"
item_state = "explorer"
item_color = "explorer"
/obj/item/clothing/under/rank/cargo/expedition
name = "expedition jumpsuit"
desc = "An armored brown jumpsuit with Nanotrasen markings for identification, and a black safety harness for their space suits."
armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 20, ACID = 20)
icon_state = "expedition"
item_state = "expedition"
item_color = "expedition"
/obj/item/clothing/under/rank/cargo/expedition/skirt
name = "expedition jumpskirt"
desc = "An armoured brown jumpskirt with Nanotrasen markings for identification, and a black safety harness for their space suits."
icon_state = "expedition_skirt"
item_state = "expedition_skirt"
item_color = "expedition_skirt"
/obj/item/clothing/under/rank/cargo/expedition/overalls
name = "expedition overalls"
desc = "A black set of overalls over a brown turtleneck, designed to protect the wearer from microscopic space debris. Does not protect against larger objects."
icon_state = "expedition_overalls"
item_state = "expedition_overalls"
item_color = "expedition_overalls"
code/modules/clothing/under/jobs/plasmamen/civilian_service.dm
+7
View File
@@ -5,6 +5,13 @@
item_state = "cargo_envirosuit"
item_color = "cargo_envirosuit"
/obj/item/clothing/under/plasmaman/expedition
name = "expedition envirosuit"
desc = "An airtight brown and blue suit designed for operations in Space by plasmamen.."
icon_state = "expedition_envirosuit"
item_state = "expedition_envirosuit"
item_color = "expedition_envirosuit"
/obj/item/clothing/under/plasmaman/mining
name = "mining plasma envirosuit"
desc = "An airtight khaki suit designed for operations on Lavaland by plasmamen."
code/modules/mapping/access_helpers.dm
+2 -2
View File
@@ -40,7 +40,7 @@
/obj/effect/mapping_helpers/airlock/access/any/command/eva
access = ACCESS_EVA
/obj/effect/mapping_helpers/airlock/access/any/command/expedition
/obj/effect/mapping_helpers/airlock/access/any/supply/expedition
access = ACCESS_EXPEDITION
/obj/effect/mapping_helpers/airlock/access/any/command/hop
@@ -259,7 +259,7 @@
/obj/effect/mapping_helpers/airlock/access/all/command/eva
access = ACCESS_EVA
/obj/effect/mapping_helpers/airlock/access/all/command/expedition
/obj/effect/mapping_helpers/airlock/access/all/supply/expedition
access = ACCESS_EXPEDITION
/obj/effect/mapping_helpers/airlock/access/all/command/hop
code/modules/mapping/windoor_access_helpers.dm
+2 -2
View File
@@ -53,7 +53,7 @@
/obj/effect/mapping_helpers/airlock/windoor/access/any/command/eva
access = ACCESS_EVA
/obj/effect/mapping_helpers/airlock/windoor/access/any/command/expedition
/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/expedition
access = ACCESS_EXPEDITION
/obj/effect/mapping_helpers/airlock/windoor/access/any/command/hop
@@ -262,7 +262,7 @@
/obj/effect/mapping_helpers/airlock/windoor/access/all/command/eva
access = ACCESS_EVA
/obj/effect/mapping_helpers/airlock/windoor/access/all/command/expedition
/obj/effect/mapping_helpers/airlock/windoor/access/all/supply/expedition
access = ACCESS_EXPEDITION
/obj/effect/mapping_helpers/airlock/windoor/access/all/command/hop
code/modules/mining/machine_vending.dm
+97 -1
View File
@@ -370,6 +370,103 @@
EQUIPMENT("Analyzer", /obj/item/analyzer, 50)
)
/**********************Mining Equipment Vendor (Explorer)**************************/
/obj/machinery/mineral/equipment_vendor/explorer
name = "explorer equipment vendor"
desc = "An equipment vendor for explorers, points collected at an ore redemption machine can be spent here."
icon_state = "explorer"
/obj/machinery/mineral/equipment_vendor/explorer/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/mining_equipment_vendor/explorer(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stack/sheet/glass(null)
RefreshParts()
/obj/machinery/mineral/equipment_vendor/explorer/Initialize(mapload)
. = ..()
prize_list = list()
prize_list["Equipment"] = list(
EQUIPMENT("Advanced Scanner", /obj/item/t_scanner/adv_mining_scanner, 800),
EQUIPMENT("Tacticool Toolbelt", /obj/item/storage/belt/utility/expedition, 500),
EQUIPMENT("Fulton Beacon", /obj/item/fulton_core, 400),
EQUIPMENT("GPS", /obj/item/gps, 200),
EQUIPMENT("Treasure Satchel", /obj/item/storage/bag/expedition, 100),
EQUIPMENT ("Robust Treasure Satchel", /obj/item/storage/bag/expedition/robust, 300),
EQUIPMENT("Tracking Bio-chip Kit", /obj/item/storage/box/minertracker, 600),
EQUIPMENT("Telecommunications Relay Kit", /obj/item/storage/box/relay_kit, 500),
EQUIPMENT("Tracking Beacon", /obj/item/radio/beacon, 200),
)
prize_list["Modsuits"] = list(
EQUIPMENT("Standard MODsuit", /obj/item/mod/control/pre_equipped/standard/explorer, 1000),
EQUIPMENT("Advanced Jetpack Module", /obj/item/mod/module/jetpack/advanced, 2000),
EQUIPMENT("Night Vision Module", /obj/item/mod/module/visor/night, 1500),
EQUIPMENT("Clamp Module", /obj/item/mod/module/clamp, 500),
EQUIPMENT("GPS Module", /obj/item/mod/module/gps, 500),
EQUIPMENT("Mining MODsuit", /obj/item/mod/control/pre_equipped/mining/vendor, 3500),
EQUIPMENT("Asteroid MODsuit Skin", /obj/item/mod/skin_applier/asteroid, 1000),
)
prize_list["Consumables"] = list(
EQUIPMENT("First-Aid Kit", /obj/item/storage/firstaid/regular, 400),
EQUIPMENT("Advanced First-Aid Kit", /obj/item/storage/firstaid/adv, 600),
EQUIPMENT("Fulton Pack", /obj/item/extraction_pack, 1000),
EQUIPMENT("Point Transfer Card", /obj/item/card/mining_point_card, 500),
EQUIPMENT("Stabilizing Serum", /obj/item/hivelordstabilizer, 400),
)
prize_list["Kinetic Accelerator"] = list(
EQUIPMENT("Kinetic Pistol", /obj/item/gun/energy/kinetic_accelerator/pistol, 750),
EQUIPMENT("KA Adjustable Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer/adjustable, 150),
EQUIPMENT("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000),
EQUIPMENT("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1000),
EQUIPMENT("KA Damage Increase", /obj/item/borg/upgrade/modkit/damage, 1000),
EQUIPMENT("KA Hyper Chassis", /obj/item/borg/upgrade/modkit/chassis_mod/orange, 300),
EQUIPMENT("KA Range Increase", /obj/item/borg/upgrade/modkit/range, 1000),
EQUIPMENT("KA Super Chassis", /obj/item/borg/upgrade/modkit/chassis_mod, 250),
EQUIPMENT("KA White Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer, 100),
)
prize_list["Miscellaneous"] = list(
EQUIPMENT("Alien Toy", /obj/item/clothing/mask/facehugger/toy, 300),
EQUIPMENT("Toy Sword", /obj/item/toy/sword, 200),
EQUIPMENT("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 150),
EQUIPMENT("Laser Pointer", /obj/item/laser_pointer, 300),
EQUIPMENT("Suspicious ID Sticker", /obj/item/id_decal/emag, 400),
EQUIPMENT("Syndicate Coin", /obj/item/coin/antagtoken/syndicate, 100),
EQUIPMENT("Space Cash", /obj/item/stack/spacecash/c200, 2000),
)
/obj/machinery/mineral/equipment_vendor/explorer/attackby(obj/item/I, mob/user, params)
if(default_deconstruction_screwdriver(user, "explorer-open", "explorer", I))
return
if(panel_open)
if(istype(I, /obj/item/crowbar))
remove_id()
default_deconstruction_crowbar(user, I)
return TRUE
if(istype(I, /obj/item/mining_voucher))
if(!has_power())
return
redeem_voucher(I, user)
return
if(istype(I, /obj/item/card/id))
if(!has_power())
return
var/obj/item/card/id/C = user.get_active_hand()
if(istype(C) && !istype(inserted_id))
if(!user.drop_item())
return
C.forceMove(src)
inserted_id = C
ui_interact(user)
return
return ..()
/**********************Mining Equipment Datum**************************/
/datum/data/mining_equipment
@@ -416,4 +513,3 @@
#undef EQUIPMENT
code/modules/mob/living/carbon/human/species/plasmaman.dm
+3
View File
@@ -88,6 +88,9 @@
if("Cargo Technician", "Quartermaster")
O = new /datum/outfit/plasmaman/cargo
if("Explorer")
O = new /datum/outfit/plasmaman/expedition
if("Shaft Miner")
O = new /datum/outfit/plasmaman/mining
code/modules/mob/living/simple_animal/corpse.dm
+23 -5
View File
@@ -41,6 +41,25 @@
r_pocket = /obj/item/tank/internals/emergency_oxygen
id = /obj/item/card/id
/obj/effect/mob_spawn/human/corpse/syndicatequartermaster
name = "Syndicate Quartermaster"
mob_name = "Syndicate Quartermaster"
hair_style = "bald"
facial_hair_style = "shaved"
id_job = "Operative"
id_access_list = list(ACCESS_SYNDICATE)
outfit = /datum/outfit/syndicatequartermastercorpse
/datum/outfit/syndicatequartermastercorpse
name = "Corpse of a Syndicate Quartermaster"
uniform = /obj/item/clothing/under/syndicate
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
l_ear = /obj/item/radio/headset
mask = /obj/item/clothing/mask/gas/syndicate
back = /obj/item/mod/control/pre_equipped/traitor_elite
r_pocket = /obj/item/tank/internals/emergency_oxygen
id = /obj/item/card/id
/obj/effect/mob_spawn/human/corpse/clown/corpse
roundstart = TRUE
@@ -60,20 +79,19 @@
/datum/outfit/piratecorpse
name = "Corpse of a Pirate"
uniform = /obj/item/clothing/under/costume/pirate
suit = /obj/item/clothing/suit/space/eva
shoes = /obj/item/clothing/shoes/jackboots
glasses = /obj/item/clothing/glasses/eyepatch
head = /obj/item/clothing/head/bandana
head = /obj/item/clothing/head/helmet/space/eva
back = /obj/item/tank/jetpack/carbondioxide
/obj/effect/mob_spawn/human/corpse/pirate/ranged
name = "Pirate Gunner"
mob_name = "Pirate Gunner"
outfit = /datum/outfit/piratecorpse/ranged
outfit = /datum/outfit/piratecorpse
/datum/outfit/piratecorpse/ranged
name = "Corpse of a Pirate Gunner"
suit = /obj/item/clothing/suit/pirate_black
head = /obj/item/clothing/head/pirate
/obj/effect/mob_spawn/human/corpse/russian
code/modules/mob/living/simple_animal/hostile/alien_types.dm
+9
View File
@@ -35,6 +35,15 @@
death_sound = 'sound/voice/hiss6.ogg'
deathmessage = "lets out a waning guttural screech, green blood bubbling from its maw..."
footstep_type = FOOTSTEP_MOB_CLAW
loot = list(/obj/effect/decal/cleanable/blood/gibs/xeno/limb, /obj/effect/decal/cleanable/blood/gibs/xeno/core, /obj/effect/decal/cleanable/blood/xeno/splatter, /obj/effect/decal/cleanable/blood/gibs/xeno/body, /obj/effect/decal/cleanable/blood/gibs/xeno/down)
/mob/living/simple_animal/hostile/alien/ListTargetsLazy()
return ListTargets()
/mob/living/simple_animal/hostile/alien/Aggro()
. = ..()
if(target)
playsound(loc, 'sound/voice/hiss4.ogg', 70, TRUE)
/mob/living/simple_animal/hostile/alien/drone
name = "alien drone"
code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
+16 -6
View File
@@ -596,9 +596,9 @@ Difficulty: Medium
/mob/living/simple_animal/hostile/megafauna/dragon/space_dragon
name = "space dragon"
maxHealth = 250
health = 250
faction = list("neutral")
maxHealth = 1000
health = 1000
faction = list("carp")
desc = "A space carp turned dragon by vile magic. Has the same ferocity of a space carp, but also a much more enabling body."
icon = 'icons/mob/spacedragon.dmi'
icon_state = "spacedragon"
@@ -609,14 +609,18 @@ Difficulty: Medium
melee_damage_lower = 35
speed = 0
mouse_opacity = MOUSE_OPACITY_ICON
loot = list()
move_to_delay = 3
rapid = 2
crusher_loot = list()
butcher_results = list(/obj/item/stack/ore/diamond = 5, /obj/item/stack/sheet/sinew = 5, /obj/item/stack/sheet/bone = 30)
loot = list(/obj/effect/temp_visual/bsg_kaboom, /obj/effect/temp_visual/emp/cult, /obj/item/clothing/suit/hooded/carp_costume/dragon, /obj/item/gun/energy/kinetic_accelerator/experimental, /obj/effect/temp_visual/cult/portal)
butcher_results = list(/obj/item/stack/ore/diamond = 10, /obj/item/stack/sheet/bone = 30)
move_force = MOVE_FORCE_NORMAL
move_resist = MOVE_FORCE_NORMAL
pull_force = MOVE_FORCE_NORMAL
deathmessage = "screeches as its wings turn to dust and it collapses on the floor, life extinguished."
attack_action_types = list()
internal_gps = /obj/item/gps/internal/carp
death_sound = 'sound/creatures/spacedragondeath.ogg'
/mob/living/simple_animal/hostile/megafauna/dragon/space_dragon/Initialize(mapload)
var/datum/spell/aoe/repulse/spacedragon/repulse_action = new /datum/spell/aoe/repulse/spacedragon(src)
@@ -625,7 +629,7 @@ Difficulty: Medium
. = ..()
/mob/living/simple_animal/hostile/megafauna/dragon/space_dragon/proc/fire_stream(atom/at = target)
playsound(get_turf(src),'sound/magic/fireball.ogg', 200, TRUE)
playsound(get_turf(src),'sound/magic/magic_missile.ogg', 200, TRUE)
SLEEP_CHECK_DEATH(0)
var/range = 20
var/list/turfs = list()
@@ -661,6 +665,12 @@ Difficulty: Medium
/mob/living/simple_animal/hostile/megafauna/dragon/space_dragon/AltClickOn(atom/movable/A)
return
/obj/item/gps/internal/carp
icon_state = null
gpstag = "Corrupted Signal"
desc = "Fish and chips."
invisibility = 100
#undef DRAKE_SWOOP_HEIGHT
#undef DRAKE_SWOOP_DIRECTION_CHANGE_RANGE
#undef SWOOP_DAMAGEABLE
code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
+1 -1
View File
@@ -1,6 +1,6 @@
/mob/living/simple_animal/hostile/asteroid/hivelord
name = "hivelord"
desc = "A truly alien creature, it is a mass of unknown organic material, constantly fluctuating. When attacking, pieces of it split off and attack in tandem with the original."
desc = "A levitating swarm of tiny creatures which act as a single individual. When threatened or hunting they rapidly replicate additional short-lived bodies."
icon = 'icons/mob/lavaland/lavaland_monsters.dmi'
icon_state = "Hivelord"
icon_living = "Hivelord"
code/modules/mob/living/simple_animal/hostile/pirate.dm
+59 -14
View File
@@ -2,15 +2,16 @@
name = "Pirate"
desc = "Does what he wants cause a pirate is free."
icon = 'icons/mob/simple_human.dmi'
icon_state = "piratemelee"
icon_living = "piratemelee"
icon_state = "piratespace"
icon_living = "piratespace"
icon_dead = "piratemelee_dead" // Does not actually exist. del_on_death.
mob_biotypes = MOB_ORGANIC | MOB_HUMANOID
speak_chance = 0
turns_per_move = 5
speak_chance = 1
turns_per_move = 3
death_sound = 'sound/creatures/piratedeath.ogg'
response_help = "pushes the"
response_disarm = "shoves"
response_harm = "hits the"
response_harm = "slashes"
speed = 0
maxHealth = 100
health = 100
@@ -20,28 +21,72 @@
melee_damage_lower = 30
melee_damage_upper = 30
attacktext = "slashes"
attack_sound = 'sound/weapons/bladeslice.ogg'
attack_sound = 'sound/weapons/blade1.ogg'
minbodytemp = 0
atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 15
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
speak_emote = list("yarrs")
loot = list(/obj/effect/mob_spawn/human/corpse/pirate,
/obj/item/melee/energy/sword/pirate)
loot = list(/obj/item/melee/energy/sword/pirate,
/obj/item/clothing/head/helmet/space/pirate,
/obj/effect/mob_spawn/human/corpse/pirate,
/obj/effect/decal/cleanable/blood/innards,
/obj/effect/decal/cleanable/blood,
/obj/effect/gibspawner/generic,
/obj/effect/gibspawner/generic)
del_on_death = TRUE
faction = list("pirate")
sentience_type = SENTIENCE_OTHER
footstep_type = FOOTSTEP_MOB_SHOE
/mob/living/simple_animal/hostile/pirate/Initialize(mapload)
. = ..()
if(prob(50))
loot = list(/obj/item/clothing/head/helmet/space/pirate,
/obj/item/salvage/loot/pirate,
/obj/effect/mob_spawn/human/corpse/pirate,
/obj/effect/decal/cleanable/blood/innards,
/obj/effect/decal/cleanable/blood,
/obj/effect/gibspawner/generic,
/obj/effect/gibspawner/generic)
/mob/living/simple_animal/hostile/pirate/Process_Spacemove(movement_dir = 0)
return TRUE
/mob/living/simple_animal/hostile/pirate/ListTargetsLazy()
return ListTargets()
/mob/living/simple_animal/hostile/pirate/Aggro()
. = ..()
if(target)
playsound(loc, 'sound/creatures/pirateengage.ogg', 70, TRUE)
/mob/living/simple_animal/hostile/pirate/ranged
name = "Pirate Gunner"
icon_state = "pirateranged"
icon_living = "pirateranged"
icon_state = "piratespaceranged"
icon_living = "piratespaceranged"
icon_dead = "piratemelee_dead" // Does not actually exist. del_on_death.
projectilesound = 'sound/weapons/laser.ogg'
ranged = TRUE
rapid = 2
turns_per_move = 5
retreat_distance = 5
minimum_distance = 5
projectiletype = /obj/item/projectile/beam
loot = list(/obj/effect/mob_spawn/human/corpse/pirate/ranged,
/obj/item/gun/energy/laser)
loot = list(/obj/effect/mob_spawn/human/corpse/pirate,
/obj/item/gun/energy/laser,
/obj/item/clothing/head/helmet/space/pirate,
/obj/effect/decal/cleanable/blood/innards,
/obj/effect/decal/cleanable/blood,
/obj/effect/gibspawner/generic,
/obj/effect/gibspawner/generic)
/mob/living/simple_animal/hostile/pirate/ranged/Initialize(mapload)
. = ..()
if(prob(50))
loot = list(/obj/item/clothing/head/helmet/space/pirate,
/obj/item/salvage/loot/pirate,
/obj/effect/mob_spawn/human/corpse/pirate,
/obj/effect/decal/cleanable/blood/innards,
/obj/effect/decal/cleanable/blood,
/obj/effect/gibspawner/generic,
/obj/effect/gibspawner/generic)
code/modules/mob/living/simple_animal/hostile/russian.dm
+4 -2
View File
@@ -25,7 +25,8 @@
faction = list("russian")
status_flags = CANPUSH
loot = list(/obj/effect/mob_spawn/human/corpse/russian,
/obj/item/kitchen/knife)
/obj/item/kitchen/knife,
/obj/item/salvage/loot/russian)
del_on_death = TRUE
sentience_type = SENTIENCE_OTHER
footstep_type = FOOTSTEP_MOB_SHOE
@@ -42,5 +43,6 @@
/mob/living/simple_animal/hostile/russian/ranged/mosin
loot = list(/obj/effect/mob_spawn/human/corpse/russian/ranged,
/obj/item/gun/projectile/shotgun/boltaction)
/obj/item/gun/projectile/shotgun/boltaction,
/obj/item/salvage/loot/russian)
casingtype = /obj/item/ammo_casing/a762
code/modules/mob/living/simple_animal/hostile/syndicate_mobs.dm
+108 -30
View File
@@ -13,11 +13,11 @@
response_disarm = "shoves the"
response_harm = "hits the"
speed = 0
maxHealth = 100
health = 100
maxHealth = 150
health = 150
harm_intent_damage = 5
melee_damage_lower = 10
melee_damage_upper = 10
melee_damage_lower = 15
melee_damage_upper = 15
attacktext = "punches"
attack_sound = 'sound/weapons/punch1.ogg'
a_intent = INTENT_HARM
@@ -25,24 +25,43 @@
faction = list("syndicate")
check_friendly_fire = TRUE
status_flags = CANPUSH
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier)
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier,
/obj/effect/decal/cleanable/blood/innards,
/obj/effect/decal/cleanable/blood,
/obj/effect/gibspawner/generic,
/obj/effect/gibspawner/generic)
del_on_death = TRUE
sentience_type = SENTIENCE_OTHER
footstep_type = FOOTSTEP_MOB_SHOE
robust_searching = TRUE
/mob/living/simple_animal/hostile/syndicate/Initialize(mapload)
. = ..()
if(prob(50))
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier,
/obj/item/salvage/loot/syndicate,
/obj/effect/decal/cleanable/blood/innards,
/obj/effect/decal/cleanable/blood,
/obj/effect/gibspawner/generic,
/obj/effect/gibspawner/generic)
/mob/living/simple_animal/hostile/syndicate/Aggro()
. = ..()
if(target)
playsound(loc, 'sound/misc/for_the_syndicate.ogg', 70, TRUE)
///////////////Sword and shield////////////
/mob/living/simple_animal/hostile/syndicate/melee
melee_damage_lower = 20
melee_damage_lower = 30
melee_damage_upper = 25
icon_state = "syndicate_sword"
icon_living = "syndicate_sword"
attacktext = "slashes"
attack_sound = 'sound/weapons/bladeslice.ogg'
attack_sound = 'sound/weapons/blade1.ogg'
armour_penetration_percentage = 40
armour_penetration_flat = 10
status_flags = 0
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier, /obj/item/melee/energy/sword/saber/red, /obj/item/shield/energy)
var/melee_block_chance = 20
var/ranged_block_chance = 35
@@ -61,7 +80,7 @@
return
adjustHealth(damage)
visible_message("<span class='boldwarning'>[src] has been attacked with [O] by [user].</span>")
playsound(loc, O.hitsound, 25, 1, -1)
playsound(loc, O.hitsound, 25, TRUE, -1)
else
to_chat(usr, "<span class='warning'>This weapon is ineffective, it does no damage.</span>")
visible_message("<span class='warning'>[user] gently taps [src] with [O].</span>")
@@ -78,7 +97,12 @@
return 0
/mob/living/simple_animal/hostile/syndicate/melee/autogib
loot = list()//no loot, its gonna delete and gib.
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier,
/obj/item/salvage/loot/syndicate,
/obj/effect/decal/cleanable/blood/innards,
/obj/effect/decal/cleanable/blood,
/obj/effect/gibspawner/generic,
/obj/effect/gibspawner/generic)
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot
name = "Syndicate Operative"
@@ -124,7 +148,7 @@
if(!seen_enemy)
seen_enemy = TRUE
if(!ranged)
playsound(loc, 'sound/weapons/saberon.ogg', 35, 1)
playsound(loc, 'sound/weapons/saberon.ogg', 35, TRUE)
if(alert_on_shield_breach)
if(length(depotarea.shield_list))
raise_alert("[name] reports that [target] is trying to breach the armory shield!")
@@ -186,7 +210,7 @@
scan_cycles++
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/AIShouldSleep(list/possible_targets)
FindTarget(possible_targets, 1)
FindTarget(possible_targets, TRUE)
return FALSE
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/proc/raise_alert(reason)
@@ -195,6 +219,14 @@
say("Intruder!")
depotarea.increase_alert(reason)
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/drop_loot()
// If a depot syndicate dies after the depot has been destroyed, assume it
// was gibbed as part of the destruction and don't drop its loot.
if(istype(depotarea) && depotarea.destroyed)
return
return ..()
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/death()
if(!istype(depotarea))
return ..()
@@ -230,22 +262,20 @@
. = ..()
if(prob(50))
// 50% chance of switching to ranged variant.
// Designed to counter players taking cover behind reinforced plasmasglass.
// Does almost no danage in melee, but decent damage at range, and its shots go through glass.
melee_damage_lower = 10
melee_damage_upper = 10
melee_damage_lower = 30
melee_damage_upper = 25
attacktext = "punches"
attack_sound = 'sound/weapons/punch1.ogg'
attack_sound = 'sound/weapons/cqchit1.ogg'
ranged = TRUE
rapid = 3
retreat_distance = 3
retreat_distance = 5
minimum_distance = 3
melee_block_chance = 0
ranged_block_chance = 0
icon_state = "syndicate_pistol"
icon_living = "syndicate_pistol"
projectiletype = /obj/item/projectile/beam/laser
projectilesound = 'sound/weapons/laser.ogg'
projectiletype = /obj/item/projectile/bullet/armourpiercing
projectilesound = 'sound/weapons/gunshots/gunshot_pistol.ogg'
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/armory
name = "Syndicate Quartermaster"
@@ -257,6 +287,8 @@
health = 200
melee_block_chance = 40
alert_on_shield_breach = TRUE
death_sound = 'sound/mecha/mechmove03.ogg'
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatequartermaster, /obj/effect/decal/cleanable/blood/innards, /obj/effect/decal/cleanable/blood, /obj/effect/gibspawner/generic, /obj/effect/gibspawner/generic)
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/armory/Initialize(mapload)
. = ..()
@@ -267,14 +299,21 @@
attacktext = "punches"
attack_sound = 'sound/weapons/punch1.ogg'
ranged = TRUE
retreat_distance = 3
minimum_distance = 3
retreat_distance = 2
minimum_distance = 2
melee_block_chance = 0
ranged_block_chance = 0
icon_state = "syndicate_stormtrooper_shotgun"
icon_living = "syndicate_stormtrooper_shotgun"
speed = 2
projectiletype = /obj/item/projectile/bullet/sniper/penetrator // Ignores cover.
projectilesound = 'sound/weapons/gunshots/gunshot_sniper.ogg'
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatequartermaster,
/obj/item/salvage/loot/syndicate,
/obj/effect/decal/cleanable/blood/innards,
/obj/effect/decal/cleanable/blood,
/obj/effect/gibspawner/generic,
/obj/effect/gibspawner/generic)
return INITIALIZE_HINT_LATELOAD
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/armory/LateInitialize()
@@ -297,11 +336,17 @@
speed = 1
wander = FALSE
alert_on_spacing = FALSE
death_sound = 'sound/mecha/mechmove03.ogg'
loot = list() // Explodes, doesn't drop loot.
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/space/Process_Spacemove(movement_dir = 0)
return TRUE
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/space/death()
visible_message("<span class='warning'>[src] explodes!</span>")
playsound(loc, 'sound/items/timer.ogg', 30, FALSE)
explosion(src, 0, 4, 4, flame_range = 2, adminlog = FALSE)
qdel(src)
/mob/living/simple_animal/hostile/syndicate/melee/space
name = "Syndicate Commando"
@@ -309,12 +354,26 @@
minbodytemp = 0
icon_state = "syndicate_space_sword"
icon_living = "syndicate_space_sword"
speed = 1
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatecommando, /obj/item/melee/energy/sword/saber/red, /obj/item/shield/energy)
speed = 1.5
death_sound = 'sound/mecha/mechmove03.ogg'
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatecommando,
/obj/item/salvage/loot/syndicate,
/obj/effect/decal/cleanable/blood/innards,
/obj/effect/decal/cleanable/blood,
/obj/effect/gibspawner/generic,
/obj/effect/gibspawner/generic)
/mob/living/simple_animal/hostile/syndicate/melee/space/Process_Spacemove(movement_dir = 0)
return TRUE
/mob/living/simple_animal/hostile/syndicate/melee/space/Initialize(mapload)
. = ..()
if(prob(50))
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatecommando,
/obj/effect/decal/cleanable/blood/innards,
/obj/effect/decal/cleanable/blood,
/obj/effect/gibspawner/generic,
/obj/effect/gibspawner/generic)
/mob/living/simple_animal/hostile/syndicate/ranged
ranged = TRUE
@@ -325,22 +384,41 @@
icon_living = "syndicate_smg"
projectilesound = 'sound/weapons/gunshots/gunshot.ogg'
casingtype = /obj/item/ammo_casing/c45
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier, /obj/item/gun/projectile/automatic/c20r)
/mob/living/simple_animal/hostile/syndicate/ranged/space
icon_state = "syndicate_space_smg"
icon_living = "syndicate_space_smg"
name = "Syndicate Commando"
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
speed = 1
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatecommando, /obj/item/gun/projectile/automatic/c20r)
speed = 1.5
death_sound = 'sound/mecha/mechmove03.ogg'
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatecommando,
/obj/item/salvage/loot/syndicate,
/obj/effect/decal/cleanable/blood/innards,
/obj/effect/decal/cleanable/blood,
/obj/effect/gibspawner/generic,
/obj/effect/gibspawner/generic)
/mob/living/simple_animal/hostile/syndicate/ranged/space/Initialize(mapload)
. = ..()
if(prob(50))
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatecommando,
/obj/effect/decal/cleanable/blood/innards,
/obj/effect/decal/cleanable/blood,
/obj/effect/gibspawner/generic,
/obj/effect/gibspawner/generic)
/mob/living/simple_animal/hostile/syndicate/ranged/space/Process_Spacemove(movement_dir = 0)
return TRUE
/mob/living/simple_animal/hostile/syndicate/ranged/space/autogib
loot = list()//gonna gibe, no loot.
loot = list(/obj/item/salvage/loot/syndicate,
/obj/effect/mob_spawn/human/corpse/syndicatecommando,
/obj/effect/decal/cleanable/blood/innards,
/obj/effect/decal/cleanable/blood,
/obj/effect/gibspawner/generic,
/obj/effect/gibspawner/generic)
/mob/living/simple_animal/hostile/viscerator
name = "viscerator"
code/modules/mod/mod_types.dm
+8
View File
@@ -45,6 +45,14 @@
/obj/item/mod/module/flashlight,
)
/obj/item/mod/control/pre_equipped/standard/explorer
applied_modules = list(
/obj/item/mod/module/storage/large_capacity,
/obj/item/mod/module/welding,
/obj/item/mod/module/flashlight,
/obj/item/mod/module/jetpack
)
/obj/item/mod/control/pre_equipped/engineering
theme = /datum/mod_theme/engineering
applied_modules = list(
code/modules/pda/messenger_plugins.dm
-1
View File
@@ -4,7 +4,6 @@
/datum/data/pda/messenger_plugin/proc/user_act(mob/user as mob, obj/item/pda/P)
return
/datum/data/pda/messenger_plugin/virus
name = "*Send Virus*"
code/modules/pda/pdas.dm
+3
View File
@@ -133,6 +133,9 @@
/obj/item/pda/shaftminer
icon_state = "pda-miner"
/obj/item/pda/explorer
icon_state = "pda-exp"
/obj/item/pda/syndicate
default_cartridge = /obj/item/cartridge/syndicate/nuclear
icon_state = "pda-syndi"
code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+12
View File
@@ -269,6 +269,18 @@
K.color = color
/obj/item/gun/energy/kinetic_accelerator/pistol
name = "proto-kinetic pistol"
desc = "A lightweight mining tool, sacrificing upgrade capacity for convenience."
icon_state = "kineticgun_p"
item_state = "gun"
w_class = WEIGHT_CLASS_SMALL
max_mod_capacity = 65
can_bayonet = FALSE
can_flashlight = FALSE
can_holster = TRUE
//Modkits
/obj/item/borg/upgrade/modkit
name = "kinetic accelerator modification kit"
code/modules/research/designs/machine_designs.dm
+18 -8
View File
@@ -518,7 +518,7 @@
id = "ore_redemption"
req_tech = list("programming" = 2, "engineering" = 2, "plasmatech" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS=1000)
materials = list(MAT_GLASS = 1000)
build_path = /obj/item/circuitboard/ore_redemption
category = list ("Misc. Machinery")
@@ -528,17 +528,27 @@
id = "mining_equipment_vendor"
req_tech = list("engineering" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS=1000)
materials = list(MAT_GLASS = 1000)
build_path = /obj/item/circuitboard/mining_equipment_vendor
category = list ("Misc. Machinery")
/datum/design/explorer_equipment_vendor
name = "Machine Design (Explorer Rewards Vendor Board)"
desc = "The circuit board for an Explorer Rewards Vendor."
id = "explorer_equipment_vendor"
req_tech = list("engineering" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000)
build_path = /obj/item/circuitboard/mining_equipment_vendor/explorer
category = list ("Misc. Machinery")
/datum/design/clawgame
name = "Machine Design (Claw Game Board)"
desc = "The circuit board for a Claw Game."
id = "clawgame"
req_tech = list("programming" = 1)
build_type = IMPRINTER
materials = list(MAT_GLASS=1000)
materials = list(MAT_GLASS = 1000)
build_path = /obj/item/circuitboard/clawgame
category = list ("Misc. Machinery")
@@ -548,7 +558,7 @@
id = "prize_counter"
req_tech = list("programming" = 2, "materials" = 2)
build_type = IMPRINTER
materials = list(MAT_GLASS=1000)
materials = list(MAT_GLASS = 1000)
build_path = /obj/item/circuitboard/prize_counter
category = list("Misc. Machinery")
@@ -558,7 +568,7 @@
id = "gameboard"
req_tech = list("programming" = 2)
build_type = IMPRINTER
materials = list(MAT_GLASS=1000)
materials = list(MAT_GLASS = 1000)
build_path = /obj/item/circuitboard/gameboard
category = list("Misc. Machinery")
@@ -568,7 +578,7 @@
id = "plantgenes"
req_tech = list("programming" = 4, "biotech" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS=1000)
materials = list(MAT_GLASS = 1000)
build_path = /obj/item/circuitboard/plantgenes
category = list("Hydroponics Machinery")
@@ -578,7 +588,7 @@
id = "slotmachine"
req_tech = list("programming" = 2)
build_type = IMPRINTER
materials = list(MAT_GLASS=1000)
materials = list(MAT_GLASS = 1000)
build_path = /obj/item/circuitboard/slot_machine
category = list("Misc. Machinery")
@@ -588,6 +598,6 @@
id = "bottlers"
req_tech = list("programming" = 2)
build_type = IMPRINTER
materials = list(MAT_GLASS=1000)
materials = list(MAT_GLASS = 1000)
build_path = /obj/item/circuitboard/bottler
category = list("Misc. Machinery")
code/modules/shuttle/supply.dm
+28
View File
@@ -808,6 +808,34 @@
if(istype(AM.loc, /obj/mecha/working))
return COMSIG_CARGO_SELL_SKIP
/datum/economy/simple_seller/explorer_salvage
var/list/salvage_counts = list()
/datum/economy/simple_seller/explorer_salvage/begin_sell(obj/docking_port/mobile/supply/S)
LAZYCLEARLIST(salvage_counts)
/datum/economy/simple_seller/explorer_salvage/check_sell(obj/docking_port/mobile/supply/S, atom/movable/AM)
if(istype(AM, /obj/item/salvage))
return COMSIG_CARGO_SELL_NORMAL
/datum/economy/simple_seller/explorer_salvage/sell_normal(obj/docking_port/mobile/supply/S, atom/movable/AM, datum/economy/cargo_shuttle_manifest/manifest)
if(!..())
return
salvage_counts[AM.name]++
/datum/economy/simple_seller/explorer_salvage/end_sell(obj/docking_port/mobile/supply/S, datum/economy/cargo_shuttle_manifest/manifest)
if(!salvage_counts)
return
for(var/salvage_name in salvage_counts)
var/datum/economy/line_item/item = new
item.account = SSeconomy.cargo_account
var/count = salvage_counts[salvage_name]
item.credits = count * SSeconomy.credits_per_salvage
item.reason = "Received [count] haul(s) of [salvage_name]."
manifest.line_items += item
SSblackbox.record_feedback("nested tally", "cargo salvage sold", count, list(salvage_name, "count"))
SSblackbox.record_feedback("nested tally", "cargo salvage sold", item.credits, list(salvage_name, "credits"))
/datum/economy/cargo_shuttle_manifest
var/list/items_to_sell = list()
code/modules/supply/supply_packs/pack_miscellaneous.dm
+2 -1
View File
@@ -522,7 +522,8 @@
/datum/supply_packs/misc/vending/clothingvendor/cargo
name = "Cargo Clothing Vendors Crate"
cost = 50
contains = list(/obj/item/vending_refill/cargodrobe)
contains = list(/obj/item/vending_refill/cargodrobe,
/obj/item/vending_refill/exploredrobe)
containername = "cargo clothing vendor crate"
///////////// Station Goals

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