Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
@AmoryBlaine
AmoryBlaine committed Jul 20, 2024
1 parent 3fd6eca commit 53e5a50
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 40 deletions.
4 changes: 2 additions & 2 deletions code/game/objects/items/storage/pouch.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -453,15 +453,15 @@

/obj/item/storage/pouch/magazine/pulse_rifle/fill_preset_inventory()
for(var/i = 1 to storage_slots)
new /obj/item/ammo_magazine/rifle(src)
new /obj/item/ammo_magazine/rifle/m41aMK1(src)

/obj/item/storage/pouch/magazine/pistol/pmc_mateba/fill_preset_inventory()
for(var/i = 1 to storage_slots)
new /obj/item/ammo_magazine/revolver/mateba/highimpact/ap(src)

/obj/item/storage/pouch/magazine/pistol/pmc_mod88/fill_preset_inventory()
for(var/i = 1 to storage_slots)
new /obj/item/ammo_magazine/pistol/mod88(src)
new /obj/item/ammo_magazine/pistol/mod88/normalpoint(src)

/obj/item/storage/pouch/magazine/pistol/pmc_vp78/fill_preset_inventory()
for(var/i = 1 to storage_slots)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/clothing/shoes/miscellaneous.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,9 @@
flags_inventory = NOSLIPPING
slowdown = SHOES_SLOWDOWN+1

/obj/item/clothing/shoes/galoshes
desc = "Rubber boots"
/obj/item/clothing/shoes/galoshes
name = "galoshes"
desc = "Rubber boots"
icon_state = "galoshes"
permeability_coefficient = 0.05
flags_inventory = NOSLIPPING
Expand Down
34 changes: 3 additions & 31 deletions code/modules/gear_presets/_select_equipment.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ GLOBAL_LIST_EMPTY(personal_closets)
var/helmetpath = pick(
/obj/item/clothing/head/hardhat,
/obj/item/clothing/head/hardhat/white,
/obj/item/clothing/head/headband/alpha
/obj/item/clothing/head/headband/alpha,
)
new_human.equip_to_slot_or_del(new helmetpath, WEAR_HEAD)

Expand All @@ -425,8 +425,8 @@ GLOBAL_LIST_EMPTY(personal_closets)
var/shoespath = pick(
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/shoes/laceup/brown,
/obj/item/clothing/shoes/marine/civilian
/obj/item/clothing/shoes/marine/civilian/brown
/obj/item/clothing/shoes/marine/civilian,
/obj/item/clothing/shoes/marine/civilian/brown,
)
new_human.equip_to_slot_or_del(new shoespath, WEAR_FEET)

Expand Down Expand Up @@ -742,34 +742,6 @@ var/list/rebel_rifles = list(
for(var/i in 0 to ammo_amount-1)
new ammopath(spawnloc)


/datum/equipment_preset/proc/generate_random_marine_primary_for_wo(mob/living/carbon/human/new_human, shuffle = rand(0,10))
switch(shuffle)
if(0 to 4)
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1(new_human), WEAR_J_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m41amk1(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human), WEAR_IN_BACK)
if(5,7)
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39(new_human), WEAR_J_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m39(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39(new_human), WEAR_IN_BACK)
else
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump(new_human), WEAR_J_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/shotgun/full(new_human), WEAR_WAIST)
return

/datum/equipment_preset/proc/add_common_wo_equipment(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full(new_human), WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/self_setting(new_human), WEAR_L_EAR)
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/storage/box/MRE(new_human), WEAR_IN_BACK)

/datum/equipment_preset/proc/add_ice_colony_survivor_equipment(mob/living/carbon/human/new_human)
if((SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) && (SSmapping.configs[GROUND_MAP].map_name != MAP_CORSAT))
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD)
Expand Down
10 changes: 5 additions & 5 deletions code/modules/gear_presets/upp.dm
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/datum/equipment_preset/upp
name = FACTION_UPP
languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_CHINESE)
languages = list(LANGUAGE_RUSSIAN, LANGUAGE_CHINESE)
faction = FACTION_UPP
idtype = /obj/item/card/id/dogtag
origin_override = ORIGIN_UPP
Expand All @@ -10,7 +10,7 @@
access = get_access(ACCESS_LIST_UPP_ALL) //ACCESS_COME_BACK_TO_ME

/datum/equipment_preset/upp/load_name(mob/living/carbon/human/new_human, randomise)
new_human.gender = pick(60;MALE,40;FEMALE)
new_human.gender = pick(50;MALE,50;FEMALE)
var/datum/preferences/A = new()
A.randomize_appearance(new_human)
var/random_name
Expand Down Expand Up @@ -959,13 +959,13 @@

/datum/equipment_preset/upp/conscript
//meme role
name = "UPP Conscript"
name = "UPP Colonial Defense Soldider"
flags = EQUIPMENT_PRESET_EXTRA

skills = /datum/skills/upp
assignment = JOB_UPP_CONSCRIPT
assignment = "Colonial Defense Rifleman"
rank = JOB_UPP_CONSCRIPT
role_comm_title = "Cons"
role_comm_title = "ColDef"
paygrade = "UE1"

/datum/equipment_preset/upp/conscript/load_gear(mob/living/carbon/human/new_human)
Expand Down
35 changes: 35 additions & 0 deletions code/modules/gear_presets/uscm.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,41 @@
name = "USCM Cryo Squad Rifleman (Equipped)"
auto_squad_name = SQUAD_MARINE_CRYO

/datum/equipment_preset/uscm/private_equipped/upp
name = "UPP Squad Rifleman"
paygrade = "UE2"
access = list(ACCESS_UPP_GENERAL)
languages = list(LANGUAGE_RUSSIAN, LANGUAGE_CHINESE)
faction_group = list(FACTION_UPP)
faction = FACTION_UPP

/datum/equipment_preset/uscm/private_equipped/upp/load_gear(mob/living/carbon/human/new_human)
//back
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp(new_human), WEAR_BACK)
//face
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR)
//head
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP, WEAR_HEAD)
//body
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp(new_human), WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp(new_human), WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71(new_human), WEAR_J_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/machete/full, WEAR_IN_BELT)
//limbs
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp_knife, WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/brown, WEAR_HANDS)
//pockets
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine, WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, WEAR_IN_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, WEAR_IN_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, WEAR_IN_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE)

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


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

Expand Down
Binary file removed icons/mob/humans/onmob/uniform-layer/wy_goons.dmi
View file
Binary file not shown.

0 comments on commit 53e5a50

Please sign in to comment.