Skip to content

Commit

Permalink
Moves current UPP/CLF combat synths into a support role (#5830)
Browse files Browse the repository at this point in the history
# About the pull request

We discussed combat synths on the maintainer meeting yesterday,
specifically the UPP/CLF ert's and we've come to the conclusion and
decided we want Synths in those ERT's to be more support focused
primarily which is why we're removing the ability for them to use guns.
This is done by disabling the allow_gun_usage variable. (The whiteout
deathsquad will not be affected by this change.)

The CLF Synth survivor on LV will also be affected by this change. (The
whiteout deathsquad will not be affected by this change.)

I'll make a separate PR to adjust what equipment synthetics get which
are affected by this change to help facilitate the removal of gun usage.

In the future, we will make a component for Synths that allows the CLF
synth/s specifically to randomly have their "laws" scrambled and switch
between different set/s to bring into the hacked aspect further.

Admins can still enable gun usage as before by setting the VV
allow_gun_usage to be True for their events.

# Explain why it's good for the game
It is very un-fun for both Xeno and Marine to fight a combat synth due
to the power level they are at which includes less stun, no bone breaks,
no pain, and a rather quick repair time. In turn, we want them to be
more on the back-line and assist the actual combat troops with
medication, setting up defenses, maybe handling prisoners and so forth
instead of being a OP killing machine.


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl: Nanu
balance: Removed the ability for Combat Synths in the UPP/CLF ERT to use
guns, as well as the CLF Survivor Synth.
add: Did a few minor tweaks to help fill in some of the space given by
the removal of guns/ammo from the Combat Synths loadout.
/:cl:
  • Loading branch information
Nanu308 authored Feb 28, 2024
1 parent 3b91f0b commit 72c668b
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 28 deletions.
45 changes: 26 additions & 19 deletions code/modules/gear_presets/clf.dm
Original file line number Diff line number Diff line change
Expand Up @@ -745,35 +745,42 @@
/datum/equipment_preset/clf/synth/load_race(mob/living/carbon/human/new_human)
new_human.set_species(SYNTH_COLONY_GEN_ONE)

/datum/equipment_preset/clf/synth/load_gear(mob/living/carbon/human/new_human)
var/obj/item/clothing/under/colonist/clf/CLF = new()
var/obj/item/clothing/accessory/storage/webbing/W = new()
CLF.attach_accessory(new_human, W)
new_human.equip_to_slot_or_del(CLF, WEAR_BODY)
/datum/equipment_preset/clf/synth/load_skills(mob/living/carbon/human/new_human)
new_human.allow_gun_usage = FALSE

/datum/equipment_preset/clf/synth/load_gear(mob/living/carbon/human/new_human)
//back
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/ert, WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat, WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/militia, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/full/with_suture_and_graft, WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(new_human), WEAR_IN_BELT)
new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK)

spawn_weapon(/obj/item/weapon/gun/rifle/mar40/carbine, /obj/item/ammo_magazine/rifle/mar40/extended, new_human, 0, 10)

new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet/upp, WEAR_FACE)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF/command(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/synth, WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full_barbed_wire, WEAR_R_STORE)
//face
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF/command(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet/upp, WEAR_FACE)
if(new_human.disabilities & NEARSIGHTED)
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(new_human), WEAR_EYES)
else
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES)
//head
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/jan, WEAR_HEAD)
//body
var/obj/item/clothing/under/colonist/clf/CLF = new()
var/obj/item/clothing/accessory/storage/webbing/webbing = new()
CLF.attach_accessory(new_human, webbing)
new_human.equip_to_slot_or_del(CLF, WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/militia, WEAR_JACKET)
//waist
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/full/with_suture_and_graft, WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(new_human), WEAR_IN_BELT)
//limbs
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat, WEAR_FEET)
//pockets
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/synth, WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full_barbed_wire, WEAR_R_STORE)

/datum/equipment_preset/clf/synth/get_antag_clothing_equipment()
return list(
Expand Down
17 changes: 8 additions & 9 deletions code/modules/gear_presets/upp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2590,7 +2590,7 @@

//*****************************************************************************************************/
/datum/equipment_preset/upp/synth
name = "UPP Combat Synthetic"
name = "UPP Synthetic"
flags = EQUIPMENT_PRESET_EXTRA

languages = ALL_SYNTH_LANGUAGES_UPP
Expand Down Expand Up @@ -2637,6 +2637,9 @@
/datum/equipment_preset/upp/synth/load_race(mob/living/carbon/human/new_human)
new_human.set_species(SYNTH_GEN_THREE)

/datum/equipment_preset/upp/synth/load_skills(mob/living/carbon/human/new_human)
new_human.allow_gun_usage = FALSE

/datum/equipment_preset/upp/synth/load_gear(mob/living/carbon/human/new_human)
//back
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK)
Expand All @@ -2657,22 +2660,18 @@
new_human.equip_to_slot_or_del(new hat, WEAR_HEAD)
//body
var/obj/item/clothing/under/marine/veteran/UPP/medic/UPP = new()
var/obj/item/clothing/accessory/storage/tool_webbing/equipped/W = new()
UPP.attach_accessory(new_human, W)
var/obj/item/clothing/accessory/storage/tool_webbing/equipped/webbing = new()
UPP.attach_accessory(new_human, webbing)
new_human.equip_to_slot_or_del(UPP, WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/support, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/bottle/tricordrazine, WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/bizon/upp, WEAR_J_STORE)
//waist
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/full, WEAR_WAIST)
//limbs
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp/knife, WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/upp, WEAR_HANDS)
//póckets
var/obj/item/storage/pouch/magazine/large/ppouch = new()
new_human.equip_to_slot_or_del(ppouch, WEAR_R_STORE)
for(var/i = 1 to ppouch.storage_slots)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/bizon, WEAR_IN_R_STORE)
//pockets
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical/full/pills, WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical, WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_L_STORE)
Expand Down

0 comments on commit 72c668b

Please sign in to comment.