Skip to content

Commit

Permalink
Cryo loadout changes + locker stuff (#378)
Browse files Browse the repository at this point in the history
  • Loading branch information
@DexterDude
DexterDude committed Sep 3, 2024
1 parent c8f4e3a commit 76b76d9
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 173 deletions.
13 changes: 0 additions & 13 deletions code/game/objects/structures/crates_lockers/closets/job_closets.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,6 @@

/obj/structure/closet/secure_closet/platoon_sergeant/Initialize()
. = ..()
new /obj/item/weapon/gun/rifle/m41aMK1(src)
new /obj/item/ammo_magazine/rifle/m41aMK1(src)
new /obj/item/ammo_magazine/rifle/m41aMK1(src)
new /obj/item/ammo_magazine/rifle/m41aMK1(src)
new /obj/item/ammo_magazine/rifle/m41aMK1(src)
new /obj/item/ammo_magazine/rifle/m41aMK1(src)
new /obj/item/clothing/head/helmet/marine/leader(src)
new /obj/item/device/binoculars/range/designator(src)
new /obj/item/device/whistle(src)
Expand All @@ -99,12 +93,6 @@

/obj/structure/closet/secure_closet/platoon_sergeant_forecon/Initialize()
. = ..()
new /obj/item/weapon/gun/rifle/m41aMK1(src)
new /obj/item/ammo_magazine/rifle/m41aMK1(src)
new /obj/item/ammo_magazine/rifle/m41aMK1(src)
new /obj/item/ammo_magazine/rifle/m41aMK1(src)
new /obj/item/ammo_magazine/rifle/m41aMK1(src)
new /obj/item/ammo_magazine/rifle/m41aMK1(src)
new /obj/item/device/binoculars/range/designator(src)
new /obj/item/device/whistle(src)

Expand All @@ -115,7 +103,6 @@

/obj/structure/closet/secure_closet/squad_sergeant/Initialize()
. = ..()
new /obj/item/clothing/head/helmet/marine/rto(src)
new /obj/item/device/binoculars/range/designator(src)
new /obj/item/device/whistle(src)

Expand Down
141 changes: 1 addition & 140 deletions code/modules/gear_presets/uscm.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
var/ert_squad = FALSE

/datum/equipment_preset/uscm/load_status(mob/living/carbon/human/new_human)
new_human.nutrition = rand(NUTRITION_VERYLOW, NUTRITION_LOW)
new_human.nutrition = NUTRITION_VERYLOW

/datum/equipment_preset/uscm/load_preset(mob/living/carbon/human/new_human, randomise, count_participant)
. = ..()
Expand Down Expand Up @@ -108,13 +108,6 @@

minimap_icon = "private"

/datum/equipment_preset/uscm/pfc/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/pfc/lesser_rank
paygrade = "ME1"

Expand All @@ -126,13 +119,6 @@
faction_group = list(FACTION_UPP)
faction = FACTION_UPP

/datum/equipment_preset/uscm/pfc/upp/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/lightpack/upp
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/pfc/upp/lesser_rank
paygrade = "UE1"

Expand All @@ -141,14 +127,6 @@
paygrade = "ME3"
skills = /datum/skills/pfc/recon

/datum/equipment_preset/uscm/pfc/forecon/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel/standard
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine/standard

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)


/datum/equipment_preset/uscm/pfc/forecon/lesser_rank
paygrade = "ME2"

Expand All @@ -167,14 +145,6 @@

minimap_icon = "smartgunner"

/datum/equipment_preset/uscm/sg/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)


/datum/equipment_preset/uscm/sg/lesser_rank
paygrade = "ME3"

Expand All @@ -188,13 +158,6 @@
faction_group = list(FACTION_UPP)
faction = FACTION_UPP

/datum/equipment_preset/uscm/sg/upp/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/lightpack/upp
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/sg/upp/lesser_rank
paygrade = "UE3"

