diff --git a/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm b/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm index 389e21b5513..8aa85a7e153 100644 --- a/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm +++ b/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm @@ -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, @@ -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" = ( @@ -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, @@ -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, @@ -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, @@ -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" = ( @@ -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) @@ -1303,7 +1310,7 @@ kS OD Sa xf -ku +An OZ Fp Ok @@ -1331,7 +1338,7 @@ zK aP GU KT -An +Ad TX ki Fp diff --git a/_maps/RandomRuins/SpaceRuins/garbagetruck2.dmm b/_maps/RandomRuins/SpaceRuins/garbagetruck2.dmm index a2ed3ff8dba..9813823daeb 100644 --- a/_maps/RandomRuins/SpaceRuins/garbagetruck2.dmm +++ b/_maps/RandomRuins/SpaceRuins/garbagetruck2.dmm @@ -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" = ( @@ -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, @@ -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" = ( @@ -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, @@ -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) @@ -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) @@ -790,7 +799,7 @@ CJ CJ CJ eO -CJ +qV CJ Kk CJ @@ -855,7 +864,7 @@ uR CJ CJ hv -CJ +Ka CJ CJ Gp diff --git a/_maps/RandomRuins/SpaceRuins/garbagetruck3.dmm b/_maps/RandomRuins/SpaceRuins/garbagetruck3.dmm index 45947bb4112..c2da1e7646c 100644 --- a/_maps/RandomRuins/SpaceRuins/garbagetruck3.dmm +++ b/_maps/RandomRuins/SpaceRuins/garbagetruck3.dmm @@ -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" = ( @@ -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) @@ -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" = ( @@ -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" = ( @@ -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, @@ -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" = ( @@ -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) @@ -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) @@ -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" = ( @@ -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" = ( @@ -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) @@ -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) @@ -1066,7 +1081,7 @@ RD To Xt TD -pd +Xt JR Kq sb @@ -1088,7 +1103,7 @@ iU Xt Xt ac -Xt +To bb jN lA @@ -1114,7 +1129,7 @@ Xt Rw To Ol -To +pd mV "} (10,1,1) = {" diff --git a/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm b/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm index e895eef25a1..a636b7220ca 100644 --- a/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm +++ b/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm @@ -84,12 +84,12 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/garbagetruck/toystore) "hS" = ( -/obj/structure/closet/crate/trashcart/filled, /obj/item/toy/xmas_cracker, /obj/item/toy/xmas_cracker, /obj/item/toy/toy_xeno, /obj/item/clothing/head/costume/party/festive, /obj/effect/decal/cleanable/fuel_pool, +/obj/structure/closet/crate/trashcart, /turf/open/floor/plating, /area/ruin/space/has_grav/garbagetruck/toystore) "it" = ( @@ -105,6 +105,7 @@ /area/ruin/space/has_grav/garbagetruck/toystore) "kj" = ( /obj/structure/mannequin/plastic, +/obj/structure/spider/stickyweb, /turf/open/floor/plating, /area/ruin/space/has_grav/garbagetruck/toystore) "kz" = ( @@ -233,6 +234,9 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/item/cardboard_cutout, /obj/item/clothing/neck/tie/horrible, +/obj/item/sticker/clown{ + pixel_y = 8 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/garbagetruck/toystore) "sA" = ( @@ -264,6 +268,9 @@ pixel_y = -2 }, /obj/item/folder/blue, +/obj/item/crowbar/hammer{ + desc = "It's a hammer with 'OLD RELIABLE' written on the handle. It's seen some use." + }, /turf/open/floor/plating, /area/ruin/space/has_grav/garbagetruck/toystore) "ub" = ( @@ -386,7 +393,6 @@ "wW" = ( /obj/structure/spider/stickyweb, /obj/item/food/badrecipe/moldy, -/obj/item/grown/bananapeel, /turf/open/floor/plating, /area/ruin/space/has_grav/garbagetruck/toystore) "xd" = ( @@ -673,6 +679,7 @@ /obj/structure/filingcabinet/chestdrawer, /obj/item/mail/junkmail, /obj/item/healthanalyzer/simple/disease, +/obj/item/sticker/smile, /turf/open/floor/plating, /area/ruin/space/has_grav/garbagetruck/toystore) "OZ" = ( @@ -690,7 +697,6 @@ "Pv" = ( /obj/structure/spider/stickyweb, /obj/item/kirbyplants/synthetic/plant29, -/obj/item/crowbar/hammer, /turf/open/floor/plating, /area/ruin/space/has_grav/garbagetruck/toystore) "PJ" = ( @@ -743,7 +749,9 @@ /obj/item/coin/plastic, /obj/structure/safe, /obj/structure/spider/stickyweb, -/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen{ + desc = "A tank of compressed oxygen for use as propulsion in zero-gravity areas. It's blue, and has a triangle chiselled into the paint." + }, /obj/item/switchblade, /obj/item/survivalcapsule/bathroom, /turf/open/floor/plating, @@ -815,7 +823,10 @@ /obj/item/paper/fluff/junkmail_generic, /obj/item/pen/red, /obj/structure/table_frame/wood, -/obj/item/mod/paint, +/obj/item/mod/paint{ + pixel_x = -6; + pixel_y = -2 + }, /obj/effect/spawner/random/decoration/paint, /turf/open/floor/plating, /area/ruin/space/has_grav/garbagetruck/toystore) diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm index f91a7654b54..9004969f916 100644 --- a/code/game/area/areas/ruins/space.dm +++ b/code/game/area/areas/ruins/space.dm @@ -693,7 +693,7 @@ //garbage trucks /area/ruin/space/has_grav/garbagetruck - name = "decommissioned garbage truck" + name = "Decommissioned Garbage Truck" sound_environment = SOUND_AREA_SMALL_ENCLOSED ambience_index = AMBIENCE_MAINT /area/ruin/space/has_grav/garbagetruck/foodwaste diff --git a/config/spaceruinblacklist.txt b/config/spaceruinblacklist.txt index f7fb7a0b417..457aeee3600 100644 --- a/config/spaceruinblacklist.txt +++ b/config/spaceruinblacklist.txt @@ -41,6 +41,10 @@ #_maps/RandomRuins/SpaceRuins/fasttravel.dmm #_maps/RandomRuins/SpaceRuins/forgottenship.dmm #_maps/RandomRuins/SpaceRuins/forgottenship.dmm +#_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm +#_maps/RandomRuins/SpaceRuins/garbagetruck2.dmm +#_maps/RandomRuins/SpaceRuins/garbagetruck3.dmm +#_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm #_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm #_maps/RandomRuins/SpaceRuins/hellfactory.dmm #_maps/RandomRuins/SpaceRuins/hellfactory.dmm diff --git a/icons/obj/weapons/hammer.dmi b/icons/obj/weapons/hammer.dmi index 6c454462f48..965fd0b37ef 100644 Binary files a/icons/obj/weapons/hammer.dmi and b/icons/obj/weapons/hammer.dmi differ