mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 03:57:13 +01:00
5a68c5f6d3
* 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>
309 lines
3.9 KiB
Plaintext
309 lines
3.9 KiB
Plaintext
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
|
|
"a" = (
|
|
/turf/template_noop,
|
|
/area/template_noop)
|
|
"b" = (
|
|
/turf/simulated/wall/mineral/plastitanium,
|
|
/area/ruin/space/powered)
|
|
"e" = (
|
|
/obj/structure/shuttle/engine/propulsion{
|
|
dir = 8
|
|
},
|
|
/turf/simulated/floor/plating/airless,
|
|
/area/ruin/space/powered)
|
|
"f" = (
|
|
/obj/structure/window/reinforced{
|
|
dir = 4
|
|
},
|
|
/obj/structure/shuttle/engine/heater{
|
|
dir = 8
|
|
},
|
|
/turf/simulated/floor/plating/airless,
|
|
/area/ruin/space/powered)
|
|
"g" = (
|
|
/obj/structure/table/wood,
|
|
/obj/item/clothing/under/pants/shorts/black,
|
|
/turf/simulated/floor/mineral/titanium/purple,
|
|
/area/ruin/space/powered)
|
|
"h" = (
|
|
/turf/simulated/floor/mineral/titanium/purple,
|
|
/area/ruin/space/powered)
|
|
"i" = (
|
|
/obj/structure/table,
|
|
/obj/item/flashlight/lamp,
|
|
/obj/machinery/light{
|
|
dir = 1
|
|
},
|
|
/turf/simulated/floor/mineral/titanium/purple,
|
|
/area/ruin/space/powered)
|
|
"j" = (
|
|
/obj/structure/closet,
|
|
/turf/simulated/floor/mineral/titanium/purple,
|
|
/area/ruin/space/powered)
|
|
"k" = (
|
|
/obj/machinery/economy/vending/assist/free,
|
|
/turf/simulated/floor/mineral/titanium/purple,
|
|
/area/ruin/space/powered)
|
|
"l" = (
|
|
/obj/structure/table/wood,
|
|
/obj/item/clothing/shoes/sandal,
|
|
/turf/simulated/floor/mineral/titanium/purple,
|
|
/area/ruin/space/powered)
|
|
"m" = (
|
|
/obj/machinery/light{
|
|
dir = 8
|
|
},
|
|
/turf/simulated/floor/mineral/titanium/purple,
|
|
/area/ruin/space/powered)
|
|
"n" = (
|
|
/obj/structure/table/wood,
|
|
/turf/simulated/floor/mineral/titanium/purple,
|
|
/area/ruin/space/powered)
|
|
"o" = (
|
|
/obj/structure/table/wood,
|
|
/obj/machinery/computer/library,
|
|
/turf/simulated/floor/mineral/titanium/purple,
|
|
/area/ruin/space/powered)
|
|
"p" = (
|
|
/obj/effect/spawner/window/reinforced,
|
|
/turf/simulated/floor/plating,
|
|
/area/ruin/space/powered)
|
|
"r" = (
|
|
/obj/structure/table,
|
|
/obj/item/paper_bin,
|
|
/obj/item/pen,
|
|
/turf/simulated/floor/mineral/titanium/purple,
|
|
/area/ruin/space/powered)
|
|
"s" = (
|
|
/obj/machinery/door/poddoor{
|
|
id_tag = "strange ship";
|
|
name = "Strange Ship Blast Door"
|
|
},
|
|
/turf/simulated/floor/mineral/titanium/purple,
|
|
/area/ruin/space/powered)
|
|
"t" = (
|
|
/obj/machinery/door/airlock/external,
|
|
/turf/simulated/floor/mineral/titanium/purple,
|
|
/area/ruin/space/powered)
|
|
"u" = (
|
|
/obj/machinery/door/airlock/public/glass,
|
|
/turf/simulated/floor/mineral/titanium/purple,
|
|
/area/ruin/space/powered)
|
|
"v" = (
|
|
/obj/structure/chair/comfy/shuttle{
|
|
dir = 4
|
|
},
|
|
/turf/simulated/floor/mineral/titanium/purple,
|
|
/area/ruin/space/powered)
|
|
"w" = (
|
|
/obj/structure/table,
|
|
/obj/item/paper,
|
|
/obj/item/pen,
|
|
/turf/simulated/floor/mineral/titanium/purple,
|
|
/area/ruin/space/powered)
|
|
"x" = (
|
|
/obj/machinery/door_control{
|
|
id = "strange ship";
|
|
name = "Strange Ship Door Control";
|
|
pixel_x = 6
|
|
},
|
|
/turf/simulated/wall/mineral/plastitanium,
|
|
/area/ruin/space/powered)
|
|
"y" = (
|
|
/obj/machinery/light,
|
|
/turf/simulated/floor/mineral/titanium/purple,
|
|
/area/ruin/space/powered)
|
|
"z" = (
|
|
/mob/living/simple_animal/bot/medbot,
|
|
/turf/simulated/floor/mineral/titanium/purple,
|
|
/area/ruin/space/powered)
|
|
"B" = (
|
|
/obj/structure/chair/comfy/shuttle,
|
|
/turf/simulated/floor/mineral/titanium/purple,
|
|
/area/ruin/space/powered)
|
|
"D" = (
|
|
/obj/machinery/light,
|
|
/obj/structure/bed,
|
|
/turf/simulated/floor/mineral/titanium/purple,
|
|
/area/ruin/space/powered)
|
|
"Q" = (
|
|
/obj/structure/table/wood,
|
|
/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
|
|
a
|
|
a
|
|
b
|
|
b
|
|
s
|
|
x
|
|
b
|
|
a
|
|
a
|
|
a
|
|
"}
|
|
(2,1,1) = {"
|
|
a
|
|
e
|
|
e
|
|
b
|
|
n
|
|
h
|
|
h
|
|
b
|
|
e
|
|
e
|
|
a
|
|
"}
|
|
(3,1,1) = {"
|
|
b
|
|
f
|
|
f
|
|
b
|
|
o
|
|
h
|
|
y
|
|
b
|
|
f
|
|
f
|
|
b
|
|
"}
|
|
(4,1,1) = {"
|
|
b
|
|
g
|
|
l
|
|
b
|
|
p
|
|
t
|
|
p
|
|
b
|
|
B
|
|
n
|
|
b
|
|
"}
|
|
(5,1,1) = {"
|
|
b
|
|
h
|
|
h
|
|
b
|
|
h
|
|
h
|
|
z
|
|
b
|
|
h
|
|
R
|
|
b
|
|
"}
|
|
(6,1,1) = {"
|
|
b
|
|
i
|
|
h
|
|
m
|
|
h
|
|
h
|
|
h
|
|
m
|
|
h
|
|
D
|
|
b
|
|
"}
|
|
(7,1,1) = {"
|
|
b
|
|
j
|
|
h
|
|
h
|
|
h
|
|
h
|
|
h
|
|
h
|
|
h
|
|
h
|
|
b
|
|
"}
|
|
(8,1,1) = {"
|
|
b
|
|
k
|
|
h
|
|
h
|
|
h
|
|
h
|
|
h
|
|
h
|
|
h
|
|
j
|
|
b
|
|
"}
|
|
(9,1,1) = {"
|
|
b
|
|
b
|
|
b
|
|
b
|
|
p
|
|
u
|
|
p
|
|
b
|
|
b
|
|
b
|
|
b
|
|
"}
|
|
(10,1,1) = {"
|
|
a
|
|
a
|
|
b
|
|
m
|
|
h
|
|
h
|
|
h
|
|
m
|
|
b
|
|
a
|
|
a
|
|
"}
|
|
(11,1,1) = {"
|
|
a
|
|
a
|
|
b
|
|
h
|
|
h
|
|
v
|
|
h
|
|
h
|
|
b
|
|
a
|
|
a
|
|
"}
|
|
(12,1,1) = {"
|
|
a
|
|
a
|
|
b
|
|
j
|
|
r
|
|
w
|
|
Q
|
|
j
|
|
b
|
|
a
|
|
a
|
|
"}
|
|
(13,1,1) = {"
|
|
a
|
|
a
|
|
b
|
|
b
|
|
b
|
|
b
|
|
b
|
|
b
|
|
b
|
|
a
|
|
a
|
|
"}
|