diff --git a/_maps/RandomRuins/SpaceRuins/spacegym.dmm b/_maps/RandomRuins/SpaceRuins/spacegym.dmm deleted file mode 100644 index 6d69992c7910..000000000000 --- a/_maps/RandomRuins/SpaceRuins/spacegym.dmm +++ /dev/null @@ -1,321 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/obj/structure/chair/stool, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/spacegym) -"b" = ( -/obj/structure/chair/stool, -/mob/living/simple_animal/hostile/zombie{ - desc = "Hey buddy, I think you got the wrong door. Leather club is two blocks down."; - environment_smash = 0; - health = 60; - melee_damage_lower = 11; - melee_damage_upper = 11; - name = "Boss of this Gym"; - zombiejob = null - }, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/spacegym) -"c" = ( -/mob/living/simple_animal/hostile/zombie/leatherman{ - a_intent = "Leatherman"; - environment_smash = 0; - zombiejob = null - }, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/spacegym) -"d" = ( -/obj/item/reagent_containers/glass/bucket, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/spacegym) -"e" = ( -/obj/item/clothing/under/costume/jabroni, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/spacegym) -"f" = ( -/obj/effect/decal/cleanable/oil, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/spacegym) -"h" = ( -/obj/machinery/door/airlock, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/spacegym) -"k" = ( -/turf/open/floor/plasteel/airless{ - icon_state = "damaged1" - }, -/area/ruin/space/has_grav/spacegym) -"m" = ( -/obj/item/reagent_containers/food/snacks/meatball, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/spacegym) -"n" = ( -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/spacegym) -"o" = ( -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/spacegym) -"r" = ( -/obj/machinery/door/airlock{ - dir = 4 - }, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/spacegym) -"s" = ( -/obj/machinery/shower, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/item/storage/pill_bottle/floorpill/full, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/spacegym) -"u" = ( -/turf/open/space, -/area/space) -"v" = ( -/obj/item/reagent_containers/spray/cleaner, -/turf/open/floor/plasteel/airless{ - icon_state = "damaged1" - }, -/area/ruin/space/has_grav/spacegym) -"y" = ( -/obj/structure/closet/boxinggloves, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/spacegym) -"z" = ( -/obj/structure/closet/boxinggloves, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/spacegym) -"B" = ( -/obj/structure/weightmachine/stacklifter, -/obj/effect/spawner/lootdrop/spacegym, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/spacegym) -"E" = ( -/mob/living/simple_animal/hostile/zombie{ - desc = "He's the boy next door."; - environment_smash = 0; - health = 60; - melee_damage_lower = 11; - melee_damage_upper = 11; - name = "Boy Next Door"; - zombiejob = null - }, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/spacegym) -"F" = ( -/obj/machinery/shower, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/spacegym) -"G" = ( -/obj/effect/spawner/lootdrop/spacegym, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/spacegym) -"I" = ( -/obj/structure/lattice, -/turf/open/space, -/area/ruin/space/has_grav/spacegym) -"J" = ( -/obj/structure/weightmachine/weightlifter, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/spacegym) -"L" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space, -/area/ruin/space/has_grav/spacegym) -"O" = ( -/turf/closed/wall, -/area/ruin/space/has_grav/spacegym) -"Q" = ( -/obj/structure/closet, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/spacegym) -"R" = ( -/obj/item/mop, -/obj/structure/mopbucket, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/spacegym) -"U" = ( -/obj/structure/grille, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/spacegym) -"V" = ( -/obj/structure/chair/stool, -/obj/item/reagent_containers/glass/rag, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/spacegym) -"X" = ( -/obj/effect/decal/cleanable/vomit, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/spacegym) - -(1,1,1) = {" -u -u -u -I -u -I -G -k -I -I -I -u -"} -(2,1,1) = {" -u -u -I -O -O -O -O -O -O -O -U -u -"} -(3,1,1) = {" -u -u -u -O -y -Q -Q -Q -X -B -O -U -"} -(4,1,1) = {" -u -n -u -O -b -a -a -a -o -m -O -k -"} -(5,1,1) = {" -u -U -I -O -n -G -k -n -c -U -h -u -"} -(6,1,1) = {" -u -I -I -U -V -a -a -a -n -k -O -u -"} -(7,1,1) = {" -u -f -I -O -z -Q -Q -Q -U -J -O -u -"} -(8,1,1) = {" -u -u -U -U -O -O -O -O -r -O -O -u -"} -(9,1,1) = {" -u -u -I -O -F -I -k -G -d -U -U -u -"} -(10,1,1) = {" -u -u -I -O -s -E -e -n -U -R -I -u -"} -(11,1,1) = {" -u -u -v -U -O -U -I -O -U -O -O -u -"} -(12,1,1) = {" -u -u -u -u -u -I -L -L -u -u -u -u -"} diff --git a/_maps/map_catalogue.txt b/_maps/map_catalogue.txt index 006f7f6328fd..846133389d1e 100644 --- a/_maps/map_catalogue.txt +++ b/_maps/map_catalogue.txt @@ -426,10 +426,6 @@ Find the key for using this catalogue in "map_catalogue_key.txt" Size = (x = 60)(y = 60)(z = 1) Tags = "Medium Combat Challenge", "Medium Loot", "Inhospitable" - File Name = "_maps\RandomRuins\SpaceRuins\spacegym.dmm" - Size = (x = 12)(y = 12)(z = 1) - Tags = "Minor Combat Challenge", "Minor Loot", "Inhospitable" - File Name = "_maps\RandomRuins\SpaceRuins\transport18.dmm" Size = (x = 51)(y = 23)(z = 1) Tags = "No Combat", "Medium Loot", "Inhospitable" diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm index 9aec48334728..bf86ed599f7f 100644 --- a/_maps/shuttles/inteq/inteq_colossus.dmm +++ b/_maps/shuttles/inteq/inteq_colossus.dmm @@ -3631,8 +3631,6 @@ /obj/structure/closet/crate/trashcart, /obj/machinery/airalarm/directional/east, /obj/machinery/firealarm/directional/south, -/obj/effect/spawner/lootdrop/spacegym, -/obj/effect/spawner/lootdrop/spacegym, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/turf_decal/corner_techfloor_gray{ dir = 4 diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index ea5a6d0aa775..598f027fd016 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -103,12 +103,6 @@ description = "an abandoned secure storage location. there is no power left in the batteries and the former ocupants locked it pretty tight before leaving.\ You will have to power areas to raise the bolts on the doors. look out for secrets." -/datum/map_template/ruin/space/spacegym - id = "Space_Gym" - suffix = "spacegym.dmm" - name = "Space Gym" - description = "A gym, lost in space, where many grunts and moaning could be heard." - /datum/map_template/ruin/space/oldshuttle id = "oldcode-nukeops" suffix = "oldcodeops.dmm" diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm index 6bda9781b500..e19e39cd0db7 100644 --- a/code/game/area/areas/ruins/space.dm +++ b/code/game/area/areas/ruins/space.dm @@ -367,12 +367,6 @@ name = "Engineering Wing" icon_state = "yellow" -//Space Gym - -/area/ruin/space/has_grav/spacegym - name = "Space Gym" - icon_state = "firingrange" - //scav_mining /area/ruin/space/has_grav/scav_mining/entrance diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index c4555b7d92a1..bfac95dd3650 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -569,24 +569,6 @@ /obj/item/stack/rods/fifty ) -/obj/effect/spawner/lootdrop/spacegym - name = "spacegym loot spawner" - lootdoubles = FALSE - - loot = list( - /obj/item/dnainjector/hulkmut = 1, - /obj/item/dnainjector/dwarf = 1, - /obj/item/dnainjector/gigantism = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet/chicken = 1, - /obj/item/clothing/under/shorts/black = 1, - /obj/item/clothing/under/shorts/blue = 1, - /obj/item/clothing/under/shorts/red = 1, - /obj/item/restraints/handcuffs = 1, - /obj/item/storage/pill_bottle/stimulant = 1, - /obj/item/storage/firstaid/regular = 1, - /obj/item/storage/box/handcuffs = 1, - ) - /obj/effect/spawner/lootdrop/singularitygen name = "Tesla or Singulo spawner" lootdoubles = FALSE diff --git a/code/modules/mob/living/simple_animal/hostile/zombie.dm b/code/modules/mob/living/simple_animal/hostile/zombie.dm index 37be0db7f16c..6f1db7aaf996 100644 --- a/code/modules/mob/living/simple_animal/hostile/zombie.dm +++ b/code/modules/mob/living/simple_animal/hostile/zombie.dm @@ -58,17 +58,6 @@ corpse.forceMove(drop_location()) corpse.create() -/mob/living/simple_animal/hostile/zombie/leatherman - name = "Leatherman" - desc = "Fuck you!" - icon = 'icons/mob/simple_human.dmi' - icon_state = "zombie_leather" - icon_living = "zombie_leather" - maxHealth = 60 - health = 60 - melee_damage_lower = 11 - melee_damage_upper = 11 - /mob/living/simple_animal/hostile/zombie/kudzu name = "shambling bramble" desc = "A shambling mass of vibrant vines and rotting flesh. "