Skip to content

Commit

Permalink
[MIRROR] [NO GBP] Fixes for garbage truck ruins. [MDB IGNORE] (#25498)
Browse files Browse the repository at this point in the history
* [NO GBP] Fixes for garbage truck ruins. (#80087)

## About The Pull Request
Fixes a tile with busted lighting and gravity in one of the maps (wrong
area zone).
Moves some of the items for visibility.
Puts two stickers (clown mask and smiley face) in the truck that had
none.
Cleaned up hammer sprite.
Adds custom examine text to some items that should have had it.
Fixes a few typos in custom examine texts.
Adds the ruins to the ruin blacklist config because they should have
been there (I forgot)
Capitalises area names.
## Why It's Good For The Game
Closer to my original artistic vision where there were no bugs or typos.
Hammer had a few pixels that needed fixed. Didn't see them because last
time I checked them, Halloween filter was on.
Allows server hosts to disable these ruins without having to disable
*all* ruins.
## Changelog
:cl:
fix: Minor bug fixes and improvements to the garbage truck space ruins.
image: Claw hammer icon has been neatened up a little.
/:cl:

* [NO GBP] Fixes for garbage truck ruins.

---------

Co-authored-by: Da Cool Boss <[email protected]>
  • Loading branch information
2 people authored and FFMirrorBot committed Dec 8, 2023
1 parent 0430061 commit c77e910
Show file tree
Hide file tree
Showing 7 changed files with 81 additions and 35 deletions.
23 changes: 15 additions & 8 deletions _maps/RandomRuins/SpaceRuins/garbagetruck1.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@
/obj/item/storage/bag/tray/cafeteria,
/obj/item/storage/bag/tray/cafeteria,
/obj/item/knife/butcher{
desc = "A huge thing used for chopping and chopping up meat. Years of service has scarred its metal and worn groves into the handle, but its blade is well-maintained and sharp.";
name = "antique cleaver"
name = "antique cleaver";
desc = "A huge knife for chopping up and slicing meat. Years of service has scarred its metal and worn grooves into the handle, but its blade is well-maintained and very sharp."
},
/mob/living/basic/cockroach,
/turf/open/floor/plating/dumpsterair,
Expand Down Expand Up @@ -402,6 +402,7 @@
/obj/item/book/manual/chef_recipes,
/obj/item/trash/semki/healthy,
/mob/living/basic/mouse/rat,
/obj/item/clothing/shoes/galoshes,
/turf/open/floor/plating/dumpsterair,
/area/ruin/space/has_grav/garbagetruck/foodwaste)
"rL" = (
Expand Down Expand Up @@ -574,6 +575,13 @@
},
/turf/open/floor/plating/dumpsterair,
/area/ruin/space/has_grav/garbagetruck/foodwaste)
"Ad" = (
/obj/item/food/canned/beans{
desc = "Probably still good.";
name = "rust-covered tin of beans"
},
/turf/open/floor/plating/dumpsterair,
/area/ruin/space/has_grav/garbagetruck/foodwaste)
"Aj" = (
/obj/effect/decal/cleanable/ants,
/mob/living/basic/mouse/white,
Expand Down Expand Up @@ -772,7 +780,7 @@
"GP" = (
/obj/effect/decal/cleanable/garbage,
/obj/item/crowbar/hammer{
desc = "It's a heavy iron hammer with a plastic grip. A triangle has been chiselled into the handle.";
desc = "It's a heavy iron hammer with a wooden handle. A triangle has been chiselled into it.";
name = "heirloom hammer"
},
/turf/open/floor/plating/dumpsterair,
Expand Down Expand Up @@ -911,7 +919,7 @@
/obj/effect/decal/cleanable/glass,
/obj/effect/spawner/random/engineering/material_cheap,
/obj/item/crowbar/hammer{
desc = "It's a heavy claw hammer. The handle is covered in fangmarks of varying sizes.";
desc = "It's a heavy claw hammer. The handle is covered in bite marks of varying sizes.";
name = "old hammer"
},
/obj/item/food/deadmouse,
Expand Down Expand Up @@ -1053,7 +1061,6 @@
},
/obj/effect/decal/cleanable/ants,
/obj/effect/decal/cleanable/food/tomato_smudge,
/obj/item/organ/internal/heart/rat,
/turf/open/floor/plating/dumpsterair,
/area/ruin/space/has_grav/garbagetruck/foodwaste)
"PU" = (
Expand Down Expand Up @@ -1222,9 +1229,9 @@
/area/ruin/space/has_grav/garbagetruck/foodwaste)
"Zb" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/grown/bananapeel,
/obj/item/food/deadmouse,
/mob/living/basic/mouse/rat,
/obj/item/organ/internal/heart/rat,
/turf/open/floor/plating/dumpsterair,
/area/ruin/space/has_grav/garbagetruck/foodwaste)

