Skip to content

Commit

Permalink
Spooky sprites take2 (#2915)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
#2908
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Changelog

:cl: Spookypineapple, Imaginos, Thgvr
add: New sofa and comfy chair variants, both are craftable with metal
imageadd: Sofas, Comfy chairs, and some atmos equipment have a new coat
of paint
imageadd: Janitorial equipment has a new coat of paint
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
thgvr authored Apr 19, 2024
1 parent 4f461a4 commit f0ae5d9
Show file tree
Hide file tree
Showing 97 changed files with 1,432 additions and 1,311 deletions.
2 changes: 1 addition & 1 deletion _maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2751,7 +2751,7 @@
/obj/effect/decal/cleanable/blood/old{
icon_state = "gib2-old"
},
/obj/structure/chair/comfy/black{
/obj/structure/chair/comfy/grey/directional/south{
desc = "It looks incredibly comfy, and expensive. Theres a little note on the side, explaining how its made of %100 real cow skin.";
name = "Cowskin chair"
},
Expand Down
10 changes: 4 additions & 6 deletions _maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"ae" = (
/obj/structure/chair/sofa/left{
dir = 8
},
/obj/structure/chair/sofa/brown/left/directional/west,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/carpet,
/area/ruin/beach)
Expand Down Expand Up @@ -483,7 +481,7 @@
/turf/open/water/beach,
/area/overmap_encounter/planetoid/beachplanet/explored)
"sN" = (
/obj/structure/chair/sofa,
/obj/structure/chair/sofa/brown/directional/south,
/obj/machinery/light/small/directional/north{
light_color = "#694c12"
},
Expand Down Expand Up @@ -853,7 +851,7 @@
/turf/open/floor/plastic,
/area/ruin/beach)
"GP" = (
/obj/structure/chair/sofa/right,
/obj/structure/chair/sofa/brown/right/directional/south,
/obj/effect/decal/cleanable/cobweb,
/mob/living/simple_animal/hostile/pirate/melee{
faction = list("beach","pirate")
Expand Down Expand Up @@ -1136,7 +1134,7 @@
/turf/open/floor/wood,
/area/ruin/beach)
"Rh" = (
/obj/structure/chair/sofa/corner,
/obj/structure/chair/sofa/brown/corner/directional/south,
/mob/living/simple_animal/hostile/pirate/melee{
faction = list("beach","pirate")
},
Expand Down
14 changes: 4 additions & 10 deletions _maps/RandomRuins/BeachRuins/beach_float_resort.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,7 @@
},
/area/ruin/beach/float_resort)
"dZ" = (
/obj/structure/chair/comfy/black{
dir = 1
},
/obj/structure/chair/comfy/grey/directional/north,
/turf/open/floor/wood{
light_range = 2
},
Expand Down Expand Up @@ -824,7 +822,7 @@
/turf/open/floor/plating,
/area/overmap_encounter/planetoid/beachplanet/explored)
"wn" = (
/obj/structure/chair/comfy/black,
/obj/structure/chair/comfy/grey/directional/south,
/turf/open/floor/wood{
light_range = 2
},
Expand Down Expand Up @@ -1178,9 +1176,7 @@
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"Fk" = (
/obj/structure/chair/sofa/right{
dir = 4
},
/obj/structure/chair/sofa/brown/right/directional/east,
/obj/machinery/light/small/directional/west,
/turf/open/floor/wood{
light_range = 2
Expand Down Expand Up @@ -1313,9 +1309,7 @@
},
/area/ruin/beach/float_resort)
"Io" = (
/obj/structure/chair/sofa/left{
dir = 4
},
/obj/structure/chair/sofa/brown/left/directional/east,
/turf/open/floor/wood{
light_range = 2
},
Expand Down
54 changes: 16 additions & 38 deletions _maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,7 @@
/obj/structure/railing{
dir = 8
},
/obj/structure/chair/comfy/brown{
dir = 8
},
/obj/structure/chair/comfy/orange/directional/west,
/turf/open/floor/carpet/black,
/area/ruin/beach/oceantown/bar)
"cy" = (
Expand Down Expand Up @@ -266,9 +264,7 @@
/turf/open/floor/plasteel/white,
/area/ruin/beach/oceantown/bar)
"dF" = (
/obj/structure/chair/sofa{
dir = 4
},
/obj/structure/chair/sofa/brown/directional/east,
/turf/open/floor/carpet/green,
/area/ruin/beach/oceantown/hotel)
"dL" = (
Expand Down Expand Up @@ -393,9 +389,7 @@
/turf/open/floor/plating/asteroid/sand/lit,
/area/overmap_encounter/planetoid/beachplanet/explored)
"eN" = (
/obj/structure/chair/sofa/corner{
dir = 1
},
/obj/structure/chair/sofa/brown/corner/directional/north,
/turf/open/floor/carpet/green,
/area/ruin/beach/oceantown/hotel)
"eV" = (
Expand Down Expand Up @@ -488,9 +482,7 @@
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"fJ" = (
/obj/structure/chair/sofa/corner{
dir = 4
},
/obj/structure/chair/sofa/brown/corner/directional/east,
/turf/open/floor/carpet/green,
/area/ruin/beach/oceantown/hotel)
"fL" = (
Expand Down Expand Up @@ -708,7 +700,7 @@
/turf/open/floor/carpet,
/area/ruin/beach/oceantown/hotel)
"iv" = (
/obj/structure/chair/sofa/left,
/obj/structure/chair/sofa/brown/left/directional/south,
/turf/open/floor/carpet/green,
/area/ruin/beach/oceantown/hotel)
"iw" = (
Expand Down Expand Up @@ -1024,9 +1016,7 @@
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"mJ" = (
/obj/structure/chair/sofa/right{
dir = 1
},
/obj/structure/chair/sofa/brown/right/directional/north,
/turf/open/floor/carpet/green,
/area/ruin/beach/oceantown/hotel)
"mR" = (
Expand Down Expand Up @@ -1395,9 +1385,7 @@
/turf/open/floor/plating/asteroid/sand/lit,
/area/overmap_encounter/planetoid/beachplanet/explored)
"sj" = (
/obj/structure/chair/sofa/right{
dir = 4
},
/obj/structure/chair/sofa/brown/right/directional/east,
/turf/open/floor/wood,
/area/ruin/beach/oceantown)
"sp" = (
Expand All @@ -1416,9 +1404,7 @@
/turf/open/floor/plasteel/mono,
/area/ruin/beach/oceantown)
"sr" = (
/obj/structure/chair/comfy/brown{
dir = 8
},
/obj/structure/chair/comfy/orange/directional/west,
/turf/open/floor/carpet/black,
/area/ruin/beach/oceantown/bar)
"sy" = (
Expand Down Expand Up @@ -1477,7 +1463,7 @@
/turf/open/floor/plasteel/tech,
/area/ruin/beach/oceantown)
"te" = (
/obj/structure/chair/sofa/left,
/obj/structure/chair/sofa/brown/left/directional/south,
/turf/open/floor/wood,
/area/ruin/beach/oceantown)
"ti" = (
Expand Down Expand Up @@ -1969,7 +1955,7 @@
/turf/open/floor/plasteel/dark,
/area/ruin/beach/oceantown/bar)
"zk" = (
/obj/structure/chair/sofa,
/obj/structure/chair/sofa/brown/directional/south,
/turf/open/floor/wood,
/area/ruin/beach/oceantown)
"zl" = (
Expand Down Expand Up @@ -2903,9 +2889,7 @@
/turf/open/floor/plasteel,
/area/ruin/beach/oceantown/bar)
"IU" = (
/obj/structure/chair/sofa/left{
dir = 4
},
/obj/structure/chair/sofa/brown/left/directional/east,
/turf/open/floor/wood,
/area/ruin/beach/oceantown)
"IX" = (
Expand Down Expand Up @@ -3563,7 +3547,7 @@
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"PE" = (
/obj/structure/chair/sofa/right,
/obj/structure/chair/sofa/brown/right/directional/south,
/turf/open/floor/wood,
/area/ruin/beach/oceantown)
"PF" = (
Expand Down Expand Up @@ -3729,9 +3713,7 @@
/turf/open/floor/plating,
/area/overmap_encounter/planetoid/beachplanet/explored)
"Sv" = (
/obj/structure/chair/comfy/brown{
dir = 4
},
/obj/structure/chair/comfy/orange/directional/east,
/turf/open/floor/carpet/black,
/area/ruin/beach/oceantown/bar)
"Sy" = (
Expand Down Expand Up @@ -3769,9 +3751,7 @@
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"SY" = (
/obj/structure/chair/comfy/brown{
dir = 1
},
/obj/structure/chair/comfy/orange/directional/north,
/turf/open/floor/carpet/black,
/area/ruin/beach/oceantown/bar)
"Tj" = (
Expand Down Expand Up @@ -4012,9 +3992,7 @@
/turf/open/floor/plasteel/dark,
/area/ruin/beach/oceantown)
"VZ" = (
/obj/structure/chair/sofa{
dir = 4
},
/obj/structure/chair/sofa/brown/directional/east,
/turf/open/floor/wood,
/area/ruin/beach/oceantown)
"Wd" = (
Expand Down Expand Up @@ -4274,7 +4252,7 @@
/turf/open/floor/wood,
/area/ruin/beach/oceantown/hotel)
"Zr" = (
/obj/structure/chair/comfy/brown,
/obj/structure/chair/comfy/orange/directional/south,
/turf/open/floor/carpet/black,
/area/ruin/beach/oceantown/bar)
"Zy" = (
Expand Down
8 changes: 2 additions & 6 deletions _maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -689,9 +689,7 @@
/obj/effect/turf_decal/trimline/transparent/ntblue/arrow_ccw,
/obj/effect/turf_decal/weather/dirt,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/chair/comfy/brown{
dir = 8
},
/obj/structure/chair/comfy/orange/directional/west,
/turf/open/floor/plasteel/tech/techmaint,
/area/ruin/unpowered/crashed_holemaker)
"lO" = (
Expand Down Expand Up @@ -2540,9 +2538,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 8
},
/obj/structure/chair/comfy/teal{
dir = 8
},
/obj/structure/chair/comfy/blue/directional/west,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/dark,
/area/ruin/unpowered/crashed_holemaker)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
/turf/open/floor/carpet,
/area/ruin/powered)
"he" = (
/obj/structure/chair/sofa/left,
/obj/structure/chair/sofa/brown/left/directional/south,
/turf/closed/mineral/random/snow,
/area/overmap_encounter/planetoid/cave/explored)
"hD" = (
Expand Down Expand Up @@ -178,9 +178,7 @@
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/overmap_encounter/planetoid/cave/explored)
"pP" = (
/obj/structure/chair/sofa/left{
dir = 1
},
/obj/structure/chair/sofa/brown/left/directional/north,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/ruin/powered)
Expand Down Expand Up @@ -311,9 +309,7 @@
/turf/open/floor/carpet,
/area/ruin/powered)
"yb" = (
/obj/structure/chair/sofa/right{
dir = 1
},
/obj/structure/chair/sofa/brown/right/directional/north,
/turf/open/floor/wood,
/area/ruin/powered)
"yS" = (
Expand Down Expand Up @@ -351,14 +347,12 @@
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/overmap_encounter/planetoid/cave/explored)
"Cd" = (
/obj/structure/chair/comfy/brown{
dir = 8
},
/obj/structure/chair/comfy/orange/directional/west,
/turf/open/floor/carpet,
/area/ruin/powered)
"Cl" = (
/obj/effect/decal/cleanable/blood/old,
/obj/structure/chair/comfy/brown,
/obj/structure/chair/comfy/orange/directional/south,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
Expand Down Expand Up @@ -483,9 +477,7 @@
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/overmap_encounter/planetoid/cave/explored)
"Os" = (
/obj/structure/chair/comfy/brown{
dir = 4
},
/obj/structure/chair/comfy/orange/directional/east,
/turf/open/floor/carpet,
/area/ruin/powered)
"Pp" = (
Expand Down
Loading

0 comments on commit f0ae5d9

Please sign in to comment.