Skip to content

Commit 8b56626

Browse files
DexterDudeDexterDude
committed
fixes
1 parent 94e6406 commit 8b56626

File tree

2 files changed

+27
-45
lines changed

2 files changed

+27
-45
lines changed

‎code/modules/gear_presets/Halo/unsc_marines.dm

+26-44
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,9 @@
250250
if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
251251
new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf, WEAR_FACE)
252252

253+
/datum/equipment_preset/unsc/pfc/equipped/load_status(mob/living/carbon/human/new_human)
254+
new_human.nutrition = NUTRITION_HIGH
255+
253256
//weapon spec (sniper)
254257
/datum/equipment_preset/unsc/spec/equipped_sniper
255258
name = parent_type::name + " (Sniper, Equipped)"
@@ -289,6 +292,9 @@
289292
if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
290293
new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf, WEAR_FACE)
291294

295+
/datum/equipment_preset/unsc/spec/equipped_sniper/load_status(mob/living/carbon/human/new_human)
296+
new_human.nutrition = NUTRITION_HIGH
297+
292298
//weapon spec (spnkr)
293299
/datum/equipment_preset/unsc/spec/equipped_spnkr
294300
name = parent_type::name + " (SPNKr, Equipped)"
@@ -326,6 +332,9 @@
326332
if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
327333
new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf, WEAR_FACE)
328334

335+
/datum/equipment_preset/unsc/spec/equipped_spnkr/load_status(mob/living/carbon/human/new_human)
336+
new_human.nutrition = NUTRITION_HIGH
337+
329338
//hospital corpsman
330339
/datum/equipment_preset/unsc/medic/equipped
331340
name = parent_type::name + " (Equipped)"
@@ -365,6 +374,9 @@
365374
if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
366375
new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf, WEAR_FACE)
367376

377+
/datum/equipment_preset/unsc/medic/equipped/load_status(mob/living/carbon/human/new_human)
378+
new_human.nutrition = NUTRITION_HIGH
379+
368380
//rto
369381
/datum/equipment_preset/unsc/rto/equipped
370382
name = parent_type::name + " (Equipped)"
@@ -408,6 +420,9 @@
408420
if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
409421
new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf, WEAR_FACE)
410422

423+
/datum/equipment_preset/unsc/rto/equipped/load_status(mob/living/carbon/human/new_human)
424+
new_human.nutrition = NUTRITION_HIGH
425+
411426
//fireteam leader
412427
/datum/equipment_preset/unsc/tl/equipped
413428
name = parent_type::name + " (Equipped)"
@@ -451,6 +466,9 @@
451466
if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
452467
new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf, WEAR_FACE)
453468

469+
/datum/equipment_preset/unsc/tl/equipped/load_status(mob/living/carbon/human/new_human)
470+
new_human.nutrition = NUTRITION_HIGH
471+
454472
//squad leader
455473

456474
/datum/equipment_preset/unsc/leader/equipped
@@ -498,50 +516,8 @@
498516
if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
499517
new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf, WEAR_FACE)
500518

501-
/datum/equipment_preset/unsc/leader/equipped
502-
name = parent_type::name + " (Equipped)"
503-
504-
/datum/equipment_preset/unsc/leader/equipped/load_gear(mob/living/carbon/human/new_human)
505-
new_human.undershirt = "Marine Undershirt"
506-
new_human.underwear = "Marine Boxers"
507-
//back
508-
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/unsc(new_human), WEAR_BACK)
509-
new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_BACK)
510-
new_human.equip_to_slot_or_del(new /obj/item/storage/box/m94/signal(new_human), WEAR_IN_BACK)
511-
new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator/sergeant(new_human), WEAR_IN_BACK)
512-
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/halo/m6c(new_human), WEAR_IN_BACK)
513-
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/halo/m6c(new_human), WEAR_IN_BACK)
514-
//face
515-
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/solardevils/foxtrot(new_human), WEAR_L_EAR)
516-
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big/unsc(new_human), WEAR_EYES)
517-
//head
518-
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/unsc(new_human), WEAR_HEAD)
519-
//uniform
520-
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY)
521-
//jacket
522-
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/marine/unsc(new_human), WEAR_JACKET)
523-
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/halo/br55(new_human), WEAR_J_STORE)
524-
//accessories
525-
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/pads(new_human), WEAR_ACCESSORY)
526-
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/pads/greaves(new_human), WEAR_ACCESSORY)
527-
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing/m52b/grenade/m9_frag(new_human), WEAR_ACCESSORY)
528-
//waist
529-
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine(new_human), WEAR_WAIST)
530-
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/halo/br55(new_human), WEAR_IN_BELT)
531-
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/halo/br55(new_human), WEAR_IN_BELT)
532-
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/halo/br55(new_human), WEAR_IN_BELT)
533-
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/halo/br55(new_human), WEAR_IN_BELT)
534-
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/halo/br55(new_human), WEAR_IN_BELT)
535-
//limbs
536-
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
537-
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS)
538-
//pockets
539-
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_L_STORE)
540-
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol/unsc(new_human), WEAR_R_STORE)
541-
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/halo/m6c(new_human), WEAR_IN_R_STORE)
542-
543-
if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
544-
new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf, WEAR_FACE)
519+
/datum/equipment_preset/unsc/leader/equipped/load_status(mob/living/carbon/human/new_human)
520+
new_human.nutrition = NUTRITION_HIGH
545521

546522
/datum/equipment_preset/unsc/platco/equipped
547523
name = parent_type::name + " (Equipped)"
@@ -588,6 +564,9 @@
588564
if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
589565
new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf, WEAR_FACE)
590566

567+
/datum/equipment_preset/unsc/platco/equipped/load_status(mob/living/carbon/human/new_human)
568+
new_human.nutrition = NUTRITION_HIGH
569+
591570
/datum/equipment_preset/unsc/pilot/equipped
592571
name = parent_type::name + " (Equipped)"
593572

@@ -619,3 +598,6 @@
619598
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_L_STORE)
620599
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol/unsc(new_human), WEAR_R_STORE)
621600
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/halo/m6g(new_human), WEAR_IN_R_STORE)
601+
602+
/datum/equipment_preset/unsc/pilot/equipped/load_status(mob/living/carbon/human/new_human)
603+
new_human.nutrition = NUTRITION_HIGH

‎code/modules/projectiles/guns/halo/unsc_guns.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
WEAR_J_STORE = 'icons/halo/mob/humans/onmob/suit_slot_halo.dmi',
180180
WEAR_L_HAND = 'icons/halo/mob/humans/onmob/items_lefthand_halo.dmi',
181181
WEAR_R_HAND = 'icons/halo/mob/humans/onmob/items_righthand_halo.dmi'
182-
WEAR_WAIST = 'icons/halo/mob/humans/onmob/suit_slot_halo.dmi',
182+
WEAR_WAIST = 'icons/halo/mob/humans/onmob/suit_slot_halo.dmi'
183183
)
184184

185185
/obj/item/weapon/gun/shotgun/pump/halo/m90

0 commit comments

Comments
 (0)