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.

Sign up for GitHub

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

Bounty: New donor item "PRS-1" #783

Merged
merged 12 commits into from
Dec 6, 2023
Merged

Bounty: New donor item "PRS-1" #783

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
500ea25
Red_mask
Yata9arasu Nov 28, 2023
58db5ba
Update donor.dm
Yata9arasu Nov 30, 2023
677eac6
Update mask.dm
Yata9arasu Nov 30, 2023
828e294
Update mask.dm
Yata9arasu Nov 30, 2023
b4f7077
Merge branch 'ss220club:master' into red_mask
Yata9arasu Nov 30, 2023
9dff1b3
outstup
Yata9arasu Nov 30, 2023
91e2280
Merge branch 'ss220club:master' into red_mask
Yata9arasu Dec 1, 2023
d173b7b
Update modular_ss220/clothing/code/mask.dm
Yata9arasu Dec 1, 2023
1b720e5
Update mask.dm
Yata9arasu Dec 5, 2023
2fd9af5
Update donor.dm
Yata9arasu Dec 5, 2023
1aec9b0
Update modular_ss220/clothing/code/mask.dm
Yata9arasu Dec 5, 2023
a169dc0
Merge branch 'master' into red_mask
Legendaxe Dec 6, 2023
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
8 changes: 8 additions & 0 deletions modular_ss220/clothing/code/mask.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,14 @@
/datum/outfit/job/chef
mask = /obj/item/clothing/mask/fakemoustache/chef

/obj/item/clothing/mask/gas/red_gas
name = "ПРС-1"
desc = "Модульный противогаз с защитой глаз от погодных условий."
Yata9arasu marked this conversation as resolved.
Show resolved Hide resolved
icon = 'modular_ss220/clothing/icons/object/masks.dmi'
icon_state = "red_gas"
icon_override = 'modular_ss220/clothing/icons/mob/mask.dmi'
item_state = "red_gas"

/obj/item/clothing/mask/breath/breathscarf
name = "шарф с системой дыхания"
desc = "Стильный и инновационный шарф, который служит дыхательной маской в экстремальных ситуациях."
Expand Down
Binary file modified modular_ss220/clothing/icons/mob/mask.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/object/masks.dmi
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions modular_ss220/loadout/code/donor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,3 +238,8 @@
display_name = "Шарф с системой дыхания"
path = /obj/item/clothing/mask/breath/breathscarf
cost = 2

/datum/gear/donor/red_gas
display_name = "ПРС-1"
path = /obj/item/clothing/mask/gas/red_gas
donator_tier = 2
Yata9arasu marked this conversation as resolved.
Show resolved Hide resolved
Yata9arasu marked this conversation as resolved.
Show resolved Hide resolved