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

UPP skill changes for HvH and WL fix #7589

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+20 −11
Open

UPP skill changes for HvH and WL fix #7589

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
89ad9f9
eh
uuuuhuuuu Nov 14, 2024
164eb5b
upp co whitelists
uuuuhuuuu Nov 14, 2024
f08dcae
co whitelitsts
uuuuhuuuu Nov 14, 2024
d1d280d
eh fixes now
uuuuhuuuu Nov 14, 2024
36ff204
ehm is it correct now
uuuuhuuuu Nov 14, 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
31 changes: 20 additions & 11 deletions code/modules/gear_presets/upp.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
name = "UPP Soldier (Cryo)"
flags = EQUIPMENT_PRESET_START_OF_ROUND

skills = /datum/skills/upp
skills = /datum/skills/pfc
assignment = JOB_UPP
rank = JOB_UPP
role_comm_title = "Sol"
Expand All @@ -107,6 +107,7 @@
/datum/equipment_preset/upp/soldier/dressed
name = "UPP Soldier"
flags = EQUIPMENT_PRESET_EXTRA
skills = /datum/skills/upp

/datum/equipment_preset/upp/soldier/dressed/load_gear(mob/living/carbon/human/new_human)
//face
Expand Down Expand Up @@ -296,7 +297,7 @@
/datum/equipment_preset/upp/medic
name = "UPP Medic (Cryo)"

skills = /datum/skills/upp/combat_medic
skills = /datum/skills/combat_medic
assignment = JOB_UPP_MEDIC
rank = JOB_UPP_MEDIC
role_comm_title = "Med"
Expand All @@ -305,6 +306,8 @@

/datum/equipment_preset/upp/medic/dressed
name = "UPP Medic"

skills = /datum/skills/upp/combat_medic
flags = EQUIPMENT_PRESET_EXTRA

/datum/equipment_preset/upp/medic/dressed/load_gear(mob/living/carbon/human/new_human)
Expand Down Expand Up @@ -491,7 +494,7 @@
/datum/equipment_preset/upp/sapper
name = "UPP Sapper (Cryo)"

skills = /datum/skills/upp/combat_engineer
skills = /datum/skills/combat_engineer
assignment = JOB_UPP_ENGI
rank = JOB_UPP_ENGI
role_comm_title = "Sap"
Expand All @@ -500,6 +503,8 @@

/datum/equipment_preset/upp/sapper/dressed
name = "UPP Sapper"

skills = /datum/skills/upp/combat_engineer
flags = EQUIPMENT_PRESET_EXTRA

/datum/equipment_preset/upp/sapper/dressed/load_gear(mob/living/carbon/human/new_human)
Expand Down Expand Up @@ -647,10 +652,6 @@
)

//*****************************************************************************************************/
/datum/job/antag/upp/specialist
title = JOB_UPP_SPECIALIST
gear_preset = /datum/equipment_preset/upp/specialist
flags_startup_parameters = ROLE_ADD_TO_SQUAD

/datum/equipment_preset/upp/specialist
name = "UPP Specialist minigun (Cryo)"
Expand Down Expand Up @@ -950,7 +951,7 @@
/datum/equipment_preset/upp/leader
name = "UPP Squad Leader (Cryo)"

skills = /datum/skills/upp/SL
skills = /datum/skills/SL
assignment = JOB_UPP_LEADER
rank = JOB_UPP_LEADER
role_comm_title = "SL"
Expand All @@ -959,6 +960,8 @@

/datum/equipment_preset/upp/leader/dressed
name = "UPP Squad Leader"

skills = /datum/skills/upp/SL
flags = EQUIPMENT_PRESET_EXTRA

/datum/equipment_preset/upp/leader/dressed/load_gear(mob/living/carbon/human/new_human)
Expand Down Expand Up @@ -1950,6 +1953,7 @@
paygrades = list(PAY_SHORT_UO3 = JOB_PLAYTIME_TIER_0)
skills = /datum/skills/upp/kapitan


/datum/equipment_preset/upp/officer/kapitan/dressed
name = "UPP Kapitan"

Expand Down Expand Up @@ -2287,7 +2291,7 @@
)

//*****************************************************************************************************/
/datum/job/antag/upp/officer/lt_kolonel
/datum/job/antag/upp/officer/podpolkovnik
flags_whitelist = WHITELIST_COMMANDER_COUNCIL
title = JOB_UPP_LTKOL_OFFICER
gear_preset = /datum/equipment_preset/upp/officer/podpolkovnik
Expand Down Expand Up @@ -2470,7 +2474,7 @@

//*****************************************************************************************************/
/datum/job/antag/upp/officer/kolonel
flags_whitelist = WHITELIST_COMMANDER_COLONEL
flags_whitelist = WHITELIST_COMMANDER_COLONEL
title = JOB_UPP_KOL_OFFICER
gear_preset = /datum/equipment_preset/upp/officer/podpolkovnik

Expand Down Expand Up @@ -2822,6 +2826,8 @@
title = JOB_UPP_LT_GENERAL
gear_preset = /datum/equipment_preset/upp/officer/ley_gen

flags_whitelist = WHITELIST_COMMANDER

/datum/equipment_preset/upp/officer/ley_gen
name = "UPP General Polkovnik (Cryo)"
assignment = JOB_UPP_LT_GENERAL
Expand Down Expand Up @@ -3209,6 +3215,8 @@
title = JOB_UPP_SUPPORT_SYNTH
gear_preset = /datum/equipment_preset/upp/synth

flags_whitelist = WHITELIST_SYNTHETIC

/datum/equipment_preset/upp/synth
name = "UPP Synthetic (Cryo)"

Expand All @@ -3221,6 +3229,7 @@
paygrades = list(PAY_SHORT_SYN = JOB_PLAYTIME_TIER_0)
idtype = /obj/item/card/id/dogtag


/datum/equipment_preset/upp/synth/dressed
name = "UPP Synthetic"

Expand Down Expand Up @@ -3355,7 +3364,7 @@

list("BELT (CHOOSE 1)", 0, null, null, null),
list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Lifesaver Bag", 0, /obj/item/storage/belt/medical/lifesaver/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Lifesaver Bag", 0, /obj/item/storage/belt/medical/lifesaver/upp/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Medical Storage Belt", 0, /obj/item/storage/belt/medical/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Toolbelt Rig (Full)", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),

Expand Down
Loading