Expand All @@ -203,35 +166,11 @@
paygrade = "ME5"
skills = /datum/skills/smartgunner/recon

/datum/equipment_preset/uscm/sg/forecon/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel/standard
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine/standard

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/sg/forecon/lesser_rank
paygrade = "ME4"

//*****************************************************************************************************/

/datum/equipment_preset/uscm/sg/full
name = "USCM Squad Smartgunner"
flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE

/datum/equipment_preset/uscm/sg/full/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun(new_human), WEAR_J_STORE)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/specrag(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles/no_nightvision(new_human), WEAR_EYES)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/full(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS)

/datum/equipment_preset/uscm/sg/full/load_status(mob/living/carbon/human/new_human)
return //No cryo munchies

/datum/equipment_preset/uscm/rto
name = "USCM Radio Telephone Operator"
flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE
Expand All @@ -245,13 +184,6 @@

minimap_icon = "rto"

/datum/equipment_preset/uscm/rto/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/rto/lesser_rank
paygrade = "ME3"

Expand Down Expand Up @@ -377,14 +309,6 @@

minimap_icon = "spec"

/datum/equipment_preset/uscm/spec/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/specrag(new_human), WEAR_HEAD)

/datum/equipment_preset/uscm/spec/cryo
name = "USCM Cryo Squad Weapons Specialist"
auto_squad_name = SQUAD_MARINE_CRYO
Expand Down Expand Up @@ -435,13 +359,6 @@

utility_under = list(/obj/item/clothing/under/marine/medic)

/datum/equipment_preset/uscm/medic/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel/medic
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine/medic

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/medic/lesser_rank
paygrade = "ME3"

Expand All @@ -454,13 +371,6 @@
faction_group = list(FACTION_UPP)
faction = FACTION_UPP

/datum/equipment_preset/uscm/medic/upp/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/lightpack/upp
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine/medic/upp

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/medic/upp/lesser_rank
paygrade = "UE3"

Expand All @@ -470,13 +380,6 @@
paygrade = "ME5"
skills = /datum/skills/combat_medic/recon

/datum/equipment_preset/uscm/medic/forecon/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel/medic/standard
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine/medic/standard

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/medic/forecon/lesser_rank
paygrade = "ME4"

Expand All @@ -494,13 +397,6 @@
skills = /datum/skills/tl
minimap_icon = "tl"

/datum/equipment_preset/uscm/tl/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/tl/upp
name = "UPP Squad Sergeant"
paygrade = "UE5"
Expand All @@ -509,27 +405,13 @@
faction_group = list(FACTION_UPP)
faction = FACTION_UPP

/datum/equipment_preset/uscm/tl/upp/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/lightpack/upp
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/tl/forecon
name = "FORECON Assistant Squad Leader"
assignment = "Assistant Squad Leader"
paygrade = "ME6"
role_comm_title = "aSL"
skills = /datum/skills/tl/recon

/datum/equipment_preset/uscm/tl/forecon/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel/standard
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine/standard

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/*****************************************************************************************************/

/datum/equipment_preset/uscm/engineer
Expand Down Expand Up @@ -577,13 +459,6 @@

minimap_icon = "leader"

/datum/equipment_preset/uscm/leader/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/leader/lesser_rank
paygrade = "ME6"

Expand All @@ -595,13 +470,6 @@
faction_group = list(FACTION_UPP)
faction = FACTION_UPP

/datum/equipment_preset/uscm/leader/upp/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/lightpack/upp
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/leader/upp/lesser_rank
paygrade = "UE6"

Expand All @@ -611,13 +479,6 @@
paygrade = "ME8"
role_comm_title = "SL"

/datum/equipment_preset/uscm/leader/forecon/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel/standard
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine/standard

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/leader/forecon/lesser_rank
paygrade = "ME7"

Expand Down
Loading

0 comments on commit 76b76d9

Please sign in to comment.