Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updates UPP Synthetic Loadout #6098

Merged
merged 6 commits into from
Apr 17, 2024
Merged

Updates UPP Synthetic Loadout #6098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3ee8bab
SynthTime
Apr 6, 2024
f3211e2
MoreStuff
Apr 6, 2024
e6a5653
Merge branch 'master' into synthtime
Steelpoint Apr 7, 2024
27b0025
Merge branch 'master' into synthtime
Steelpoint Apr 7, 2024
cefdef8
Chahge
Apr 17, 2024
af000e8
asd
Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions code/game/objects/items/reagent_containers/glass.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,14 @@
ground_offset_x = 9
ground_offset_y = 8

/obj/item/reagent_container/glass/beaker/vial/epinephrine
name = "epinephrine vial"

/obj/item/reagent_container/glass/beaker/vial/epinephrine/Initialize()
. = ..()
reagents.add_reagent("adrenaline", 30)
update_icon()

/obj/item/reagent_container/glass/beaker/vial/tricordrazine
name = "tricordrazine vial"

Expand Down
10 changes: 10 additions & 0 deletions code/game/objects/items/reagent_containers/glass/bottle.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,3 +396,13 @@
. = ..()
reagents.add_reagent("tricordrazine", 60)
update_icon()

/obj/item/reagent_container/glass/bottle/epinephrine
name = "\improper Epinephrine bottle"
desc = "A small bottle. Contains epinephrine - Used to increase a patients arterial blood pressure, amongst other actions, to assist in cardiopulmonary resuscitation." //"I can't lie to you about your odds of a successful resuscitation, but you have my sympathies"
volume = 60

/obj/item/reagent_container/glass/bottle/epinephrine/Initialize()
. = ..()
reagents.add_reagent("adrenaline", 60)
update_icon()
3 changes: 3 additions & 0 deletions code/game/objects/items/reagent_containers/hypospray.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,9 @@
/obj/item/reagent_container/hypospray/tricordrazine
starting_vial = /obj/item/reagent_container/glass/beaker/vial/tricordrazine

/obj/item/reagent_container/hypospray/epinephrine
starting_vial = /obj/item/reagent_container/glass/beaker/vial/epinephrine

/obj/item/reagent_container/hypospray/sedative
name = "Sedative Hypospray"
starting_vial = /obj/item/reagent_container/glass/beaker/vial/sedative
23 changes: 23 additions & 0 deletions code/game/objects/items/storage/belt.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,29 @@
new /obj/item/storage/pill_bottle/inaprovaline(src)
new /obj/item/storage/pill_bottle/tramadol(src)

/obj/item/storage/belt/medical/lifesaver/upp/synth/fill_preset_inventory()
new /obj/item/storage/pill_bottle/bicaridine(src)
new /obj/item/storage/pill_bottle/bicaridine(src)
new /obj/item/storage/pill_bottle/kelotane(src)
new /obj/item/storage/pill_bottle/kelotane(src)
new /obj/item/storage/pill_bottle/tramadol(src)
new /obj/item/storage/pill_bottle/tramadol(src)
new /obj/item/storage/pill_bottle/antitox(src)
new /obj/item/storage/pill_bottle/alkysine(src)
new /obj/item/storage/pill_bottle/imidazoline(src)
new /obj/item/stack/medical/advanced/bruise_pack(src)
new /obj/item/stack/medical/advanced/bruise_pack(src)
new /obj/item/stack/medical/advanced/bruise_pack(src)
new /obj/item/stack/medical/advanced/ointment(src)
new /obj/item/stack/medical/advanced/ointment(src)
new /obj/item/stack/medical/advanced/ointment(src)
new /obj/item/stack/medical/splint(src)
new /obj/item/stack/medical/splint(src)
new /obj/item/stack/medical/splint(src)
new /obj/item/reagent_container/hypospray/autoinjector/dexalinp(src)
new /obj/item/reagent_container/hypospray/autoinjector/oxycodone(src)
new /obj/item/device/healthanalyzer(src)

/obj/item/storage/belt/security
name = "\improper M276 pattern security rig"
desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This configuration is commonly seen among USCM Military Police and peacekeepers, though it can hold some light munitions."
Expand Down
15 changes: 15 additions & 0 deletions code/game/objects/items/storage/pouch.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1272,6 +1272,21 @@
new /obj/item/explosive/plastic(src)
new /obj/item/explosive/plastic(src)

/obj/item/storage/pouch/tools/tactical/upp
name = "synthetic tools pouch"
desc = "Special issue tools pouch for UPP synthetics. Due to the enhanced strength of the synthetic and its inability to feel discomfort, this pouch is designed to maximize internal space with no concern for its wearer's comfort."
icon_state = "tools"
storage_slots = 7

/obj/item/storage/pouch/tools/tactical/upp/fill_preset_inventory()
new /obj/item/tool/wrench(src)
new /obj/item/tool/crowbar(src)
new /obj/item/tool/wirecutters(src)
new /obj/item/device/multitool(src)
new /obj/item/tool/weldingtool(src)
new /obj/item/stack/cable_coil(src)
new /obj/item/stack/cable_coil(src)

