Skip to content

Commit

Permalink
New UPP Table Flag, UPP Patches and Satchels
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeff Watchson committed Apr 1, 2024
1 parent b5e180c commit e13be09
Show file tree
Hide file tree
Showing 12 changed files with 86 additions and 13 deletions.
6 changes: 6 additions & 0 deletions code/game/objects/items/storage/backpack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,12 @@
/obj/item/storage/backpack/satchel/lockable/liaison
lock_overridable = FALSE

/obj/item/storage/backpack/satchel/blue
icon_state = "satchel_blue"

/obj/item/storage/backpack/satchel/black
icon_state = "satchel_black"

/obj/item/storage/backpack/satchel/norm
name = "satchel"
desc = "A trendy-looking satchel."
Expand Down
5 changes: 5 additions & 0 deletions code/game/objects/prop.dm
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@
icon_state = "uscmflag2"
desc = "A miniature historical table flag of the United States Colonial Marines, in traditional scarlet and gold. The USCM logo sits in the center; an eagle is perched atop it and an anchor rests behind it."

/obj/item/prop/tableflag/upp
name = "UPP table flag"
icon_state = "uppflag"
desc = "A miniature table flag of the Union of Progressive Peoples, consisting of 17 yellow stars, surrounding the bigger one in the middle on scarlet field."

/obj/item/prop/flower_vase
name = "flower vase"
icon_state = "flowervase"
Expand Down
5 changes: 5 additions & 0 deletions code/game/objects/structures/signs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,11 @@
desc = "This banner depicts Delta Squad's motto. The Marines of Delta Squad adopted it after picking an old bomber movie for movie night a while back."
icon_state = "maximumeffort"

/obj/structure/sign/banners/united_americas_flag
name = "\improper United Americas flag"
desc = "A flag of the United Americas. Inspires patriotism, fear, or revulsion depending on the viewer's political leanings."
icon_state = "ua_flag"

//=====================//
// SEMIOTIC STANDARD //
//===================//
Expand Down
8 changes: 4 additions & 4 deletions code/modules/clothing/gloves/color.dm
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/obj/item/clothing/gloves/yellow
desc = "These gloves will protect the wearer from electric shock."
name = "insulated gloves"
icon_state = "lightbrown"
item_state = "lightbrowngloves"
icon_state = "insulated"
item_state = "insulated"
siemens_coefficient = 0
permeability_coefficient = 0.05
flags_cold_protection = BODY_FLAG_HANDS
Expand All @@ -13,8 +13,8 @@
/obj/item/clothing/gloves/fyellow //Cheap Chinese Crap
desc = "These gloves are cheap copies of the coveted gloves, no way this can end badly."
name = "budget insulated gloves"
icon_state = "lightbrown"
item_state = "lightbrowngloves"
icon_state = "insulated"
item_state = "insulated"
siemens_coefficient = 1 //Set to a default of 1, gets overridden in New()
permeability_coefficient = 0.05

Expand Down
12 changes: 11 additions & 1 deletion code/modules/clothing/under/ties.dm
Original file line number Diff line number Diff line change
Expand Up @@ -386,9 +386,19 @@
icon_state = "commandopatch"

/obj/item/clothing/accessory/patch/upp
name = "UPP patch"
desc = "A fire-resistant shoulder patch, worn by the men and women of the Union of Progressive Peoples Armed Collective."
icon_state = "upppatch"

/obj/item/clothing/accessory/patch/upp/airborne
name = "UPP Airborne Reconnaissance patch"
desc = "A fire-resistant shoulder patch, worn by the men and women of the 173rd Airborne Reconnaissance Platoon."
icon_state = "upppatch"
icon_state = "vdvpatch"

/obj/item/clothing/accessory/patch/upp/naval
name = "UPP Naval Infantry patch"
desc = "A fire-resistant shoulder patch, worn by the men and women of the UPP Naval Infantry."
icon_state = "navalpatch"

/obj/item/clothing/accessory/poncho
name = "USCM Poncho"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
if(2)
uniform.roll_suit_sleeves(new_human)
new_human.equip_to_slot_or_del(uniform, WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp (new_human), WEAR_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp(new_human), WEAR_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/airborne, WEAR_ACCESSORY)
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)
Expand Down Expand Up @@ -205,6 +206,7 @@
new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_J_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/partial, WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/airborne, WEAR_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/uppsynth, WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp/knife, WEAR_FEET)
59 changes: 52 additions & 7 deletions code/modules/gear_presets/upp.dm

Large diffs are not rendered by default.

Binary file modified icons/mob/humans/onmob/ties.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/backpacks.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/ties.dmi
Binary file not shown.
Binary file modified icons/obj/items/items.dmi
Binary file not shown.
Binary file modified icons/obj/structures/props/banners.dmi
Binary file not shown.

0 comments on commit e13be09

Please sign in to comment.