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.

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

Adds a Researcher and CMB variants on Trijent, also touched up RD Clothes and the Trijent Sec Guard. #5438

Merged
merged 4 commits into from
Jan 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 19 additions & 2 deletions code/modules/clothing/under/jobs/medsci.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,27 @@
* Science
*/

/obj/item/clothing/under/rank/rd
desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer is a Research Director."
name = "research director's uniform"
icon_state = "rdalt_s"
worn_state = "rdalt_s"
permeability_coefficient = 0.50
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_LOW
armor_rad = CLOTHING_ARMOR_LOW
armor_internaldamage = CLOTHING_ARMOR_LOW
flags_jumpsuit = FALSE

/obj/item/clothing/under/rank/rdalt
desc = "A simple blue utilitarian jumpsuit that serves as the standard issue service uniform of support synthetics onboard USCM facilities. While commonly associated with the staple Bishop units, reduced funding to the Colonial Marines has led to a wide range of models filling these uniforms, especially in battalions operating in the edge frontier."
name = "synthetic service uniform"
desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer is a Research Director."
name = "research director's jumpsuit"
icon_state = "rdalt"
permeability_coefficient = 0.50
armor_melee = CLOTHING_ARMOR_NONE
armor_bullet = CLOTHING_ARMOR_NONE
armor_laser = CLOTHING_ARMOR_NONE
Expand Down
30 changes: 28 additions & 2 deletions code/modules/gear_presets/survivors/trijent/preset_trijent.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,25 @@
/datum/equipment_preset/survivor/security/trijent/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/head_of_security/navyblue(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp/mpcap(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/det_suit/black(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET)
..()

/datum/equipment_preset/survivor/colonial_marshal/trijent
name = "Survivor - Trijent Colonial Marshal Deputy"
assignment = "CMB Deputy"

/datum/equipment_preset/survivor/security/trijent/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord(new_human), WEAR_ACCESSORY)
BadAtThisGame302 marked this conversation as resolved.
Show resolved Hide resolved
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
..()

/datum/equipment_preset/survivor/doctor/trijent
name = "Survivor - Trijent Doctor"
assignment = "Trijent Dam Doctor"
Expand All @@ -29,6 +43,18 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/blue(new_human), WEAR_HEAD)
..()

/datum/equipment_preset/survivor/scientist/trijent
name = "Survivor - Trijent Researcher"
assignment = "Trijent Dam Researcher"

/datum/equipment_preset/survivor/scientist/trijent/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/rd(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/jan(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/researcher(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/leather(new_human), WEAR_FEET)
..()

/datum/equipment_preset/survivor/trucker/trijent
name = "Survivor - Trijent Dam Heavy Vehicle Operator"
assignment = "Trijent Dam Heavy Vehicle Operator"
Expand Down
3 changes: 2 additions & 1 deletion maps/desert_dam.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
"webmap_url": "Trijent",
"survivor_types": [
"/datum/equipment_preset/survivor/doctor/trijent",
"/datum/equipment_preset/survivor/scientist/trijent",
"/datum/equipment_preset/survivor/roughneck",
"/datum/equipment_preset/survivor/chaplain/trijent",
"/datum/equipment_preset/survivor/interstellar_commerce_commission_liaison",
"/datum/equipment_preset/survivor/colonial_marshal",
"/datum/equipment_preset/survivor/colonial_marshal/trijent",
"/datum/equipment_preset/survivor/engineer/trijent",
"/datum/equipment_preset/survivor/engineer/trijent/hydro",
"/datum/equipment_preset/survivor/trucker/trijent",
Expand Down
Loading