mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 11:37:40 +01:00
* 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>
825 lines
4.7 KiB
Plaintext
825 lines
4.7 KiB
Plaintext
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
|
|
"a" = (
|
|
/turf/template_noop,
|
|
/area/template_noop)
|
|
"b" = (
|
|
/obj/item/stack/rods,
|
|
/turf/simulated/floor/plating/damaged/airless,
|
|
/area/template_noop)
|
|
"c" = (
|
|
/obj/item/trash/popcorn,
|
|
/turf/space,
|
|
/area/template_noop)
|
|
"d" = (
|
|
/obj/effect/spawner/random_spawners/wall_rusted_maybe,
|
|
/turf/space,
|
|
/area/template_noop)
|
|
"e" = (
|
|
/obj/item/poster/random_contraband,
|
|
/turf/space,
|
|
/area/template_noop)
|
|
"f" = (
|
|
/obj/structure/lattice,
|
|
/obj/item/stack/sheet/metal,
|
|
/turf/space,
|
|
/area/template_noop)
|
|
"g" = (
|
|
/obj/item/paperplane,
|
|
/turf/space,
|
|
/area/template_noop)
|
|
"h" = (
|
|
/obj/item/trash/can,
|
|
/turf/space,
|
|
/area/template_noop)
|
|
"i" = (
|
|
/obj/item/stack/rods,
|
|
/turf/template_noop,
|
|
/area/template_noop)
|
|
"k" = (
|
|
/obj/item/shard,
|
|
/turf/space,
|
|
/area/template_noop)
|
|
"l" = (
|
|
/obj/item/stack/cable_coil{
|
|
amount = 10
|
|
},
|
|
/turf/space,
|
|
/area/template_noop)
|
|
"m" = (
|
|
/turf/simulated/wall,
|
|
/area/template_noop)
|
|
"n" = (
|
|
/obj/item/stack/sheet/glass,
|
|
/turf/space,
|
|
/area/template_noop)
|
|
"p" = (
|
|
/obj/random/plushie,
|
|
/turf/space,
|
|
/area/template_noop)
|
|
"q" = (
|
|
/obj/item/stack/rods,
|
|
/obj/item/stack/sheet/metal,
|
|
/turf/space,
|
|
/area/template_noop)
|
|
"t" = (
|
|
/obj/machinery/computer/arcade/battle,
|
|
/turf/simulated/floor/plasteel/airless,
|
|
/area/template_noop)
|
|
"u" = (
|
|
/obj/random/tool,
|
|
/turf/space,
|
|
/area/template_noop)
|
|
"v" = (
|
|
/obj/item/trash/syndi_cakes,
|
|
/turf/space,
|
|
/area/template_noop)
|
|
"w" = (
|
|
/obj/item/stack/tickets,
|
|
/turf/space,
|
|
/area/template_noop)
|
|
"x" = (
|
|
/obj/structure/bookcase/random,
|
|
/turf/simulated/floor/plating/damaged/airless,
|
|
/area/template_noop)
|
|
"z" = (
|
|
/turf/simulated/floor/plating/damaged/airless,
|
|
/area/template_noop)
|
|
"A" = (
|
|
/turf/space,
|
|
/area/template_noop)
|
|
"B" = (
|
|
/obj/item/stack/rods,
|
|
/turf/space,
|
|
/area/template_noop)
|
|
"D" = (
|
|
/obj/item/paper,
|
|
/obj/item/paper,
|
|
/turf/space,
|
|
/area/template_noop)
|
|
"F" = (
|
|
/obj/random/tool,
|
|
/turf/simulated/floor/plating/damaged/airless,
|
|
/area/template_noop)
|
|
"G" = (
|
|
/obj/item/poster/random_official,
|
|
/turf/space,
|
|
/area/template_noop)
|
|
"H" = (
|
|
/obj/item/stack/sheet/wood,
|
|
/turf/space,
|
|
/area/template_noop)
|
|
"I" = (
|
|
/obj/item/stack/rods,
|
|
/obj/item/stack/rods,
|
|
/turf/space,
|
|
/area/template_noop)
|
|
"J" = (
|
|
/obj/item/trash/pistachios,
|
|
/turf/space,
|
|
/area/template_noop)
|
|
"K" = (
|
|
/obj/structure/lattice,
|
|
/obj/structure/girder,
|
|
/turf/space,
|
|
/area/template_noop)
|
|
"L" = (
|
|
/obj/structure/girder,
|
|
/turf/space,
|
|
/area/template_noop)
|
|
"M" = (
|
|
/obj/item/stack/sheet/metal,
|
|
/turf/space,
|
|
/area/template_noop)
|
|
"O" = (
|
|
/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,
|
|
/area/template_noop)
|
|
"U" = (
|
|
/obj/item/stack/sheet/wood,
|
|
/obj/item/stack/sheet/wood,
|
|
/turf/space,
|
|
/area/template_noop)
|
|
"V" = (
|
|
/obj/item/circuitboard/arcade,
|
|
/turf/space,
|
|
/area/template_noop)
|
|
"W" = (
|
|
/obj/item/stack/tickets,
|
|
/obj/item/stack/tickets,
|
|
/obj/item/stack/tickets,
|
|
/turf/space,
|
|
/area/template_noop)
|
|
"Z" = (
|
|
/obj/item/paper,
|
|
/turf/space,
|
|
/area/template_noop)
|
|
|
|
(1,1,1) = {"
|
|
a
|
|
a
|
|
a
|
|
i
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
"}
|
|
(2,1,1) = {"
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
i
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
i
|
|
a
|
|
a
|
|
a
|
|
"}
|
|
(3,1,1) = {"
|
|
a
|
|
a
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
a
|
|
a
|
|
"}
|
|
(4,1,1) = {"
|
|
a
|
|
a
|
|
A
|
|
B
|
|
A
|
|
B
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
B
|
|
B
|
|
A
|
|
A
|
|
a
|
|
a
|
|
"}
|
|
(5,1,1) = {"
|
|
i
|
|
a
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
w
|
|
A
|
|
M
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
a
|
|
i
|
|
"}
|
|
(6,1,1) = {"
|
|
a
|
|
a
|
|
A
|
|
A
|
|
I
|
|
A
|
|
B
|
|
A
|
|
A
|
|
B
|
|
B
|
|
M
|
|
A
|
|
A
|
|
M
|
|
A
|
|
A
|
|
A
|
|
a
|
|
a
|
|
"}
|
|
(7,1,1) = {"
|
|
a
|
|
a
|
|
A
|
|
A
|
|
k
|
|
A
|
|
A
|
|
O
|
|
A
|
|
A
|
|
A
|
|
A
|
|
m
|
|
A
|
|
w
|
|
A
|
|
M
|
|
A
|
|
a
|
|
a
|
|
"}
|
|
(8,1,1) = {"
|
|
a
|
|
a
|
|
A
|
|
B
|
|
A
|
|
M
|
|
A
|
|
A
|
|
H
|
|
A
|
|
G
|
|
n
|
|
m
|
|
A
|
|
A
|
|
B
|
|
A
|
|
A
|
|
a
|
|
a
|
|
"}
|
|
(9,1,1) = {"
|
|
a
|
|
a
|
|
A
|
|
A
|
|
m
|
|
A
|
|
w
|
|
A
|
|
M
|
|
S
|
|
A
|
|
A
|
|
d
|
|
B
|
|
M
|
|
A
|
|
O
|
|
A
|
|
a
|
|
a
|
|
"}
|
|
(10,1,1) = {"
|
|
a
|
|
a
|
|
A
|
|
w
|
|
A
|
|
A
|
|
Z
|
|
A
|
|
W
|
|
B
|
|
S
|
|
h
|
|
M
|
|
L
|
|
A
|
|
c
|
|
A
|
|
A
|
|
a
|
|
a
|
|
"}
|
|
(11,1,1) = {"
|
|
a
|
|
i
|
|
B
|
|
w
|
|
A
|
|
S
|
|
A
|
|
F
|
|
A
|
|
A
|
|
S
|
|
A
|
|
Z
|
|
A
|
|
A
|
|
A
|
|
M
|
|
A
|
|
a
|
|
a
|
|
"}
|
|
(12,1,1) = {"
|
|
a
|
|
a
|
|
A
|
|
A
|
|
A
|
|
A
|
|
H
|
|
L
|
|
S
|
|
m
|
|
m
|
|
b
|
|
A
|
|
A
|
|
Z
|
|
w
|
|
B
|
|
A
|
|
i
|
|
a
|
|
"}
|
|
(13,1,1) = {"
|
|
a
|
|
a
|
|
A
|
|
A
|
|
B
|
|
O
|
|
Q
|
|
B
|
|
A
|
|
M
|
|
A
|
|
D
|
|
K
|
|
z
|
|
S
|
|
H
|
|
B
|
|
A
|
|
a
|
|
a
|
|
"}
|
|
(14,1,1) = {"
|
|
a
|
|
a
|
|
A
|
|
n
|
|
A
|
|
A
|
|
f
|
|
B
|
|
A
|
|
z
|
|
B
|
|
A
|
|
m
|
|
t
|
|
A
|
|
A
|
|
A
|
|
A
|
|
a
|
|
a
|
|
"}
|
|
(15,1,1) = {"
|
|
a
|
|
a
|
|
A
|
|
A
|
|
z
|
|
H
|
|
A
|
|
A
|
|
Q
|
|
S
|
|
A
|
|
q
|
|
z
|
|
z
|
|
A
|
|
A
|
|
O
|
|
A
|
|
a
|
|
a
|
|
"}
|
|
(16,1,1) = {"
|
|
a
|
|
a
|
|
A
|
|
A
|
|
S
|
|
A
|
|
S
|
|
U
|
|
B
|
|
B
|
|
A
|
|
A
|
|
S
|
|
A
|
|
M
|
|
B
|
|
u
|
|
A
|
|
a
|
|
i
|
|
"}
|
|
(17,1,1) = {"
|
|
a
|
|
a
|
|
A
|
|
M
|
|
H
|
|
w
|
|
Z
|
|
B
|
|
x
|
|
S
|
|
B
|
|
S
|
|
A
|
|
k
|
|
J
|
|
A
|
|
A
|
|
A
|
|
a
|
|
a
|
|
"}
|
|
(18,1,1) = {"
|
|
a
|
|
a
|
|
B
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
w
|
|
B
|
|
z
|
|
A
|
|
O
|
|
A
|
|
M
|
|
A
|
|
A
|
|
a
|
|
a
|
|
"}
|
|
(19,1,1) = {"
|
|
i
|
|
a
|
|
A
|
|
A
|
|
M
|
|
z
|
|
S
|
|
w
|
|
S
|
|
M
|
|
A
|
|
m
|
|
p
|
|
A
|
|
A
|
|
B
|
|
A
|
|
A
|
|
a
|
|
a
|
|
"}
|
|
(20,1,1) = {"
|
|
a
|
|
a
|
|
A
|
|
B
|
|
A
|
|
O
|
|
H
|
|
v
|
|
A
|
|
V
|
|
H
|
|
A
|
|
B
|
|
L
|
|
A
|
|
M
|
|
A
|
|
w
|
|
a
|
|
a
|
|
"}
|
|
(21,1,1) = {"
|
|
a
|
|
a
|
|
A
|
|
A
|
|
A
|
|
A
|
|
e
|
|
M
|
|
A
|
|
w
|
|
Z
|
|
w
|
|
B
|
|
A
|
|
w
|
|
A
|
|
A
|
|
A
|
|
a
|
|
a
|
|
"}
|
|
(22,1,1) = {"
|
|
a
|
|
a
|
|
A
|
|
A
|
|
M
|
|
O
|
|
m
|
|
m
|
|
L
|
|
A
|
|
B
|
|
A
|
|
A
|
|
q
|
|
A
|
|
A
|
|
A
|
|
A
|
|
a
|
|
a
|
|
"}
|
|
(23,1,1) = {"
|
|
a
|
|
a
|
|
A
|
|
B
|
|
k
|
|
A
|
|
B
|
|
A
|
|
B
|
|
g
|
|
n
|
|
A
|
|
O
|
|
A
|
|
A
|
|
B
|
|
B
|
|
A
|
|
a
|
|
a
|
|
"}
|
|
(24,1,1) = {"
|
|
a
|
|
a
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
M
|
|
A
|
|
A
|
|
l
|
|
A
|
|
w
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
a
|
|
a
|
|
"}
|
|
(25,1,1) = {"
|
|
a
|
|
a
|
|
A
|
|
w
|
|
B
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
B
|
|
A
|
|
A
|
|
A
|
|
w
|
|
A
|
|
A
|
|
a
|
|
a
|
|
"}
|
|
(26,1,1) = {"
|
|
a
|
|
a
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
B
|
|
A
|
|
B
|
|
A
|
|
A
|
|
B
|
|
A
|
|
B
|
|
A
|
|
A
|
|
a
|
|
a
|
|
"}
|
|
(27,1,1) = {"
|
|
a
|
|
a
|
|
B
|
|
A
|
|
w
|
|
A
|
|
B
|
|
A
|
|
w
|
|
A
|
|
B
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
w
|
|
a
|
|
a
|
|
"}
|
|
(28,1,1) = {"
|
|
a
|
|
a
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
w
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
A
|
|
a
|
|
i
|
|
"}
|
|
(29,1,1) = {"
|
|
i
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
i
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
"}
|
|
(30,1,1) = {"
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
i
|
|
a
|
|
a
|
|
"}
|