Skip to content

Commit

Permalink
Merge branch 'shiptest-ss13:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@meemofcourse
meemofcourse authored Feb 15, 2025
2 parents ceabb41 + 74c1298 commit f715358
Show file tree
Hide file tree
Showing 105 changed files with 1,482 additions and 583 deletions.
112 changes: 69 additions & 43 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_buried_shrine.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,17 @@
/area/ruin/unpowered/buried_shrine)
"cv" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/glass/bottle/potion,
/obj/item/reagent_containers/glass/bottle/potion{
pixel_y = 7
},
/obj/item/reagent_containers/food/snacks/grown/cherrybulbs{
pixel_x = 12;
pixel_y = 4
},
/obj/item/reagent_containers/food/snacks/grown/cherry_bomb{
pixel_x = -14;
pixel_y = 11
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/buried_shrine)
"cA" = (
Expand Down Expand Up @@ -414,7 +424,7 @@
"kp" = (
/obj/structure/table_frame/wood,
/obj/structure/stone_tile/slab,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/turf/open/floor/plating/moss,
/area/ruin/unpowered/buried_shrine)
"kt" = (
/obj/structure/stone_tile/block{
Expand Down Expand Up @@ -615,8 +625,12 @@
/turf/open/floor/plating/moss,
/area/ruin/unpowered/buried_shrine)
"pK" = (
/obj/structure/stone_tile/slab,
/mob/living/simple_animal/hostile/asteroid/brimdemon,
/obj/structure/table/wood,
/obj/item/reagent_containers/glass/bowl/mushroom_bowl,
/obj/item/reagent_containers/food/snacks/grown/meatwheat{
pixel_x = -15;
pixel_y = 4
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/buried_shrine)
"qh" = (
Expand Down Expand Up @@ -664,7 +678,7 @@
dir = 5
},
/obj/structure/chair/wood,
/obj/structure/spawner/burrow/lava_planet,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/buried_shrine)
"qT" = (
Expand Down Expand Up @@ -821,6 +835,9 @@
pixel_x = -11;
pixel_y = 10
},
/obj/item/stack/sheet/bone{
pixel_x = 10
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/buried_shrine)
"tL" = (
Expand Down Expand Up @@ -866,22 +883,26 @@
/area/ruin/unpowered/buried_shrine)
"vi" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/glass/bottle/potion,
/obj/item/reagent_containers/glass/bottle/potion{
list_reagents = list(/datum/reagent/medicine/bonefixingjuice = 30)
},
/obj/item/reagent_containers/glass/bottle/potion{
pixel_x = -10;
pixel_y = 9
pixel_y = 9;
list_reagents = list(/datum/reagent/medicine/soulus/pure = 30)
},
/obj/item/reagent_containers/glass/bottle/potion{
pixel_x = 10;
pixel_y = 9
pixel_y = 9;
list_reagents = list(/datum/reagent/toxin/coniine = 30)
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/buried_shrine)
"vo" = (
/obj/structure/table/wood,
/obj/item/gun/ballistic/bow/ashen,
/obj/structure/stone_tile/slab,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/turf/open/floor/plating/moss,
/area/ruin/unpowered/buried_shrine)
"vJ" = (
/obj/structure/flora/ash/stem_shroom,
Expand Down Expand Up @@ -914,11 +935,10 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/buried_shrine)
"wt" = (
/obj/structure/stone_tile/surrounding/cracked{
dir = 4
/obj/structure/stone_tile/slab/cracked{
dir = 5
},
/mob/living/simple_animal/hostile/asteroid/brimdemon,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/turf/open/floor/plating/moss,
/area/ruin/unpowered/buried_shrine)
"wy" = (
/obj/structure/stone_tile{
Expand All @@ -930,13 +950,9 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/buried_shrine)
"wM" = (
/obj/structure/stone_tile/surrounding/cracked{
dir = 4
},
/obj/structure/stone_tile/center,
/obj/structure/spawner/burrow/lava_planet,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/buried_shrine)
/mob/living/simple_animal/hostile/asteroid/goliath/beast,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface/lit,
/area/overmap_encounter/planetoid/lava/explored)
"wS" = (
/obj/structure/stone_tile/surrounding/cracked{
dir = 4
Expand Down Expand Up @@ -1165,6 +1181,7 @@
/obj/item/chair/wood/wings{
dir = 8
},
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/buried_shrine)
"CD" = (
Expand Down Expand Up @@ -1266,6 +1283,7 @@
dir = 1
},
/obj/structure/chair/wood/wings,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/buried_shrine)
"FC" = (
Expand Down Expand Up @@ -1529,7 +1547,7 @@
pixel_y = 12
},
/obj/structure/stone_tile/slab,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/turf/open/floor/plating/moss,
/area/ruin/unpowered/buried_shrine)
"LW" = (
/obj/structure/destructible/tribal_torch{
Expand Down Expand Up @@ -1586,6 +1604,9 @@
/area/template_noop)
"Ni" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/grown/apple/gold{
pixel_y = 9
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/buried_shrine)
"Nk" = (
Expand Down Expand Up @@ -1650,7 +1671,6 @@
/obj/structure/stone_tile/cracked{
dir = 1
},
/obj/structure/spawner/burrow/lava_planet,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/buried_shrine)
Expand All @@ -1674,8 +1694,10 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/buried_shrine)
"RK" = (
/obj/structure/stone_tile/center/cracked,
/mob/living/simple_animal/hostile/asteroid/brimdemon,
/obj/structure/stone_tile/slab/cracked,
/obj/item/flashlight/flare/torch{
pixel_x = -18
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/buried_shrine)
"RN" = (
Expand Down Expand Up @@ -1924,6 +1946,10 @@
/obj/structure/flora/ausbushes/sparsegrass/hell,
/turf/open/floor/plating/moss,
/area/ruin/unpowered/buried_shrine)
"Zd" = (
/obj/item/reagent_containers/food/snacks/grown/random,
/turf/open/floor/plating/grass/lava,
/area/ruin/unpowered/buried_shrine)
"Zk" = (
/obj/structure/stone_tile{
dir = 8
Expand Down Expand Up @@ -2688,7 +2714,7 @@ WZ
TO
Qb
Mt
eI
Zd
Hv
FC
Qb
Expand Down Expand Up @@ -3033,7 +3059,7 @@ Td
TO
TO
TO
TO
eI
TO
TO
WZ
Expand Down Expand Up @@ -3089,8 +3115,8 @@ WZ
WZ
WZ
TO
TO
TO
eI
eI
WZ
WZ
WZ
Expand Down Expand Up @@ -3431,7 +3457,7 @@ TO
Xr
Ht
Td
pK
Ad
on
Ii
Tp
Expand Down Expand Up @@ -3681,7 +3707,7 @@ Eh
nh
aD
nh
nh
wM
nh
nh
nh
Expand Down Expand Up @@ -3932,7 +3958,7 @@ LJ
ta
NN
ta
wM
Xv
Ad
mM
Ad
Expand All @@ -3953,12 +3979,12 @@ LZ
WZ
Ka
dB
RK
qt
uP
di
zN
Ad
Td
RK
Ad
BF
yz
Expand Down Expand Up @@ -4042,7 +4068,7 @@ WZ
WZ
Yh
Fw
SA
pK
lJ
WZ
ta
Expand Down Expand Up @@ -4308,7 +4334,7 @@ Eh
Eh
nh
nh
nh
wM
aD
nh
nh
Expand All @@ -4333,7 +4359,7 @@ WZ
WZ
Td
lJ
wt
yM
ta
TO
TO
Expand Down Expand Up @@ -4915,10 +4941,10 @@ TO
Xr
hn
Xr
Fq
Fq
TO
TO
TO
Wd
wt
kp
WZ
Eh
Expand Down Expand Up @@ -4973,9 +4999,9 @@ TO
TO
TO
TO
TO
TO
TO
BF
Ws
Ws
LP
WZ
Eh
Expand Down Expand Up @@ -5146,7 +5172,7 @@ YK
WZ
WZ
TO
Fq
Ws
WZ
DB
yJ
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/syndicate_ngr_kaliandhi.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"map_path": "_maps/shuttles/syndicate/syndicate_ngr_kaliandhi.dmm",
"map_id": "syndicate_gorlex_kaliandhi",
"limit": 1,
"starting_funds": 4000,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/syndicate/captain/ngr",
Expand Down
5 changes: 5 additions & 0 deletions _maps/shuttles/cybersun/cybersun_nimbus.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -852,6 +852,11 @@
pixel_y = 16;
pixel_x = -32
},
/obj/machinery/washing_machine{
pixel_y = 18;
pixel_x = 9;
density = 0
},
/turf/open/floor/suns/hatch{
color = "#E6D2BA"
},
Expand Down
13 changes: 12 additions & 1 deletion _maps/shuttles/independent/independent_dwayne.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,9 @@
/turf/open/floor/wood,
/area/ship/crew/canteen)
"bE" = (
/obj/machinery/door/airlock/public,
/obj/machinery/door/airlock/public{
id_tag = "dwayne_bathroom"
},
/obj/machinery/door/firedoor/border_only{
dir = 1
},
Expand Down Expand Up @@ -477,6 +479,15 @@
},
/obj/machinery/power/apc/auto_name/directional/west,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/button/door{
pixel_x = -21;
pixel_y = -13;
dir = 4;
id = "dwayne_bathroom";
normaldoorcontrol = 1;
specialfunctions = 4;
name = "Bathroom Lock"
},
/turf/open/floor/plasteel/patterned,
/area/ship/crew/toilet)
"hd" = (
Expand Down
12 changes: 11 additions & 1 deletion _maps/shuttles/independent/independent_falmouth.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,8 @@
/area/ship/engineering/engines/starboard)
"oa" = (
/obj/machinery/door/airlock{
name = "Restroom"
name = "Restroom";
id_tag = "falmouth_bathroom"
},
/obj/effect/turf_decal/industrial/warning/fulltile,
/turf/open/floor/plating,
Expand Down Expand Up @@ -735,6 +736,15 @@
dir = 9
},
/obj/effect/spawner/random/trash/mess,
/obj/machinery/button/door{
pixel_x = -20;
pixel_y = -10;
dir = 4;
id = "falmouth_bathroom";
normaldoorcontrol = 1;
specialfunctions = 4;
name = "Bathroom Lock"
},
/turf/open/floor/plasteel/patterned,
/area/ship/hallway/fore)
"up" = (
Expand Down
Loading

0 comments on commit f715358

Please sign in to comment.