Skip to content

Commit

Permalink
Syndi suit balance (#2600)
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

Reverts an unintended buff to some ruins with syndicate hard suits and
makes them the lesser hard suit again
Cleans up some redundant code
Fixes the description for the Ramzi Clique hardsuit
Kills the owl suit cause he looked at my funny (and also cruft)
<!-- 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

Blood red hard suit should mostly be reserved for its faction.

<!-- 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:
balance: reverts some blood red hard suits back to ramzi
/: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
@FalloutFalcon
FalloutFalcon authored Jan 29, 2024
1 parent 7d193fc commit dada3c6
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 38 deletions.
2 changes: 1 addition & 1 deletion _maps/RandomRuins/JungleRuins/jungle_demon.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/suit_storage_unit/inherit,
/obj/item/tank/internals/oxygen/red,
/obj/item/clothing/suit/space/hardsuit/syndi,
/obj/item/clothing/suit/space/hardsuit/syndi/ramzi,
/obj/item/clothing/mask/gas/syndicate,
/turf/open/floor/plasteel/dark,
/area/ruin/powered)
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SandRuins/whitesands_surface_starfurycrash.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@
/area/overmap_encounter/planetoid/cave/explored)
"KT" = (
/obj/structure/safe/floor,
/obj/item/clothing/suit/space/hardsuit/syndi,
/obj/item/clothing/suit/space/hardsuit/syndi/ramzi,
/obj/item/documents/syndicate,
/turf/open/floor/plating{
icon_state = "panelscorched";
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/onehalf.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -920,7 +920,7 @@
/obj/structure/safe/floor,
/obj/item/tank/internals/oxygen/red,
/obj/item/clothing/mask/gas/syndicate,
/obj/item/clothing/suit/space/hardsuit/syndi,
/obj/item/clothing/suit/space/hardsuit/syndi/ramzi,
/obj/item/reagent_containers/food/drinks/bottle/rum,
/obj/item/reagent_containers/food/drinks/bottle/rum,
/obj/item/folder/syndicate/mining,
Expand Down
39 changes: 4 additions & 35 deletions code/modules/clothing/spacesuits/hardsuit.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,17 +423,17 @@
//Ramzi Syndie suit
/obj/item/clothing/head/helmet/space/hardsuit/syndi/ramzi
name = "rusted-red hardsuit helmet"
desc = "A beat-up standardized dual-mode helmet derived from more advanced special operations helmets, its red rusted into a dirty brown. It is in EVA mode. Manufactured by Gorlex Marauders."
alt_desc = "A beat-up standardized dual-mode helmet derived from more advanced special operations helmets, its red rusted into a dirty brown. It is in combat mode. Manufactured by Gorlex Marauders."
desc = "A beat-up standardized dual-mode helmet derived from more advanced special operations helmets, its red rusted into a dirty brown. It is in EVA mode. Manufactured by Ramzi Clique."
alt_desc = "A beat-up standardized dual-mode helmet derived from more advanced special operations helmets, its red rusted into a dirty brown. It is in combat mode. Manufactured by Ramzi Clique."
icon_state = "hardsuit1-ramzi"
item_state = "hardsuit1-ramzi"
hardsuit_type = "ramzi"
armor = list("melee" = 35, "bullet" = 25, "laser" = 20,"energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75)

/obj/item/clothing/suit/space/hardsuit/syndi/ramzi
name = "rusted-red hardsuit"
desc = "A beat-up standardized dual-mode hardsuit derived from more advanced special operations hardsuits, its red rusted into a dirty brown. It is in EVA mode. Manufactured by Gorlex Marauders."
alt_desc = "A beat-up standardized dual-mode hardsuit derived from more advanced special operations hardsuits, its red rusted into a dirty brown. It is in combat mode. Manufactured by Gorlex Marauders."
desc = "A beat-up standardized dual-mode hardsuit derived from more advanced special operations hardsuits, its red rusted into a dirty brown. It is in EVA mode. Manufactured by Ramzi Clique."
alt_desc = "A beat-up standardized dual-mode hardsuit derived from more advanced special operations hardsuits, its red rusted into a dirty brown. It is in combat mode. Manufactured by Ramzi Clique."
icon_state = "hardsuit1-ramzi"
item_state = "hardsuit1-ramzi"
hardsuit_type = "ramzi"
Expand All @@ -452,7 +452,6 @@
icon_state = "hardsuit1-sbg"
item_state = "hardsuit1-sbg"
hardsuit_type = "sbg"
armor = list("melee" = 40, "bullet" = 50, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 90)

/obj/item/clothing/suit/space/hardsuit/syndi/sbg
name = "beige-red hardsuit"
Expand All @@ -464,10 +463,6 @@
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/sbg
lightweight = 1
jetpack = null
armor = list("melee" = 40, "bullet" = 50, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 90)
combat_slowdown = 0
jetpack = null


//Hardliner Syndie suit
/obj/item/clothing/head/helmet/space/hardsuit/syndi/hl
Expand All @@ -477,7 +472,6 @@
icon_state = "hardsuit1-hl"
item_state = "hardsuit1-hl"
hardsuit_type = "hl"
armor = list("melee" = 40, "bullet" = 50, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 90)

/obj/item/clothing/suit/space/hardsuit/syndi/hl
name = "white-red hardsuit"
Expand All @@ -489,9 +483,6 @@
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/hl
lightweight = 1
jetpack = null
armor = list("melee" = 40, "bullet" = 50, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 90)
combat_slowdown = 0
jetpack = null


//Elite Syndie suit
Expand Down Expand Up @@ -530,28 +521,6 @@
/obj/item/clothing/suit/space/hardsuit/syndi/elite/debug
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite/debug

//The Owl Hardsuit
/obj/item/clothing/head/helmet/space/hardsuit/syndi/owl
name = "owl hardsuit helmet"
desc = "A dual-mode advanced helmet designed for any crime-fighting situation. It is in travel mode."
alt_desc = "A dual-mode advanced helmet designed for any crime-fighting situation. It is in combat mode."
icon_state = "hardsuit0-owl"
item_state = "s_helmet"
hardsuit_type = "owl"
visor_flags_inv = 0
visor_flags = 0
on = FALSE
full_retraction = TRUE

/obj/item/clothing/suit/space/hardsuit/syndi/owl
name = "owl hardsuit"
desc = "A dual-mode advanced hardsuit designed for any crime-fighting situation. It is in travel mode."
alt_desc = "A dual-mode advanced hardsuit designed for any crime-fighting situation. It is in combat mode."
icon_state = "hardsuit1-owl"
item_state = "s_suit"
hardsuit_type = "owl"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/owl

//Cybersun Hardsuit
/obj/item/clothing/suit/space/hardsuit/syndi/cybersun
name = "neutron-star combat hardsuit"
Expand Down

0 comments on commit dada3c6

Please sign in to comment.