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" #764

Closed
wants to merge 32 commits into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
209ff71
Fixed1
Yata9arasu Oct 23, 2023
0ea8f9d
Fix. WILL WORK!
Yata9arasu Oct 23, 2023
b1e7553
Added real authors...
Yata9arasu Oct 23, 2023
a5cd468
Fixed ig
Yata9arasu Oct 25, 2023
93739a3
1
Yata9arasu Oct 25, 2023
550ebd6
Fixed tabs
Yata9arasu Oct 25, 2023
66f1a55
Merge branch 'ss220club:master' into master
Yata9arasu Oct 25, 2023
47723a4
Spaced changed for tabs
Yata9arasu Oct 25, 2023
15c887c
Changed tabs
Yata9arasu Oct 25, 2023
3f294ff
Merge branch 'master' of https://github.com/Yata9arasu/Paradise-SS220
Yata9arasu Oct 25, 2023
32381c0
Changed module paths
Yata9arasu Oct 26, 2023
0e0e161
Changing modules
Yata9arasu Oct 26, 2023
519d959
Changing paths
Yata9arasu Oct 26, 2023
8bc013d
No need this now
Yata9arasu Oct 26, 2023
aeee108
Merge branch 'master' into master
Yata9arasu Oct 30, 2023
226512d
Deleted authors
Yata9arasu Oct 31, 2023
aa9697d
Merge branch 'master' of https://github.com/Yata9arasu/Paradise-SS220
Yata9arasu Oct 31, 2023
e6e97c8
Merge branch 'ss220club:master' into master
Yata9arasu Nov 1, 2023
add1d20
vi jacket 1
Yata9arasu Nov 1, 2023
3e52e5b
Merge branch 'master' of https://github.com/Yata9arasu/Paradise-SS220
Yata9arasu Nov 1, 2023
978362e
Revert "vi jacket 1"
Yata9arasu Nov 1, 2023
aaed875
Merge branch 'ss220club:master' into master
Yata9arasu Nov 5, 2023
3484a4b
Merge branch 'ss220club:master' into master
Yata9arasu Nov 6, 2023
e8b879b
Merge branch 'ss220club:master' into master
Yata9arasu Nov 8, 2023
1405471
fixing textures
Yata9arasu Nov 8, 2023
737868c
Added PRS-1
Yata9arasu Nov 25, 2023
1b77135
upstream
Yata9arasu Nov 25, 2023
b07bae0
Revert "upstream"
Yata9arasu Nov 25, 2023
cbd5d36
shortened code
Yata9arasu Nov 25, 2023
0810c19
Merge conflicts (WHY???)
Yata9arasu Nov 25, 2023
2486c7c
Red_mask1
Yata9arasu Nov 25, 2023
0e09772
fixing things 1
Yata9arasu Nov 25, 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
7 changes: 7 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,6 +53,13 @@

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

Check warning on line 56 in modular_ss220/clothing/code/mask.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

nested absolute path inside /datum/outfit/job/chef
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Табуляцию сюда верни

name = "ПРС-1"
desc = "Модульный противогаз, предназначен в основном для совместного использования с имплантироваными кибер лёгкими."

Check failure on line 58 in modular_ss220/clothing/code/mask.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

undefined var 'desc' on type '/datum/outfit/job/chef'
icon = 'modular_ss220/clothing/icons/object/masks.dmi'

Check failure on line 59 in modular_ss220/clothing/code/mask.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

undefined var 'icon' on type '/datum/outfit/job/chef'
icon_state = "red_gas"

Check failure on line 60 in modular_ss220/clothing/code/mask.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

undefined var 'icon_state' on type '/datum/outfit/job/chef'
icon_override = 'modular_ss220/clothing/icons/mob/masks.dmi'

Check failure on line 61 in modular_ss220/clothing/code/mask.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

undefined var 'icon_override' on type '/datum/outfit/job/chef'
item_state = "red_gas"

Check failure on line 62 in modular_ss220/clothing/code/mask.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

undefined var 'item_state' on type '/datum/outfit/job/chef'

/obj/item/clothing/mask/breath/breathscarf
name = "шарф с системой дыхания"
Expand Down
Binary file added modular_ss220/clothing/icons/mob/masks.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.
4 changes: 4 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 @@ -57,6 +57,10 @@
path = /obj/item/clothing/suit/hooded/vi_arcane
donator_tier = 3
cost = 2
/datum/gear/donor/red_gas
display_name = "ПРС-1"
path = /obj/item/clothing/mask/red_gas
donator_tier = 2

/datum/gear/donor/wallet
display_name = "Бумажник"
Expand Down
Loading