Skip to content

Commit

Permalink
Ballistic Mask (#5495)
Browse files Browse the repository at this point in the history
adds ballistic mask to game and security disk.

Fixes uniform sprite in FEM.DMI that had white sprites in the armpits.
  • Loading branch information
Legate-Maxson authored Jul 1, 2024
1 parent 006f46c commit 51ae8f4
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 0 deletions.
5 changes: 5 additions & 0 deletions code/datums/autolathe/clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,8 @@
build_path = /obj/item/clothing/head/space/void/riggedvoidsuit
materials = list(MATERIAL_STEEL = 6, MATERIAL_PLASTIC = 8, MATERIAL_PLASTEEL = 3) //so hand crafting is better

/datum/design/autolathe/clothing/bmask
name = "Ballistic Mask"
build_path = /obj/item/clothing/head/helmet/faceshield/bmask
materials = list(MATERIAL_STEEL = 30, MATERIAL_PLASTIC = 10, MATERIAL_PLASTEEL = 10)

1 change: 1 addition & 0 deletions code/game/objects/items/weapons/autolathe_disk/marshal.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
/datum/design/autolathe/sec/gun_case,
/datum/design/autolathe/container/ammocan_ih,
/datum/design/autolathe/container/ammocan_serb, //Moved from actual ammo disks
/datum/design/autolathe/clothing/bmask = 10,
)

/obj/item/computer_hardware/hard_drive/portable/design/security/hos
Expand Down
47 changes: 47 additions & 0 deletions code/modules/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@
usr.update_action_buttons()
return 1


/*
* Factions
*/
Expand Down Expand Up @@ -1605,6 +1606,52 @@

usr.update_action_buttons()

//S E C M A S K//

/obj/item/clothing/head/helmet/faceshield/bmask
name = "ballistic mask"
desc = "An armored mask, Protects the head and face from impacts and shrapnel."
icon_state = "bmask"
armor_up = list(melee = 15, bullet = 15, energy = 15, bomb = 10, bio = 0, rad = 0)
armor_list = list(melee = 35, bullet = 35, energy = 35, bomb = 20, bio = 0, rad = 0)
flags_inv = null
siemens_coefficient = 1
up = TRUE

/obj/item/clothing/head/helmet/faceshield/bmask/verb/toggle_style()
set name = "Adjust Style"
set category = "Object"
set src in usr

if(!isliving(loc))
return

var/mob/M = usr
var/list/options = list()
options["Black"] = "bmask"
options["Tan"] = "bmask_tan"
options["Green"] = "bmask_green"
options["Steel"] = "bmask_steel"
options["Kriosan"] = "bmask_snoot"

var/choice = input(M,"What kind of style do you want?","Adjust Style") as null|anything in options

if(src && choice && !M.incapacitated() && Adjacent(M))
base_state = options[choice]
icon_state = options[choice]
item_state = options[choice]
if(up)
icon_state = "[base_state]up"
item_state_slots = list(
slot_l_hand_str = options[choice],
slot_r_hand_str = options[choice],
)
to_chat(M, "You adjusted your mask's style into [choice] mode.")
update_icon()
update_wear_icon()
usr.update_action_buttons()
return 1

// S E R B I A //

/obj/item/clothing/head/helmet/faceshield/altyn
Expand Down
Binary file modified icons/inventory/head/icon.dmi
Binary file not shown.
Binary file modified icons/inventory/head/mob.dmi
Binary file not shown.
Binary file modified icons/inventory/uniform/mob_fem.dmi
Binary file not shown.

0 comments on commit 51ae8f4

Please sign in to comment.