Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change sechailer flags + cleanup a bit of gasmask code #28001

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/machinery/suit_storage_unit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@

/obj/machinery/suit_storage_unit/security/hos
name = "Head of Security's suit storage unit"
mask_type = /obj/item/clothing/mask/gas/sechailer/hos
mask_type = /obj/item/clothing/mask/gas/sechailer/swat/hos
suit_type = /obj/item/mod/control/pre_equipped/safeguard
req_access = list(ACCESS_HOS)

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/weapons/storage/garment.dm
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
new /obj/item/clothing/under/rank/security/warden/corporate(src)
new /obj/item/clothing/under/rank/security/warden/skirt(src)
new /obj/item/clothing/under/rank/security/warden/skirt/corporate(src)
new /obj/item/clothing/mask/gas/sechailer/warden(src)
new /obj/item/clothing/mask/gas/sechailer/swat/warden(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
new /obj/item/clothing/head/helmet/space/plasmaman/security/warden(src)
new /obj/item/clothing/under/plasmaman/security/warden(src)
Expand Down
48 changes: 15 additions & 33 deletions code/modules/clothing/masks/gasmask.dm
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = INFINITY, ACID = 60)
origin_tech = "materials=2;engineering=3"
actions_types = list(/datum/action/item_action/toggle)
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
flags_cover = MASKCOVERSEYES
can_toggle = TRUE
visor_flags_inv = HIDEEYES
Expand All @@ -56,7 +55,6 @@
desc = "A military-grade gas mask that can be connected to an air supply."
icon_state = "gas_mining"
actions_types = list(/datum/action/item_action/adjust)
flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT
armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 10, ACID = 35)
resistance_flags = FIRE_PROOF
can_toggle = TRUE
Expand Down Expand Up @@ -96,17 +94,11 @@


//Bane gas mask
/obj/item/clothing/mask/banemask
/obj/item/clothing/mask/gas/banemask
name = "bane mask"
desc = "Only when the station is in flames, do you have my permission to robust."
icon_state = "bane_mask"
flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES
w_class = WEIGHT_CLASS_NORMAL
item_state = "bane_mask"
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
item_state = "sechailer"


//Plague Dr suit can be found in clothing/suits/bio.dm
Expand Down Expand Up @@ -258,6 +250,7 @@
desc = "A standard issue Security gas mask with integrated 'Compli-o-nator 3000' device, plays over a dozen pre-recorded compliance phrases designed to get scumbags to stand still whilst you taze them. Do not tamper with the device."
icon_state = "sechailer"
item_state = "sechailer"
flags_inv = HIDEEYES|HIDEFACE
var/phrase = 1
var/aggressiveness = 1
var/safety = 1
Expand All @@ -284,41 +277,30 @@
"super" = "Face the wrath of the golden bolt.",
"dredd" = "I am, the LAW!"
)
/obj/item/clothing/mask/gas/sechailer/hos
name = "head of security's SWAT mask"
desc = "A close-fitting tactical mask with an especially aggressive Compli-o-nator 3000. It has a tan stripe."
icon_state = "hosmask"
can_toggle = FALSE
aggressiveness = 3
phrase = 12
actions_types = list(/datum/action/item_action/halt, /datum/action/item_action/selectphrase)

/obj/item/clothing/mask/gas/sechailer/warden
name = "warden's SWAT mask"
desc = "A close-fitting tactical mask with an especially aggressive Compli-o-nator 3000. It has a blue stripe."
icon_state = "wardenmask"
can_toggle = FALSE
aggressiveness = 3
phrase = 12
actions_types = list(/datum/action/item_action/halt, /datum/action/item_action/selectphrase)


/obj/item/clothing/mask/gas/sechailer/swat
name = "\improper SWAT mask"
desc = "A close-fitting tactical mask with an especially aggressive Compli-o-nator 3000."
icon_state = "officermask"
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
aggressiveness = 3
phrase = 12
actions_types = list(/datum/action/item_action/halt, /datum/action/item_action/selectphrase)

/obj/item/clothing/mask/gas/sechailer/blue
/obj/item/clothing/mask/gas/sechailer/swat/hos
name = "head of security's SWAT mask"
desc = "A close-fitting tactical mask with an especially aggressive Compli-o-nator 3000. It has a tan stripe."
icon_state = "hosmask"

/obj/item/clothing/mask/gas/sechailer/swat/warden
name = "warden's SWAT mask"
desc = "A close-fitting tactical mask with an especially aggressive Compli-o-nator 3000. It has a blue stripe."
icon_state = "wardenmask"

/obj/item/clothing/mask/gas/sechailer/swat/blue
name = "blue SWAT mask"
desc = "A neon blue swat mask, used for demoralizing Greytide in the wild."
icon_state = "blue_sechailer"
item_state = "blue_sechailer"
aggressiveness = 3
phrase = 12
actions_types = list(/datum/action/item_action/halt, /datum/action/item_action/selectphrase)

/obj/item/clothing/mask/gas/sechailer/cyborg
name = "security hailer"
Expand Down
Binary file modified icons/mob/clothing/species/tajaran/mask.dmi
Binary file not shown.
Loading