Skip to content

Commit

Permalink
Legion corpse rework (#2543)
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

Kills off a lot of the bad corpses that just didn't make much sense IC
Also making them feel a little more real by sub typing them under a
generic outfit which pulls clothing from load outs.
Also tweaks a lot of the existing spawns to make them a little more
balanced
This will replace a lot of the removed outfits with independent jobs


![corpses](https://github.com/shiptest-ss13/Shiptest/assets/86381784/9aa8b114-afff-4616-8021-db1553c6fc01)

![image](https://github.com/shiptest-ss13/Shiptest/assets/86381784/3f44fcca-f38b-4d64-bb7d-c1be33479c2d)

![image](https://github.com/shiptest-ss13/Shiptest/assets/86381784/4eb44536-81d1-45ec-9eb1-34499ba475ef)

![image](https://github.com/shiptest-ss13/Shiptest/assets/86381784/d75870ac-d0a5-496e-a826-88158623e665)

<!-- 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

The balance of the legion loot felt a little off and had to much gear
that messed up faction identity
This does however improve the variety and randomness to the point you
cant look at a corpse and know its not a real player.
While the loot is a lot less powerful there will be a lot more variety i
hope

<!-- 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:

add: Added  new more varied legion corpses
del: Removed lot of the crappy legion corpses
balance: rebalanced most of the old legion corpses
refactor: moved most legion corpse loot behavior to outfits
/: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. -->

---------

Signed-off-by: FalloutFalcon <[email protected]>
Co-authored-by: Mark Suckerberg <[email protected]>
Co-authored-by: Sun-Soaked <[email protected]>
  • Loading branch information
3 people authored May 31, 2024
1 parent 60e39a8 commit 149dcfb
Show file tree
Hide file tree
Showing 9 changed files with 529 additions and 524 deletions.
3 changes: 3 additions & 0 deletions code/datums/outfit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@
/// Set to FALSE if your outfit requires runtime parameters
var/can_be_admin_equipped = TRUE

// Used to determine if it should be ignored in unit tests due to being to dynamic to always spawn backpack contents right
var/random = FALSE

/**
* extra types for chameleon outfit changes, mostly guns
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@

/obj/structure/closet/secure_closet/engineering_chief/PopulateContents()
..()
//WS Begin
new /obj/item/clothing/head/beret/ce(src) //Berets
new /obj/item/clothing/under/rank/command(src) //Better command uniforms
new /obj/item/stack/tape/industrial/pro(src) //Better tape
//WS End
new /obj/item/clothing/neck/cloak/ce(src)
new /obj/item/clothing/under/rank/engineering/chief_engineer(src)
new /obj/item/clothing/under/rank/engineering/chief_engineer/skirt(src)
Expand Down Expand Up @@ -40,9 +38,7 @@
/obj/structure/closet/secure_closet/engineering_electrical/PopulateContents()
..()
var/static/items_inside = list(
//WS Begin
/obj/item/stack/tape/industrial/electrical = 1, // Better tape
//WS End
/obj/item/clothing/gloves/color/yellow = 2,
/obj/item/storage/toolbox/electrical = 3,
/obj/item/electronics/apc = 3,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,11 @@

/obj/structure/closet/secure_closet/CMO/PopulateContents()
..()
//WS Begin
new /obj/item/storage/belt/medical(src) //Gives the CMO a belt
new /obj/item/storage/bag/medical(src) //Medibags
new /obj/item/clothing/head/beret/cmo(src) //Berets
new /obj/item/clothing/under/rank/command(src) //Better command uniforms
new /obj/item/storage/box/hypospray/CMO(src) //Hypo mk. 2s
//WS End
new /obj/item/clothing/neck/cloak/cmo(src)
new /obj/item/clothing/suit/bio_suit/cmo(src)
new /obj/item/clothing/head/bio_hood/cmo(src)
Expand Down
5 changes: 5 additions & 0 deletions code/modules/client/loadout/loadout_accessories.dm
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@
description = "Standard hand coverings for everyday use."
path = /obj/item/clothing/gloves/color/white

/datum/gear/accessory/gloves/fingerless
display_name = "fingerless gloves"
description = "Radical hand coverings for everyday use."
path = /obj/item/clothing/gloves/fingerless

/datum/gear/accessory/gloves/evening
display_name = "evening gloves"
description = "Excessively fancy elbow-length gloves."
Expand Down
Loading

0 comments on commit 149dcfb

Please sign in to comment.