Skip to content

Commit

Permalink
Merge branch 'master' into spookysprites2
Browse files Browse the repository at this point in the history
  • Loading branch information
@thgvr
thgvr committed Apr 17, 2024
2 parents 2d9e8a9 + bc7e700 commit f048437
Show file tree
Hide file tree
Showing 81 changed files with 10,053 additions and 10,281 deletions.
354 changes: 166 additions & 188 deletions _maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm
View file

Large diffs are not rendered by default.

9 changes: 2 additions & 7 deletions _maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,10 +321,7 @@
/turf/open/floor/vault,
/area/ruin/unpowered/corprejectrooms)
"io" = (
/obj/structure/closet/wall/red{
dir = 4;
pixel_x = -28
},
/obj/structure/closet/wall/red/directional/west,
/obj/item/keycard/office{
desc = "Only Elite level employees are authorized to handle this keycard. All other employees may face termination if found in possession.";
name = "Vault Card";
Expand Down Expand Up @@ -1392,9 +1389,7 @@
/turf/open/floor/plating/catwalk_floor,
/area/ruin/unpowered/corprejectrooms)
"Fa" = (
/obj/structure/closet/firecloset/wall{
pixel_x = -27
},
/obj/structure/closet/firecloset/wall/directional/north,
/obj/structure/cable/blue{
icon_state = "5-6"
},
Expand Down
242 changes: 117 additions & 125 deletions _maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,13 @@
},
/turf/closed/wall/mineral/plastitanium,
/area/ship/storage)
"fr" = (
/obj/structure/chair/comfy/grey/directional/east,
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel/tech,
/area/ruin/jungle/cavecrew/bridge)
"fs" = (
/obj/effect/turf_decal/industrial/warning{
dir = 8
Expand All @@ -463,27 +470,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/patterned/brushed,
/area/ship/storage)
"fv" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/wall/red{
dir = 1;
name = "Bartender's locker";
pixel_y = -28
},
/obj/item/clothing/under/suit/waiter/syndicate,
/obj/item/clothing/suit/apron/purple_bartender,
/obj/item/reagent_containers/food/drinks/shaker{
pixel_x = -9;
pixel_y = 2
},
/obj/item/storage/pill_bottle/happy{
pixel_y = -9;
pixel_x = -8
},
/turf/open/floor/wood{
icon_state = "wood-broken4"
},
/area/ruin/jungle/cavecrew/hallway)
"fy" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/siding/thinplating/dark/corner,
Expand Down Expand Up @@ -663,13 +649,6 @@
/mob/living/simple_animal/hostile/frontier/ranged/officer/neutured,
/turf/open/floor/plasteel/dark,
/area/ruin/jungle/cavecrew/bridge)
"iE" = (
/obj/structure/chair/comfy/grey/directional/east,
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel/tech,
/area/ruin/jungle/cavecrew/bridge)
"iN" = (
/obj/effect/turf_decal/techfloor{
dir = 1
Expand Down Expand Up @@ -1019,34 +998,6 @@
},
/turf/open/floor/plating,
/area/ruin/powered)
"lV" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/garbage{
pixel_x = -5
},
/obj/structure/sign/poster/contraband/lusty_xenomorph{
pixel_y = 32
},
/obj/structure/closet/secure_closet/freezer/wall{
dir = 4;
pixel_x = -28
},
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/reagent_containers/food/condiment/enzyme{
pixel_x = -8;
pixel_y = 5
},
/turf/open/floor/wood{
icon_state = "wood-broken5"
},
/area/ruin/jungle/cavecrew/hallway)
"lY" = (
/obj/structure/flora/ausbushes/palebush,
/turf/open/water/jungle,
Expand Down Expand Up @@ -1141,6 +1092,31 @@
},
/turf/open/floor/plating/dirt/jungle,
/area/ruin/powered)
"mV" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/garbage{
pixel_x = -5
},
/obj/structure/sign/poster/contraband/lusty_xenomorph{
pixel_y = 32
},
/obj/structure/closet/secure_closet/freezer/wall/directional/west,
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/reagent_containers/food/condiment/enzyme{
pixel_x = -8;
pixel_y = 5
},
/turf/open/floor/wood{
icon_state = "wood-broken5"
},
/area/ruin/jungle/cavecrew/hallway)
"na" = (
/obj/structure/flora/grass/jungle/b{
pixel_x = 10;
Expand Down Expand Up @@ -1207,6 +1183,25 @@
},
/turf/open/floor/plasteel/patterned/brushed,
/area/ruin/jungle/cavecrew/security)
"nD" = (
/obj/effect/turf_decal/siding/wood{
dir = 9
},
/obj/structure/chair/comfy/orange/directional/east{
color = "#66b266"
},
/obj/item/book/manual/wiki/surgery{
pixel_x = 10;
pixel_y = -5
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/glass,
/obj/machinery/light_switch{
pixel_y = 21;
pixel_x = -10
},
/turf/open/floor/wood,
/area/ruin/jungle/cavecrew/dormitories)
"nR" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/tech,
Expand Down Expand Up @@ -1435,6 +1430,20 @@
},
/turf/open/floor/plasteel,
/area/ruin/jungle/cavecrew/hallway)
"rM" = (
/obj/effect/turf_decal/siding/wood/corner{
dir = 1
},
/obj/effect/turf_decal/siding/wood/corner,
/obj/structure/chair/comfy/orange/directional/east{
buildstackamount = 0;
color = "#c45c57"
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/wood{
icon_state = "wood-broken7"
},
/area/ruin/jungle/cavecrew/dormitories)
"rN" = (
/obj/effect/decal/cleanable/dirt/dust,
/mob/living/simple_animal/hostile/frontier/ranged/trooper/neutered,
Expand Down Expand Up @@ -2578,20 +2587,6 @@
/mob/living/simple_animal/hostile/frontier/ranged/mosin/neutered,
/turf/open/floor/plating/dirt/jungle,
/area/ruin/powered)
"Fy" = (
/obj/effect/turf_decal/siding/wood/corner{
dir = 1
},
/obj/effect/turf_decal/siding/wood/corner,
/obj/structure/chair/comfy/orange/directional/east{
buildstackamount = 0;
color = "#c45c57"
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/wood{
icon_state = "wood-broken7"
},
/area/ruin/jungle/cavecrew/dormitories)
"FB" = (
/obj/structure/cable{
icon_state = "2-9"
Expand Down Expand Up @@ -2657,6 +2652,33 @@
/obj/machinery/light/directional/west,
/turf/open/water/jungle,
/area/overmap_encounter/planetoid/cave/explored)
"Gv" = (
/obj/item/reagent_containers/syringe/contraband/fentanyl{
pixel_x = -3;
pixel_y = 4
},
/obj/item/reagent_containers/syringe/contraband/methamphetamine,
/obj/item/reagent_containers/food/drinks/beer{
pixel_x = -4
},
/obj/effect/turf_decal/siding/wood{
dir = 8
},
/obj/structure/closet/wall/directional/west,
/obj/item/reagent_containers/syringe/contraband/bath_salts{
pixel_y = 6;
pixel_x = -4
},
/obj/item/restraints/handcuffs/cable/white,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/chem_pile,
/obj/effect/decal/cleanable/blood/drip,
/obj/effect/decal/cleanable/plastic,
/obj/effect/decal/cleanable/glass,
/turf/open/floor/wood{
icon_state = "wood-broken2"
},
/area/ruin/jungle/cavecrew/dormitories)
"Gy" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
Expand Down Expand Up @@ -2842,36 +2864,6 @@
},
/turf/open/floor/plasteel/tech,
/area/ship/storage)
"IZ" = (
/obj/item/reagent_containers/syringe/contraband/fentanyl{
pixel_x = -3;
pixel_y = 4
},
/obj/item/reagent_containers/syringe/contraband/methamphetamine,
/obj/item/reagent_containers/food/drinks/beer{
pixel_x = -4
},
/obj/effect/turf_decal/siding/wood{
dir = 8
},
/obj/structure/closet/wall{
dir = 4;
pixel_x = -28
},
/obj/item/reagent_containers/syringe/contraband/bath_salts{
pixel_y = 6;
pixel_x = -4
},
/obj/item/restraints/handcuffs/cable/white,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/chem_pile,
/obj/effect/decal/cleanable/blood/drip,
/obj/effect/decal/cleanable/plastic,
/obj/effect/decal/cleanable/glass,
/turf/open/floor/wood{
icon_state = "wood-broken2"
},
/area/ruin/jungle/cavecrew/dormitories)
"Jg" = (
/turf/open/water/jungle/lit,
/area/overmap_encounter/planetoid/cave/explored)
Expand Down Expand Up @@ -3496,6 +3488,25 @@
},
/turf/open/water/jungle/lit,
/area/overmap_encounter/planetoid/jungle/explored)
"Qo" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/wall/red/directional/south{
name = "Bartender's locker"
},
/obj/item/clothing/under/suit/waiter/syndicate,
/obj/item/clothing/suit/apron/purple_bartender,
/obj/item/reagent_containers/food/drinks/shaker{
pixel_x = -9;
pixel_y = 2
},
/obj/item/storage/pill_bottle/happy{
pixel_y = -9;
pixel_x = -8
},
/turf/open/floor/wood{
icon_state = "wood-broken4"
},
/area/ruin/jungle/cavecrew/hallway)
"Qr" = (
/obj/effect/turf_decal/industrial/warning/dust/corner{
dir = 1
Expand Down Expand Up @@ -3766,25 +3777,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ruin/jungle/cavecrew/bridge)
"Ua" = (
/obj/effect/turf_decal/siding/wood{
dir = 9
},
/obj/structure/chair/comfy/orange/directional/east{
color = "#66b266"
},
/obj/item/book/manual/wiki/surgery{
pixel_x = 10;
pixel_y = -5
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/glass,
/obj/machinery/light_switch{
pixel_y = 21;
pixel_x = -10
},
/turf/open/floor/wood,
/area/ruin/jungle/cavecrew/dormitories)
"Ud" = (
/obj/machinery/light/directional/west,
/turf/open/water/jungle,
Expand Down Expand Up @@ -4810,7 +4802,7 @@ wt
wt
Nr
Nr
lV
mV
zJ
gm
Pz
Expand Down Expand Up @@ -5006,7 +4998,7 @@ Nr
jr
uo
mz
fv
Qo
Nr
Nr
Nr
Expand Down Expand Up @@ -5195,7 +5187,7 @@ eW
wt
lm
UJ
iE
fr
sj
Ie
lm
Expand Down Expand Up @@ -5482,7 +5474,7 @@ zj
Iz
Ri
sH
IZ
Gv
fI
Ri
wt
Expand Down Expand Up @@ -5741,7 +5733,7 @@ lD
Cq
CF
Ri
Ua
nD
Is
Ri
wt
Expand Down Expand Up @@ -6190,7 +6182,7 @@ wt
wt
Ri
QX
Fy
rM
jZ
ta
hh
Expand Down
Loading

0 comments on commit f048437

Please sign in to comment.