Skip to content

Commit

Permalink
Removes spacegym.dmm (#2544)
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
Removes spacegym.dmm and its associated code and map catalogue entry.
Also removes the spacegym lootdrops from the colossus. (Please do not
add weirdly named lootdrops to your map without checking their contents,
this had hulk injectors in it.)
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
![2023-11-29 17 15
20](https://github.com/shiptest-ss13/Shiptest/assets/95449138/040bb751-1a81-4b65-8aa6-877aa616ba41)
you look at this and tell me theres a god. 
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
del: spacegym.dmm and associated code removed
del: removed spacegym lootdrops from the colossus
/: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
Zevotech authored Dec 1, 2023
1 parent 3faad75 commit 34bf15f
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 368 deletions.
321 changes: 0 additions & 321 deletions _maps/RandomRuins/SpaceRuins/spacegym.dmm

This file was deleted.

4 changes: 0 additions & 4 deletions _maps/map_catalogue.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions _maps/shuttles/inteq/inteq_colossus.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions code/datums/ruins/space.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 0 additions & 6 deletions code/game/area/areas/ruins/space.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 0 additions & 18 deletions code/game/objects/effects/spawners/lootdrop.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 34bf15f

Please sign in to comment.