-
Notifications
You must be signed in to change notification settings - Fork 22
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
Fixes for supplypacks #28
Changes from all commits
e3620cc
0941285
9d54cda
fbb3b84
985dfd4
86ecd01
4d91b43
520ed8c
fe45fd8
3f21c9a
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,7 +17,7 @@ | |
cost = 30 | ||
containertype = /obj/structure/closet/crate/secure | ||
containername = "light armor crate" | ||
access = ACCESS_SECURITY | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Все изменения надо будет переоформить. Я не уверен что такое декали, если это объект, то его можно перезаписать вынеся в отдельный модпак. Если нет, то в кор коде оформить не модульные изменения |
||
access = ACCESS_SECURITY_LVL2 | ||
|
||
/decl/hierarchy/supply_pack/security/armor | ||
name = "Armor - Unmarked" | ||
|
@@ -26,7 +26,7 @@ | |
cost = 20 | ||
containertype = /obj/structure/closet/crate/secure | ||
containername = "armor crate" | ||
access = ACCESS_SECURITY | ||
access = ACCESS_SECURITY_LVL2 | ||
|
||
/decl/hierarchy/supply_pack/security/tacticalarmor | ||
name = "Armor - Tactical" | ||
|
@@ -41,7 +41,7 @@ | |
cost = 45 | ||
containertype = /obj/structure/closet/crate/secure | ||
containername = "tactical armor crate" | ||
access = ACCESS_ARMORY | ||
access = ACCESS_SECURITY_LVL3 | ||
|
||
/decl/hierarchy/supply_pack/security/blackguards | ||
name = "Armor - Arm and leg guards, black" | ||
|
@@ -50,7 +50,7 @@ | |
cost = 20 | ||
containertype = /obj/structure/closet/crate/secure | ||
containername = "arm and leg guards crate" | ||
access = ACCESS_ARMORY | ||
access = ACCESS_SECURITY_LVL3 | ||
|
||
/decl/hierarchy/supply_pack/security/blueguards | ||
name = "Armor - Arm and leg guards, blue" | ||
|
@@ -59,7 +59,7 @@ | |
cost = 20 | ||
containertype = /obj/structure/closet/crate/secure | ||
containername = "arm and leg guards crate" | ||
access = ACCESS_ARMORY | ||
access = ACCESS_SECURITY_LVL3 | ||
|
||
/decl/hierarchy/supply_pack/security/greenguards | ||
name = "Armor - Arm and leg guards, green" | ||
|
@@ -68,7 +68,7 @@ | |
cost = 20 | ||
containertype = /obj/structure/closet/crate/secure | ||
containername = "arm and leg guards crate" | ||
access = ACCESS_ARMORY | ||
access = ACCESS_SECURITY_LVL3 | ||
|
||
/decl/hierarchy/supply_pack/security/navyguards | ||
name = "Armor - Arm and leg guards, navy blue" | ||
|
@@ -77,7 +77,7 @@ | |
cost = 20 | ||
containertype = /obj/structure/closet/crate/secure | ||
containername = "arm and leg guards crate" | ||
access = ACCESS_ARMORY | ||
access = ACCESS_SECURITY_LVL3 | ||
|
||
/decl/hierarchy/supply_pack/security/tanguards | ||
name = "Armor - Arm and leg guards, tan" | ||
|
@@ -86,7 +86,7 @@ | |
cost = 20 | ||
containertype = /obj/structure/closet/crate/secure | ||
containername = "arm and leg guards crate" | ||
access = ACCESS_ARMORY | ||
access = ACCESS_SECURITY_LVL3 | ||
|
||
/decl/hierarchy/supply_pack/security/riotarmor | ||
name = "Armor - Riot gear" | ||
|
@@ -98,7 +98,7 @@ | |
cost = 80 | ||
containertype = /obj/structure/closet/crate/secure | ||
containername = "riot armor crate" | ||
access = ACCESS_ARMORY | ||
access = ACCESS_SECURITY_LVL3 | ||
|
||
/decl/hierarchy/supply_pack/security/ballisticarmor | ||
name = "Armor - Ballistic" | ||
|
@@ -107,7 +107,7 @@ | |
cost = 60 | ||
containertype = /obj/structure/closet/crate/secure | ||
containername = "ballistic suit crate" | ||
access = ACCESS_ARMORY | ||
access = ACCESS_SECURITY_LVL3 | ||
|
||
/decl/hierarchy/supply_pack/security/ablativearmor | ||
name = "Armor - Ablative" | ||
|
@@ -116,7 +116,7 @@ | |
cost = 60 | ||
containertype = /obj/structure/closet/crate/secure | ||
containername = "ablative suit crate" | ||
access = ACCESS_ARMORY | ||
access = ACCESS_SECURITY_LVL3 | ||
|
||
/decl/hierarchy/supply_pack/security/weapons | ||
name = "Weapons - Security basic" | ||
|
@@ -127,15 +127,15 @@ | |
cost = 50 | ||
containertype = /obj/structure/closet/crate/secure/weapon | ||
containername = "weapons crate" | ||
access = ACCESS_SECURITY | ||
access = ACCESS_SECURITY_LVL2 | ||
|
||
/decl/hierarchy/supply_pack/security/egun | ||
name = "Weapons - Energy sidearms" | ||
contains = list(/obj/item/gun/energy/gun/secure = 4) | ||
cost = 40 | ||
containertype = /obj/structure/closet/crate/secure/weapon | ||
containername = "energy sidearms crate" | ||
access = ACCESS_ARMORY | ||
access = ACCESS_SECURITY_LVL3 | ||
security_level = SUPPLY_SECURITY_ELEVATED | ||
|
||
/decl/hierarchy/supply_pack/security/egun/shady | ||
|
@@ -152,7 +152,7 @@ | |
cost = 50 | ||
containertype = /obj/structure/closet/crate/secure/weapon | ||
containername = "electromagnetic weapons crate" | ||
access = ACCESS_ARMORY | ||
access = ACCESS_SECURITY_LVL3 | ||
security_level = SUPPLY_SECURITY_ELEVATED | ||
|
||
/decl/hierarchy/supply_pack/security/shotgun | ||
|
@@ -161,7 +161,7 @@ | |
cost = 60 | ||
containertype = /obj/structure/closet/crate/secure/weapon | ||
containername = "shotgun crate" | ||
access = ACCESS_ARMORY | ||
access = ACCESS_SECURITY_LVL3 | ||
security_level = SUPPLY_SECURITY_ELEVATED | ||
|
||
/decl/hierarchy/supply_pack/security/flashbang | ||
|
@@ -170,15 +170,15 @@ | |
cost = 30 | ||
containertype = /obj/structure/closet/crate/secure/weapon | ||
containername = "flashbang crate" | ||
access = ACCESS_SECURITY | ||
access = ACCESS_SECURITY_LVL2 | ||
|
||
/decl/hierarchy/supply_pack/security/teargas | ||
name = "Weapons - Tear gas grenades" | ||
contains = list(/obj/item/storage/box/teargas = 2) | ||
cost = 30 | ||
containertype = /obj/structure/closet/crate/secure/weapon | ||
containername = "tear gas grenades crate" | ||
access = ACCESS_SECURITY | ||
access = ACCESS_SECURITY_LVL2 | ||
|
||
/decl/hierarchy/supply_pack/security/shotgunammo | ||
name = "Ammunition - Lethal shells" | ||
|
@@ -187,7 +187,7 @@ | |
cost = 60 | ||
containertype = /obj/structure/closet/crate/secure/weapon | ||
containername = "lethal shotgun shells crate" | ||
access = ACCESS_SECURITY | ||
access = ACCESS_SECURITY_LVL2 | ||
security_level = SUPPLY_SECURITY_ELEVATED | ||
|
||
/decl/hierarchy/supply_pack/security/shotgunbeanbag | ||
|
@@ -196,15 +196,15 @@ | |
cost = 30 | ||
containertype = /obj/structure/closet/crate/secure/weapon | ||
containername = "beanbag shotgun shells crate" | ||
access = ACCESS_SECURITY | ||
access = ACCESS_SECURITY_LVL2 | ||
|
||
/decl/hierarchy/supply_pack/security/pdwammo | ||
name = "Ammunition - SMG top mounted" | ||
contains = list(/obj/item/ammo_magazine/smg_top = 4) | ||
cost = 40 | ||
containertype = /obj/structure/closet/crate/secure/weapon | ||
containername = "SMG ammunition crate" | ||
access = ACCESS_SECURITY | ||
access = ACCESS_SECURITY_LVL2 | ||
security_level = SUPPLY_SECURITY_HIGH | ||
|
||
/decl/hierarchy/supply_pack/security/pdwammorubber | ||
|
@@ -213,23 +213,23 @@ | |
cost = 30 | ||
containertype = /obj/structure/closet/crate/secure/weapon | ||
containername = "SMG rubber ammunition crate" | ||
access = ACCESS_SECURITY | ||
access = ACCESS_SECURITY_LVL2 | ||
|
||
/decl/hierarchy/supply_pack/security/pdwammopractice | ||
name = "Ammunition - SMG top mounted practice" | ||
contains = list(/obj/item/ammo_magazine/smg_top/practice = 8) | ||
cost = 30 | ||
containertype = /obj/structure/closet/crate/secure/weapon | ||
containername = "SMG practice ammunition crate" | ||
access = ACCESS_SECURITY | ||
access = ACCESS_SECURITY_LVL2 | ||
|
||
/decl/hierarchy/supply_pack/security/bullpupammo | ||
name = "Ammunition - military rifle" | ||
contains = list(/obj/item/ammo_magazine/mil_rifle = 4) | ||
cost = 60 | ||
containertype = /obj/structure/closet/crate/secure/weapon | ||
containername = "military rifle ammunition crate" | ||
access = ACCESS_SECURITY | ||
access = ACCESS_SECURITY_LVL2 | ||
security_level = SUPPLY_SECURITY_HIGH | ||
|
||
/decl/hierarchy/supply_pack/security/bullpupammopractice | ||
|
@@ -238,7 +238,7 @@ | |
cost = 30 | ||
containertype = /obj/structure/closet/crate/secure/weapon | ||
containername = "military rifle practice ammunition crate" | ||
access = ACCESS_SECURITY | ||
access = ACCESS_SECURITY_LVL2 | ||
|
||
/decl/hierarchy/supply_pack/security/forensics //Not access-restricted so PIs can use it. | ||
name = "Forensics - Auxiliary tools" | ||
|
@@ -276,15 +276,15 @@ | |
cost = 20 | ||
containertype = /obj/structure/closet/crate/secure/large | ||
containername = "security barrier crate" | ||
access = ACCESS_SECURITY | ||
access = ACCESS_SECURITY_LVL2 | ||
|
||
/decl/hierarchy/supply_pack/security/securitybarriers | ||
name = "Equipment - Wall shield Generators" | ||
contains = list(/obj/machinery/shieldwallgen = 2) | ||
cost = 20 | ||
containertype = /obj/structure/closet/crate/secure/large | ||
containername = "wall shield generators crate" | ||
access = ACCESS_BRIG | ||
access = ACCESS_SECURITY_LVL1 | ||
|
||
/decl/hierarchy/supply_pack/security/securitybiosuit | ||
name = "Gear - Security biohazard gear" | ||
|
@@ -296,7 +296,7 @@ | |
cost = 30 | ||
containertype = /obj/structure/closet/crate/secure | ||
containername = "security biohazard gear crate" | ||
access = ACCESS_SECURITY | ||
access = ACCESS_SECURITY_LVL2 | ||
|
||
/decl/hierarchy/supply_pack/security/voidsuit_security | ||
name = "EVA - Security (armored) voidsuit" | ||
|
@@ -306,4 +306,4 @@ | |
cost = 120 | ||
containername = "security voidsuit crate" | ||
containertype = /obj/structure/closet/crate/secure/large | ||
access = ACCESS_BRIG | ||
access = ACCESS_SECURITY_LVL1 |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -144,6 +144,10 @@ | |
economic_power = 5 | ||
minimal_player_age = 10 | ||
ideal_character_age = 30 | ||
alt_titles = list( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Тут аналогично. Подскажу. Ты делаешь папку своего модпака, или вгоняешь в уже существующий модпак изменения. Чтобы сделать модпак есть скрипты, они валяются в
Будет вот так:
|
||
"Containment Specialist", | ||
"Containment Technician" | ||
) | ||
outfit_type = /decl/hierarchy/outfit/job/engineering/conteng | ||
requirements = list("Engineer" = 480, EXP_TYPE_ENGINEERING = 600) | ||
class = CLASS_B | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Прямо в кор код... У нас теперь работает система модульности с модпаками. С ней ты можешь ознакомиться прочитав
README.md
по путиmod_celadon/README.md
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@JohnChiffir