Skip to content

Commit

Permalink
New Gorlex Marauders Part 1: Hardsuits! (#2540)
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
To preface this PR, it still needs some adjustments regarding map
placements and other shenanigans that have been driving me up a wall.

In any case, this PR revamps the current Gorlex Hardsuits as well as
adding completely new ones for each of the branches!


![image](https://github.com/shiptest-ss13/Shiptest/assets/77556824/7b2ebac6-0dd1-4f03-8bdf-a4e66fe8e1bc)

This PR now adds:

- The 2nd Battlegroup's Beige-Red Hardsuit
- The Ramzi's Clique Rusted-Red Hardsuit.
- The Hardliner's White-Red Hardsuit.

This PR also changes the legion corpse behavior, by changing the values
of how common certain drops from legions are with regards to syndicate
operative corpses. Cliquer corpses are going to be far more common than
regular ICW-era corpses, but you can still find those if you're lucky
enough.

Finally this PR kills the Scarlet Hardsuit. You won't be missed.
<!-- 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
Haha, lore funni.
<!-- 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: PositiveEntropy
add: Revamps blood-red hardsuits, as well as adding their equivalents to
each Gorlex branch!
del: The Scarlet Hardsuit has been shelved.
/: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
Imaginos16 authored Dec 3, 2023
1 parent 7e87da5 commit a0edce1
Show file tree
Hide file tree
Showing 11 changed files with 106 additions and 50 deletions.
4 changes: 2 additions & 2 deletions _maps/RandomRuins/JungleRuins/jungle_demon.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -514,9 +514,9 @@
"PA" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/suit_storage_unit/inherit,
/obj/item/clothing/suit/space/hardsuit/syndi/scarlet,
/obj/item/clothing/mask/breath,
/obj/item/tank/internals/oxygen/red,
/obj/item/clothing/suit/space/hardsuit/syndi,
/obj/item/clothing/mask/gas/syndicate,
/turf/open/floor/plasteel/dark,
/area/ruin/powered)
"QI" = (
Expand Down
7 changes: 4 additions & 3 deletions _maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1705,12 +1705,12 @@
name = "captain's suit storage unit";
req_access = list(20)
},
/obj/item/clothing/suit/space/hardsuit/syndi,
/obj/item/clothing/mask/gas/syndicate,
/obj/machinery/light_switch{
dir = 4;
pixel_x = -20
},
/obj/item/clothing/suit/space/hardsuit/syndi/sbg,
/obj/item/clothing/mask/gas/syndicate,
/turf/open/floor/carpet/black,
/area/ship/bridge)
"Ck" = (
Expand Down Expand Up @@ -2256,8 +2256,9 @@
req_access = list(56)
},
/obj/item/clothing/shoes/magboots/syndie,
/obj/item/clothing/suit/space/hardsuit/syndi/scarlet,
/obj/item/clothing/mask/gas/syndicate,
/obj/item/clothing/suit/space/syndicate,
/obj/item/clothing/head/helmet/space/syndicate,
/turf/open/floor/carpet/red,
/area/ship/cargo/office)
"KX" = (
Expand Down
15 changes: 6 additions & 9 deletions _maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2337,12 +2337,12 @@
dir = 4
},
/obj/machinery/suit_storage_unit/inherit,
/obj/item/clothing/mask/breath,
/obj/item/clothing/suit/space/hardsuit/syndi/scarlet,
/obj/machinery/light_switch{
pixel_x = -13;
pixel_y = 22
},
/obj/item/clothing/suit/space/hardsuit/syndi/hl,
/obj/item/clothing/mask/gas/syndicate,
/turf/open/floor/mineral/plastitanium,
/area/ship/security/armory)
"vT" = (
Expand Down Expand Up @@ -3146,9 +3146,6 @@
},
/obj/item/clothing/under/syndicate/combat,
/obj/item/clothing/under/syndicate/aclf,
/obj/item/clothing/suit/armor/vest/security/hos{
name = "Syndicate jacket"
},
/obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
/obj/item/clothing/gloves/krav_maga/combatglovesplus,
/obj/item/clothing/shoes/jackboots,
Expand Down Expand Up @@ -3810,8 +3807,8 @@
icon_state = "0-8"
},
/obj/machinery/suit_storage_unit/inherit,
/obj/item/clothing/mask/breath,
/obj/item/clothing/suit/space/hardsuit/syndi/scarlet,
/obj/item/clothing/suit/space/hardsuit/syndi/hl,
/obj/item/clothing/mask/gas/syndicate,
/turf/open/floor/mineral/plastitanium,
/area/ship/security/armory)
"JH" = (
Expand Down Expand Up @@ -4381,8 +4378,8 @@
/obj/machinery/camera/autoname{
dir = 8
},
/obj/item/clothing/mask/breath,
/obj/item/clothing/suit/space/hardsuit/syndi/scarlet,
/obj/item/clothing/suit/space/hardsuit/syndi/hl,
/obj/item/clothing/mask/gas/syndicate,
/turf/open/floor/mineral/plastitanium,
/area/ship/security/armory)
"PK" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/shuttles/syndicate/syndicate_luxembourg.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2517,8 +2517,8 @@
/obj/machinery/suit_storage_unit/inherit{
req_access_txt = "41"
},
/obj/item/clothing/suit/space/hardsuit/syndi/scarlet,
/obj/item/clothing/head/helmet/space/hardsuit/syndi/scarlet,
/obj/item/clothing/suit/space/syndicate,
/obj/item/clothing/head/helmet/space/syndicate,
/obj/item/clothing/mask/breath,
/turf/open/floor/plasteel/mono/dark,
/area/ship/engineering)
Expand Down
82 changes: 66 additions & 16 deletions code/modules/clothing/spacesuits/hardsuit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -420,30 +420,80 @@
var/combat_slowdown = 0 //slowdown when in combat mode
var/lightweight = 0 //used for flags when toggling

