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

Breath scarf #702

Merged
merged 12 commits into from
Nov 22, 2023
+13 −0
Merged

Breath scarf #702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
10cd9e7
breath scarf
FlutterSnedDraw Nov 14, 2023
49ecf13
breath scarf
FlutterSnedDraw Nov 14, 2023
2464502
Update donor.dm
FlutterSnedDraw Nov 14, 2023
93bdf55
Update mask.dm
FlutterSnedDraw Nov 14, 2023
4c77d9a
Update mask.dm
FlutterSnedDraw Nov 14, 2023
daaa9b9
Update mask.dm
FlutterSnedDraw Nov 17, 2023
8f8f091
Merge branch 'breath-scarf' of https://github.com/FlutterSnedDraw/Par…
FlutterSnedDraw Nov 17, 2023
8d7fcd4
Merge branch 'breath-scarf' of https://github.com/FlutterSnedDraw/Par…
FlutterSnedDraw Nov 17, 2023
b88b744
Merge branch 'ss220club:master' into breath-scarf
FlutterSnedDraw Nov 17, 2023
ca22a63
Add files via upload
FlutterSnedDraw Nov 17, 2023
2731cd3
Update modular_ss220/loadout/code/donor.dm
FlutterSnedDraw Nov 21, 2023
948a6c3
Merge branch 'master' into breath-scarf
FlutterSnedDraw Nov 21, 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 @@ -53,3 +53,11 @@

/datum/outfit/job/chef
mask = /obj/item/clothing/mask/fakemoustache/chef

/obj/item/clothing/mask/breath/breathscarf
name = "шарф с системой дыхания"
desc = "Стильный и инновационный шарф, который служит дыхательной маской в экстремальных ситуациях."
icon = 'modular_ss220/clothing/icons/object/masks.dmi'
icon_override = 'modular_ss220/clothing/icons/mob/mask.dmi'
icon_state = "breathscarf"
item_state = "breathscarf"
Binary file added modular_ss220/clothing/icons/mob/mask.dmi
View file
Open in desktop
Binary file not shown.
Binary file added 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 @@ -233,3 +233,8 @@
path = /obj/item/id_skin/terminal
donator_tier = 4
cost = 3

/datum/gear/donor/breathscarf
FlutterSnedDraw marked this conversation as resolved.
Show resolved Hide resolved
display_name = "Шарф с системой дыхания"
path = /obj/item/clothing/mask/breath/breathscarf
cost = 2
Loading