Expand Down Expand Up @@ -1303,7 +1310,7 @@ kS
OD
Sa
xf
ku
An
OZ
Fp
Ok
Expand Down Expand Up @@ -1331,7 +1338,7 @@ zK
aP
GU
KT
An
Ad
TX
ki
Fp
Expand Down
21 changes: 15 additions & 6 deletions _maps/RandomRuins/SpaceRuins/garbagetruck2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@
/turf/open/space/basic,
/area/ruin/space/has_grav/garbagetruck/medicalwaste)
"iU" = (
/obj/item/storage/medkit/brute,
/obj/effect/spawner/random/trash/garbage,
/obj/effect/spawner/random/medical/medkit,
/turf/open/floor/plating,
/area/ruin/space/has_grav/garbagetruck/medicalwaste)
"kf" = (
Expand Down Expand Up @@ -164,13 +164,18 @@
/obj/effect/decal/cleanable/fuel_pool,
/obj/item/rack_parts,
/obj/item/storage/pill_bottle/mannitol,
/obj/item/retractor/advanced,
/obj/effect/decal/cleanable/oil/slippery,
/turf/open/floor/plating,
/area/ruin/space/has_grav/garbagetruck/medicalwaste)
"qC" = (
/turf/closed/wall/mineral/titanium,
/area/ruin/space/has_grav/garbagetruck/medicalwaste)
"qV" = (
/obj/item/retractor/advanced{
pixel_x = 8
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/garbagetruck/medicalwaste)
"qX" = (
/obj/effect/decal/cleanable/plastic,
/obj/structure/broken_flooring/corner,
Expand Down Expand Up @@ -395,9 +400,9 @@
},
/obj/item/rack_parts,
/obj/item/shard,
/obj/item/wrench/medical,
/obj/effect/decal/cleanable/plastic,
/obj/effect/spawner/random/contraband/permabrig_gear,
/obj/item/wrench/medical,
/turf/open/floor/plating,
/area/ruin/space/has_grav/garbagetruck/medicalwaste)
"EJ" = (
Expand Down Expand Up @@ -449,6 +454,10 @@
/obj/effect/spawner/random/medical/medkit,
/turf/open/floor/plating,
/area/ruin/space/has_grav/garbagetruck/medicalwaste)
"Ka" = (
/obj/effect/spawner/random/trash/food_packaging,
/turf/open/floor/plating,
/area/ruin/space/has_grav/garbagetruck/medicalwaste)
"Kk" = (
/obj/item/wheelchair,
/obj/item/screwdriver,
Expand All @@ -462,6 +471,7 @@
"Lh" = (
/obj/item/food/deadmouse/moldy,
/obj/item/pushbroom,
/obj/item/clothing/shoes/galoshes,
/obj/item/storage/bag/trash/filled,
/turf/open/floor/plating,
/area/ruin/space/has_grav/garbagetruck/medicalwaste)
Expand Down Expand Up @@ -569,7 +579,6 @@
"Qq" = (
/obj/structure/microscope,
/obj/structure/broken_flooring/singular,
/obj/effect/spawner/random/trash/food_packaging,
/obj/item/instrument/bilehorn,
/turf/open/floor/plating,
/area/ruin/space/has_grav/garbagetruck/medicalwaste)
Expand Down Expand Up @@ -790,7 +799,7 @@ CJ
CJ
CJ
eO
CJ
qV
CJ
Kk
CJ
Expand Down Expand Up @@ -855,7 +864,7 @@ uR
CJ
CJ
hv
CJ
Ka
CJ
CJ
Gp
Expand Down
45 changes: 30 additions & 15 deletions _maps/RandomRuins/SpaceRuins/garbagetruck3.dmm
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"ac" = (
/obj/item/trash/semki/healthy,
/obj/effect/decal/cleanable/fuel_pool,
/turf/open/floor/plating/dumpsterair,
/area/ruin/space/has_grav/garbagetruck/squat)
"ap" = (
Expand All @@ -23,7 +24,6 @@
pixel_x = -9;
pixel_y = 2
},
/obj/item/stack/rods/ten,
/obj/structure/closet/crate/preopen,
/turf/open/floor/plating/dumpsterair,
/area/ruin/space/has_grav/garbagetruck/squat)
Expand All @@ -45,6 +45,7 @@
pixel_y = 4
},
/obj/item/popsicle_stick,
/obj/effect/decal/cleanable/fuel_pool,
/turf/open/floor/plating/dumpsterair,
/area/ruin/space/has_grav/garbagetruck/squat)
"bP" = (
Expand Down Expand Up @@ -192,10 +193,10 @@
/turf/open/floor/plating/dumpsterair,
/area/ruin/space/has_grav/garbagetruck/squat)
"kR" = (
/obj/item/tank/internals/oxygen/yellow,
/obj/structure/closet/crate/preopen,
/obj/effect/decal/cleanable/shreds,
/obj/effect/spawner/random/maintenance,
/obj/item/sticker/toolbox,
/turf/open/floor/plating/dumpsterair,
/area/ruin/space/has_grav/garbagetruck/squat)
"la" = (
Expand Down Expand Up @@ -228,7 +229,6 @@
/turf/open/floor/plating/dumpsterair,
/area/ruin/space/has_grav/garbagetruck/squat)
"lA" = (
/obj/item/sticker/toolbox,
/obj/structure/closet/crate/cardboard,
/obj/item/book/manual/wiki/engineering_guide,
/obj/item/book/manual/wiki/engineering_construction,
Expand Down Expand Up @@ -276,10 +276,12 @@
/obj/effect/spawner/random/trash/cigbutt,
/obj/item/trash/boritos/purple,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/fuel_pool,
/turf/open/floor/plating/dumpsterair,
/area/ruin/space/has_grav/garbagetruck/squat)
"pd" = (
/obj/item/stack/rods/ten,
/obj/effect/decal/cleanable/fuel_pool,
/obj/item/tank/internals/oxygen/yellow,
/turf/open/floor/plating/dumpsterair,
/area/ruin/space/has_grav/garbagetruck/squat)
"pk" = (
Expand Down Expand Up @@ -320,14 +322,20 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/bed/dogbed,
/turf/open/floor/plating/dumpsterair,
/area/space)
/area/ruin/space/has_grav/garbagetruck/squat)
"sb" = (
/obj/effect/decal/cleanable/fuel_pool,
/obj/item/boxcutter,
/obj/item/boxcutter,
/obj/item/folder/yellow,
/obj/item/geiger_counter,
/obj/item/stack/sticky_tape,
/obj/item/boxcutter{
pixel_x = 5
},
/obj/item/boxcutter{
pixel_x = 10
},
/obj/item/stack/sticky_tape{
pixel_x = -5
},
/obj/structure/closet/crate/preopen,
/turf/open/floor/plating/dumpsterair,
/area/ruin/space/has_grav/garbagetruck/squat)
Expand Down Expand Up @@ -520,6 +528,7 @@
/area/ruin/space/has_grav/garbagetruck/squat)
"zY" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/stack/rods/ten,
/obj/item/toy/minimeteor,
/turf/open/floor/plating/dumpsterair,
/area/ruin/space/has_grav/garbagetruck/squat)
Expand All @@ -531,10 +540,12 @@
/area/ruin/space/has_grav/garbagetruck/squat)
"Cm" = (
/obj/effect/decal/cleanable/fuel_pool,
/obj/item/mod/module/jetpack,
/obj/item/mod/module/jetpack{
pixel_y = 2;
pixel_x = -6
},
/obj/item/stock_parts/servo,
/obj/item/stock_parts/subspace/filter,
/obj/structure/fluff/oldturret,
/turf/open/floor/plating/dumpsterair,
/area/ruin/space/has_grav/garbagetruck/squat)
"Dq" = (
Expand Down Expand Up @@ -632,6 +643,7 @@
/area/ruin/space/has_grav/garbagetruck/squat)
"Hk" = (
/obj/item/food/pizzaslice/moldy/bacteria,
/obj/item/stack/rods/ten,
/turf/open/floor/plating/dumpsterair,
/area/ruin/space/has_grav/garbagetruck/squat)
"Hn" = (
Expand Down Expand Up @@ -721,7 +733,10 @@
/obj/structure/closet/crate,
/obj/effect/decal/cleanable/fuel_pool,
/obj/item/airlock_painter,
/obj/item/pen/screwdriver,
/obj/item/pen/screwdriver{
pixel_y = -2;
pixel_x = 8
},
/obj/item/rcd_ammo,
/turf/open/floor/plating/dumpsterair,
/area/ruin/space/has_grav/garbagetruck/squat)
Expand Down Expand Up @@ -755,7 +770,7 @@
},
/obj/item/storage/fancy/cigarettes/cigpack_cannabis{
pixel_x = 6;
pixel_y = 2
pixel_y = -2
},
/turf/open/floor/plating/dumpsterair,
/area/ruin/space/has_grav/garbagetruck/squat)
Expand Down Expand Up @@ -1066,7 +1081,7 @@ RD
To
Xt
TD
pd
Xt
JR
Kq
sb
Expand All @@ -1088,7 +1103,7 @@ iU
Xt
Xt
ac
Xt
To
bb
jN
lA
Expand All @@ -1114,7 +1129,7 @@ Xt
Rw
To
Ol
To
pd
mV
"}
(10,1,1) = {"
Expand Down
Loading

0 comments on commit c77e910

Please sign in to comment.