//Scarlet Syndie suit
/obj/item/clothing/head/helmet/space/hardsuit/syndi/scarlet
name = "scarlet hardsuit helmet"
desc = "A standardized dual-mode helmet derived from more advanced special operations helmets. It is in EVA mode. Manufactured by Donk Co."
alt_desc = "A standardized dual-mode helmet derived from more advanced special operations helmets. It is in combat mode. Manufactured by Donk Co."
icon_state = "hardsuit1-scarlet"
item_state = "scarlet_helm"
hardsuit_type = "scarlet"
//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."
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/scarlet
name = "scarlet hardsuit"
desc = "A standardized dual-mode hardsuit derived from more advanced special operations hardsuits. It is in EVA mode. Manufactured by Donk Co."
alt_desc = "A standardized dual-mode hardsuit derived from more advanced special operations hardsuits. It is in combat mode. Manufactured by Donk Co."
icon_state = "hardsuit1-scarlet"
item_state = "scarlet_hardsuit"
hardsuit_type = "scarlet"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/scarlet
/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."
icon_state = "hardsuit1-ramzi"
item_state = "hardsuit1-ramzi"
hardsuit_type = "ramzi"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/ramzi
lightweight = 1
jetpack = null
armor = list("melee" = 35, "bullet" = 25, "laser" = 20,"energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75)
combat_slowdown = 0.5
jetpack = null

//2nd Battlegroup Syndie suit
/obj/item/clothing/head/helmet/space/hardsuit/syndi/sbg
name = "beige-red hardsuit helmet"
desc = "A standardized dual-mode helmet derived from ICW-era advanced special operations helmets, its red partly replaced by beige. It is in EVA mode. Manufactured by Second Battlegroup."
alt_desc = "A standardized dual-mode helmet derived from ICW-era advanced special operations helmets, its red partly replaced by beige. It is in combat mode. Manufactured by Second Battlegroup."
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"
desc = "A standardized dual-mode hardsuit derived from ICW-era advanced special operations hardsuits, its red partly replaced by beige. It is in EVA mode. Manufactured by Second Battlegroup."
alt_desc = "A standardized dual-mode hardsuit derived from ICW-era advanced special operations hardsuits, its red partly replaced by beige. It is in combat mode. Manufactured by the Second Battlegroup."
icon_state = "hardsuit1-sbg"
item_state = "hardsuit1-sbg"
hardsuit_type = "sbg"
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
name = "white-red hardsuit helmet"
desc = "An advanced dual-mode helmet derived from ICW-era advanced special operations helmets, its red partly replaced by white. It is in EVA mode. Manufactured by Second Battlegroup."
alt_desc = "An advanced dual-mode helmet derived from ICW-era advanced special operations helmets, its red partly replaced by white. It is in combat mode. Manufactured by Second Battlegroup."
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"
desc = "An advanced dual-mode hardsuit derived from ICW-era advanced special operations hardsuits, its red partly replaced by white. It is in EVA mode. Manufactured by Second Battlegroup."
alt_desc = "An advanced dual-mode hardsuit derived from ICW-era advanced special operations hardsuits, its red partly replaced by white. It is in combat mode. Manufactured by the Second Battlegroup."
icon_state = "hardsuit1-hl"
item_state = "hardsuit1-hl"
hardsuit_type = "hl"
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
/obj/item/clothing/head/helmet/space/hardsuit/syndi/elite
name = "elite syndicate hardsuit helmet"
Expand Down
19 changes: 19 additions & 0 deletions code/modules/mob/living/simple_animal/corpse.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,25 @@
r_pocket = /obj/item/tank/internals/emergency_oxygen
id = /obj/item/card/id/syndicate

/obj/effect/mob_spawn/human/corpse/syndicateramzi
name = "Ramzi's Clique Commando"
id_job = "Cutthroat"
hairstyle = "Bald"
facial_hairstyle = "Shaved"
outfit = /datum/outfit/syndicateramzicorpse

/datum/outfit/syndicateramzicorpse
name = "Ramzi's Clique Commando Corpse"
uniform = /obj/item/clothing/under/syndicate/gorlex
suit = /obj/item/clothing/suit/space/hardsuit/syndi/ramzi
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
ears = /obj/item/radio/headset
mask = /obj/item/clothing/mask/gas/syndicate
back = /obj/item/tank/jetpack/oxygen
r_pocket = /obj/item/tank/internals/emergency_oxygen
id = /obj/item/card/id/syndicate


/obj/effect/mob_spawn/human/corpse/syndicatestormtrooper
name = "Syndicate Stormtrooper"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -413,12 +413,13 @@
"Miner" = 44,
"Waldo" = 3,
"Ashwalker" = 7,
"Soldier" = 3,
"Soldier" = 5,
"Oldminer" = 8,
"Kobold" = 5,
"Golem" = 6,
"SRM" = 10,
pick("Shadow", "YeOlde", "Operative", "Cultist") = 4
"Operative" = 5,
pick("Shadow", "YeOlde") = 4
)
)
switch(type)
Expand Down Expand Up @@ -922,10 +923,12 @@
mask = /obj/item/clothing/mask/breath
if("Operative")
id_job = "Operative"
if(prob(15))
if(prob(40))
outfit = /datum/outfit/syndicatecommandocorpse
else if(prob(5))
outfit = /datum/outfit/syndicatestormtroopercorpse
else
outfit = /datum/outfit/syndicatecommandocorpse
outfit = /datum/outfit/syndicateramzicorpse
if("Waldo")//WE FINALLY FOUND HIM
name = "Waldo"
uniform = /obj/item/clothing/under/pants/jeans
Expand Down Expand Up @@ -1004,20 +1007,6 @@
glasses = /obj/item/clothing/glasses/blindfold
back = /obj/item/tank/internals/oxygen
mask = /obj/item/clothing/mask/breath
if("Cultist")
uniform = /obj/item/clothing/under/costume/roman
suit = /obj/item/clothing/suit/hooded/cultrobes
suit_store = /obj/item/tome
r_pocket = /obj/item/restraints/legcuffs/bola/cult
l_pocket = /obj/item/melee/cultblade/dagger
glasses = /obj/item/clothing/glasses/hud/health/night/cultblind
back = /obj/item/storage/backpack/cultpack
backpack_contents = list(
/obj/item/reagent_containers/glass/beaker/unholywater = 1,
/obj/item/cult_shift = 1,
/obj/item/flashlight/flare/culttorch = 1,
/obj/item/stack/sheet/runed_metal = 15
)
if("SRM")
uniform = /obj/item/clothing/under/suit/roumain
shoes = /obj/item/clothing/shoes/workboots/mining
Expand Down
Binary file modified icons/mob/clothing/head.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/suits/spacesuits.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/hats.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/suits/spacesuits.dmi
Binary file not shown.

0 comments on commit a0edce1

Please sign in to comment.