Skip to content

Commit

Permalink
add: security tactical mask (#6264)
Browse files Browse the repository at this point in the history
  • Loading branch information
PlayerUnknown14 authored Dec 24, 2024
1 parent f4b7de6 commit bdbc1d6
Show file tree
Hide file tree
Showing 13 changed files with 20 additions and 3 deletions.
4 changes: 2 additions & 2 deletions code/game/machinery/vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2111,10 +2111,10 @@
req_access = list(ACCESS_SECURITY)
products = list(/obj/item/restraints/handcuffs = 8,/obj/item/restraints/handcuffs/cable/zipties = 8,/obj/item/grenade/flashbang = 4,/obj/item/flash = 5,
/obj/item/reagent_containers/food/snacks/donut = 12,/obj/item/storage/box/evidence = 6,/obj/item/flashlight/seclite = 4,/obj/item/restraints/legcuffs/bola/energy = 7,
/obj/item/clothing/mask/muzzle/safety = 4, /obj/item/storage/box/swabs = 6, /obj/item/storage/box/fingerprints = 6, /obj/item/eftpos/sec = 4, /obj/item/storage/belt/security/webbing = 2, /obj/item/flashlight/sectaclight = 2, /obj/item/grenade/smokebomb = 8,
/obj/item/clothing/mask/muzzle/safety = 4, /obj/item/storage/box/swabs = 6, /obj/item/storage/box/fingerprints = 6, /obj/item/eftpos/sec = 4, /obj/item/storage/belt/security/webbing = 2, /obj/item/clothing/mask/gas/sechailer/tactical = 5, /obj/item/flashlight/sectaclight = 2, /obj/item/grenade/smokebomb = 8,
)
contraband = list(/obj/item/clothing/glasses/sunglasses = 2,/obj/item/storage/fancy/donut_box = 2,/obj/item/hailer = 5)
prices = list(/obj/item/storage/belt/security/webbing = 2000, /obj/item/flashlight/sectaclight = 300, /obj/item/grenade/smokebomb = 250)
prices = list(/obj/item/storage/belt/security/webbing = 1999, /obj/item/clothing/mask/gas/sechailer/tactical = 299, /obj/item/flashlight/sectaclight = 299, /obj/item/grenade/smokebomb = 249)
refill_canister = /obj/item/vending_refill/security

/obj/machinery/vending/security/training
Expand Down
17 changes: 17 additions & 0 deletions code/modules/clothing/masks/gasmask.dm
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,23 @@
. = ..()
force_adjust_mask()

/obj/item/clothing/mask/gas/sechailer/tactical
name = "\improper Security gas mask FCO-26"
desc = "Тактический противогаз чёрного цвета с красными обзорными стёклами. Разработан компанией N&R специально для сотрудников станционной службы безопасности Nanotrasen. Обеспечивает защиту лица, глаз и органов дыхания от неблагоприятных условий внешей среды."
ru_names = list(
NOMINATIVE = "тактический противогаз СБ",
GENITIVE = "тактического противогаза СБ",
DATIVE = "тактическому противогазу СБ",
ACCUSATIVE = "тактический противогаз СБ",
INSTRUMENTAL = "тактическим противогазом СБ",
PREPOSITIONAL = "тактическом противогазе СБ"
)
icon_state = "tactical_mask"
armor = list("melee" = 10, "bullet" = 5, "laser" = 5, "energy" = 5, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 10, "acid" = 30)
aggressiveness = 3
phrase = 12
can_toggle = FALSE
actions_types = list(/datum/action/item_action/halt, /datum/action/item_action/selectphrase)

/obj/item/clothing/mask/gas/sechailer/hos
name = "\improper HOS SWAT mask"
Expand Down
Binary file modified icons/mob/clothing/mask.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/drask/mask.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/grey/mask.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/monkey/mask.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/tajaran/mask.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/unathi/mask.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/vox/mask.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/vulpkanin/mask.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/wryn/mask.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/masks.dmi
Binary file not shown.
2 changes: 1 addition & 1 deletion paradise.dme
Original file line number Diff line number Diff line change
Expand Up @@ -298,10 +298,10 @@
#include "code\controllers\subsystem\afk.dm"
#include "code\controllers\subsystem\air.dm"
#include "code\controllers\subsystem\ambience.dm"
#include "code\controllers\subsystem\area_contents.dm"
#include "code\controllers\subsystem\asset_loading.dm"
#include "code\controllers\subsystem\capitalism.dm"
#include "code\controllers\subsystem\chat.dm"
#include "code\controllers\subsystem\area_contents.dm"
#include "code\controllers\subsystem\cleanup.dm"
#include "code\controllers\subsystem\dbcore.dm"
#include "code\controllers\subsystem\debugview.dm"
Expand Down

0 comments on commit bdbc1d6

Please sign in to comment.