/obj/item/storage/pouch/tools/uppsynth/fill_preset_inventory()
new /obj/item/tool/crowbar(src)
new /obj/item/tool/wirecutters(src)
Expand Down
16 changes: 16 additions & 0 deletions code/modules/clothing/suits/marine_armor/ert.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,22 @@
armor_rad = CLOTHING_ARMOR_MEDIUMLOW
armor_internaldamage = CLOTHING_ARMOR_HIGH

/obj/item/clothing/suit/storage/marine/faction/UPP/support/synth
name = "\improper UL6 Synthetic personal armor"
desc = "Modified variant of the UL6 personel armor system intended to be useable by Synthetic units. Offers no protection but very little movement impairment."
flags_marine_armor = ARMOR_LAMP_OVERLAY|SYNTH_ALLOWED
armor_melee = CLOTHING_ARMOR_NONE
armor_bullet = CLOTHING_ARMOR_NONE
armor_laser = CLOTHING_ARMOR_NONE
armor_energy = CLOTHING_ARMOR_NONE
armor_bomb = CLOTHING_ARMOR_NONE
armor_bio = CLOTHING_ARMOR_NONE
armor_rad = CLOTHING_ARMOR_NONE
armor_internaldamage = CLOTHING_ARMOR_NONE
slowdown = SLOWDOWN_ARMOR_VERY_LIGHT
time_to_unequip = 0.5 SECONDS
time_to_equip = 1 SECONDS

/obj/item/clothing/suit/storage/marine/faction/UPP/commando
name = "\improper UM5CU personal armor"
desc = "A modification of the UM5, designed for stealth operations."
Expand Down
19 changes: 19 additions & 0 deletions code/modules/clothing/under/ties.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,25 @@
/obj/item/clothing/accessory/storage/surg_vest/drop_green/equipped
hold = /obj/item/storage/internal/accessory/surg_vest/equipped

/obj/item/clothing/accessory/storage/surg_vest/drop_green/upp
hold = /obj/item/storage/internal/accessory/surg_vest/drop_green/upp

/obj/item/storage/internal/accessory/surg_vest/drop_green/upp/fill_preset_inventory()
new /obj/item/tool/surgery/scalpel(src)
new /obj/item/tool/surgery/hemostat(src)
new /obj/item/tool/surgery/retractor(src)
new /obj/item/tool/surgery/cautery(src)
new /obj/item/tool/surgery/circular_saw(src)
new /obj/item/tool/surgery/surgicaldrill(src)
new /obj/item/tool/surgery/scalpel/pict_system(src)
new /obj/item/tool/surgery/bonesetter(src)
new /obj/item/tool/surgery/FixOVein(src)
new /obj/item/stack/medical/advanced/bruise_pack(src)
new /obj/item/stack/nanopaste(src)
new /obj/item/tool/surgery/bonegel(src)
new /obj/item/tool/surgery/bonegel(src)
new /obj/item/reagent_container/blood/OMinus(src)

/obj/item/clothing/accessory/storage/surg_vest/drop_black
name = "black surgical drop pouch"
desc = "A tactical black synthcotton drop pouch purpose-made for holding surgical tools."
Expand Down
1 change: 1 addition & 0 deletions code/modules/cm_marines/marines_consoles.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1084,6 +1084,7 @@ GLOBAL_LIST_EMPTY_TYPED(crewmonitor, /datum/crewmonitor)
// 50-59: Engineering
JOB_UPP_COMBAT_SYNTH = 50,
JOB_UPP_CREWMAN = 51,
JOB_UPP_SUPPORT_SYNTH = 52,
// 60-69: Soldiers
JOB_UPP_LEADER = 60,
JOB_UPP_SPECIALIST = 61,
Expand Down
35 changes: 20 additions & 15 deletions code/modules/gear_presets/upp.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2600,8 +2600,8 @@
languages = ALL_SYNTH_LANGUAGES_UPP

skills = /datum/skills/synthetic
assignment = JOB_UPP_COMBAT_SYNTH
rank = JOB_UPP_COMBAT_SYNTH
assignment = JOB_UPP_SUPPORT_SYNTH
rank = JOB_UPP_SUPPORT_SYNTH
paygrade = PAY_SHORT_SYN
idtype = /obj/item/card/id/dogtag

Expand Down Expand Up @@ -2648,14 +2648,15 @@
/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)
new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact, WEAR_IN_BACK) //1
new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) //2
new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) //2.33
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //2.66
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //3
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //3.33
Steelpoint marked this conversation as resolved.
Show resolved Hide resolved
new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact, 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/storage/firstaid/adv, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/blood/OMinus, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/blood/OMinus, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/roller/surgical, WEAR_IN_BACK)
//face
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/tool/screwdriver, WEAR_R_EAR)
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
Expand All @@ -2665,25 +2666,29 @@
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/webbing = new()
var/obj/item/clothing/accessory/storage/surg_vest/drop_green/upp/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/synth, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked, WEAR_J_STORE)
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/naval, WEAR_ACCESSORY)
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)
//waist
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/full, WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/synth, 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)
//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/tools/tactical/upp, 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)
new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/tricordrazine, WEAR_IN_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/epinephrine, WEAR_IN_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/bottle/epinephrine, WEAR_IN_L_STORE)

/datum/equipment_preset/upp/synth/get_antag_clothing_equipment()
return list(
Expand Down
Loading