Skip to content

Commit

Permalink
MoreGearChanges
Browse files Browse the repository at this point in the history
  • Loading branch information
Steelpoint committed Jul 9, 2023
1 parent 9f0ab1f commit 40eb87f
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 21 deletions.
23 changes: 16 additions & 7 deletions code/modules/gear_presets/survivors.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1429,13 +1429,12 @@
)

/datum/equipment_preset/survivor/upp/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP (new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/survivor (new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp_knife(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare(new_human), WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/med_small_stack(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/PK9(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS)

Expand Down Expand Up @@ -1472,15 +1471,22 @@
var/i = rand(1,4)
switch(i)
if (1 , 2 , 3)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP (new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/survivor (new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/webbing(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/device/flashlight(new_human), WEAR_J_STORE)
if (4)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP (new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/survivor (new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_JACKET)

/datum/equipment_preset/survivor/upp/proc/spawn_random_upp_belt(mob/living/carbon/human/new_human)
var/i = rand(1,3)
switch(i)
if (1 , 2)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/PK9(new_human), WEAR_WAIST)
if (3)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/upp(new_human), WEAR_WAIST)
/datum/equipment_preset/survivor/upp/soldier
name = "Survivor - UPP Soldier"
paygrade = "UE2"
Expand All @@ -1492,6 +1498,7 @@
add_upp_weapon(new_human)
spawn_random_upp_headgear(new_human)
spawn_random_upp_armor(new_human)
spawn_random_upp_belt(new_human)

..()
/datum/equipment_preset/survivor/upp/sapper
Expand All @@ -1501,7 +1508,7 @@
skills = /datum/skills/upp/combat_engineer

/datum/equipment_preset/survivor/upp/sapper/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/engi (new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/engi/survivor (new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/insulated(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(new_human), WEAR_EYES)
Expand All @@ -1518,9 +1525,9 @@
skills = /datum/skills/upp/combat_medic

/datum/equipment_preset/survivor/upp/medic/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/medic (new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/medic/survivor (new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new/obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/full(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/partial(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/medic/upp(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini(new_human), WEAR_IN_BACK)
Expand All @@ -1546,6 +1553,7 @@
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/PK9(new_human), WEAR_WAIST)

..()

Expand All @@ -1562,6 +1570,7 @@
new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/PK9(new_human), WEAR_WAIST)
add_upp_weapon(new_human)

..()
21 changes: 7 additions & 14 deletions maps/map_files/BigRed/standalone/crashlanding-upp-dorms.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -513,11 +513,9 @@
/turf/open/floor,
/area/bigredv2/outside/general_offices)
"kd" = (
/obj/effect/landmark/nightmare{
insert_tag = "dorms"
},
/obj/effect/decal/cleanable/dirt,
/obj/item/stack/sandbags/large_stack,
/turf/open/floor/plating{
dir = 8;
icon_state = "platingdmg3"
},
/area/bigredv2/outside/dorms)
Expand Down Expand Up @@ -1352,12 +1350,6 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/c)
"zq" = (
/obj/item/stack/barbed_wire/small_stack,
/turf/open/floor/plating{
icon_state = "platingdmg3"
},
/area/bigredv2/outside/dorms)
"zr" = (
/turf/open/floor{
dir = 8;
Expand Down Expand Up @@ -1973,7 +1965,7 @@
},
/area/bigredv2/outside/c)
"Kd" = (
/obj/item/stack/sandbags/large_stack,
/obj/item/stack/barbed_wire/small_stack,
/turf/open/floor/plating{
icon_state = "platingdmg1"
},
Expand Down Expand Up @@ -2062,6 +2054,7 @@
},
/area/bigredv2/outside/dorms)
"KV" = (
/obj/structure/closet/crate/supply,
/obj/item/ammo_box/magazine/misc/flares,
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
Expand Down Expand Up @@ -3084,7 +3077,7 @@ bJ
gG
BS
fl
kd
aI
Tm
rP
ep
Expand Down Expand Up @@ -3388,8 +3381,8 @@ fy
sI
mW
XL
zq
AH
ql
kd
TF
VX
fe
Expand Down

0 comments on commit 40eb87f

Please sign in to comment.