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

Fixes for supplypacks #28

Closed
wants to merge 10 commits into from
Closed

Fixes for supplypacks #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e3620cc
Fixes for supplypacks
JohnChiffir Mar 22, 2024
0941285
fix
JohnChiffir Mar 22, 2024
9d54cda
Merge branch 'MysticalFaceLesS:dev' into Acces
JohnChiffir Mar 23, 2024
fbb3b84
LCZ addition
JohnChiffir Mar 23, 2024
985dfd4
pam pam
JohnChiffir Mar 23, 2024
86ecd01
Merge branch 'MysticalFaceLesS:dev' into Acces
JohnChiffir Mar 23, 2024
4d91b43
Merge branch 'MysticalFaceLesS:dev' into Acces
JohnChiffir Mar 28, 2024
520ed8c
Readding some accesses for EZ guards
JohnChiffir Mar 28, 2024
fe45fd8
I hate when it happens
JohnChiffir Mar 28, 2024
3f21c9a
Delete Foundation-19-Test.sln
JohnChiffir Mar 28, 2024
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
84 changes: 82 additions & 2 deletions code/datums/outfits/jobs/security.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,21 @@
mask = /obj/item/clothing/mask/balaclava
gloves = /obj/item/clothing/gloves/thick/swat/lcz

/decl/hierarchy/outfit/job/security/lcz_senmedic
Copy link
Collaborator

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

Copy link
Collaborator

Choose a reason for hiding this comment

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

@JohnChiffir

name = OUTFIT_JOB_NAME("LCZ Senior Combat Medic")
uniform = /obj/item/clothing/under/rank/warden/lcz
glasses = /obj/item/clothing/glasses/sunglasses/sechud/goggles
suit = /obj/item/clothing/suit/armor/vest/scp/medarmor
shoes = /obj/item/clothing/shoes/dutyboots
id_type = /obj/item/card/id/seclvl3lcz
l_ear = /obj/item/device/radio/headset/headset_sec_lcz
l_pocket = /obj/item/handcuffs
r_pocket = /obj/item/melee/telebaton
backpack_contents = list(/obj/item/handcuffs = 1, /obj/item/storage/firstaid/adv = 1, /obj/item/storage/firstaid/stab = 1, /obj/item/bodybag/cryobag = 1)
belt = /obj/item/storage/belt/holster/security/fullmk9
head = /obj/item/clothing/head/helmet/scp/security
mask = /obj/item/clothing/mask/balaclava
gloves = /obj/item/clothing/gloves/latex/nitrile/armored

/decl/hierarchy/outfit/job/security/hcz_sergeant
name = OUTFIT_JOB_NAME("HCZ Sergeant")
Expand All @@ -102,11 +117,27 @@
mask = /obj/item/clothing/mask/balaclava
gloves = /obj/item/clothing/gloves/tactical/scp

/decl/hierarchy/outfit/job/security/hcz_senmedic
name = OUTFIT_JOB_NAME("HCZ Senior Combat Medic")
uniform = /obj/item/clothing/under/rank/warden/hcz
glasses = /obj/item/clothing/glasses/sunglasses/sechud/goggles
suit = /obj/item/clothing/suit/armor/pcarrier/scp/tactical
shoes = /obj/item/clothing/shoes/dutyboots
id_type = /obj/item/card/id/seclvl3hcz
l_ear = /obj/item/device/radio/headset/headset_sec_hcz
l_pocket = /obj/item/handcuffs
r_pocket = /obj/item/melee/telebaton
backpack_contents = list(/obj/item/storage/firstaid/adv = 1, /obj/item/storage/firstaid/stab = 1, /obj/item/bodybag/cryobag = 1)
belt = /obj/item/storage/belt/holster/security/fullmk9
head = /obj/item/clothing/head/helmet/scp/hczsecurityguard
mask = /obj/item/clothing/mask/balaclava
gloves = /obj/item/clothing/gloves/latex/nitrile/armored

/decl/hierarchy/outfit/job/security/ez_sergeant
name = OUTFIT_JOB_NAME("EZ Senior Agent")
uniform = /obj/item/clothing/under/rank/warden/ez
shoes = /obj/item/clothing/shoes/dutyboots
id_type = /obj/item/card/id/seclvl3ez
id_type = /obj/item/card/id/seclvl3senez
l_ear = /obj/item/device/radio/headset/headset_sec_ecz
l_pocket = /obj/item/book/manual/scp/secsop
suit = /obj/item/clothing/suit/armor/pcarrier/scp/medium
Expand All @@ -119,6 +150,23 @@
mask = /obj/item/clothing/mask/balaclava
gloves = /obj/item/clothing/gloves/tactical/scp

/decl/hierarchy/outfit/job/security/ez_senmedic
name = OUTFIT_JOB_NAME("EZ Senior Combat Medic")
uniform = /obj/item/clothing/under/rank/security/ez
shoes = /obj/item/clothing/shoes/dutyboots
id_type = /obj/item/card/id/seclvl3senez
l_ear = /obj/item/device/radio/headset/headset_sec_ecz
l_pocket = /obj/item/book/manual/scp/secsop
suit = /obj/item/clothing/suit/armor/pcarrier/scp/medium
l_pocket = /obj/item/handcuffs
r_pocket = /obj/item/melee/telebaton
backpack_contents = list(/obj/item/storage/firstaid/adv = 1, /obj/item/storage/firstaid/stab = 1, /obj/item/bodybag/cryobag = 1 )
belt = /obj/item/storage/belt/holster/security/fullmk9
glasses = /obj/item/clothing/glasses/sunglasses/sechud
head = /obj/item/clothing/head/helmet/scp/hczsecurityguard
mask = /obj/item/clothing/mask/balaclava
gloves = /obj/item/clothing/gloves/latex/nitrile/armored

/decl/hierarchy/outfit/job/security/ez_medic
name = OUTFIT_JOB_NAME("EZ Combat Medic")
uniform = /obj/item/clothing/under/rank/security/ez
Expand All @@ -129,7 +177,7 @@
suit = /obj/item/clothing/suit/armor/pcarrier/scp/medium
l_pocket = /obj/item/handcuffs
r_pocket = /obj/item/melee/telebaton
backpack_contents = list(/obj/item/storage/firstaid/adv = 1, /obj/item/storage/firstaid/stab = 1)
backpack_contents = list(/obj/item/storage/firstaid/adv = 1, /obj/item/storage/firstaid/stab = 1, /obj/item/bodybag/cryobag = 1 )
belt = /obj/item/storage/belt/holster/security/fullmk9
glasses = /obj/item/clothing/glasses/sunglasses/sechud
head = /obj/item/clothing/head/helmet/scp/hczsecurityguard
Expand Down Expand Up @@ -201,6 +249,22 @@
mask = /obj/item/clothing/mask/balaclava
gloves = /obj/item/clothing/gloves/thick/swat/lcz

/decl/hierarchy/outfit/job/security/lcz_medic
name = OUTFIT_JOB_NAME("LCZ Combat Medic")
uniform = /obj/item/clothing/under/rank/security/lcz
glasses = /obj/item/clothing/glasses/sunglasses/sechud/goggles
suit = /obj/item/clothing/suit/armor/vest/scp/medarmor
shoes = /obj/item/clothing/shoes/dutyboots
id_type = /obj/item/card/id/junseclvl2lcz
l_ear = /obj/item/device/radio/headset/headset_sec_lcz
l_pocket = /obj/item/handcuffs
r_pocket = /obj/item/melee/telebaton
backpack_contents = list(/obj/item/handcuffs = 1, /obj/item/storage/firstaid/adv = 1, /obj/item/storage/firstaid/stab = 1, /obj/item/bodybag/cryobag = 1)
belt = /obj/item/storage/belt/holster/security/fullmk9
head = /obj/item/clothing/head/helmet/scp/security
mask = /obj/item/clothing/mask/balaclava
gloves = /obj/item/clothing/gloves/latex/nitrile/armored

/decl/hierarchy/outfit/job/security/hcz_guard
name = OUTFIT_JOB_NAME("HCZ Guard")
uniform = /obj/item/clothing/under/rank/security/hcz
Expand All @@ -217,6 +281,22 @@
mask = /obj/item/clothing/mask/balaclava
gloves = /obj/item/clothing/gloves/tactical/scp

/decl/hierarchy/outfit/job/security/hcz_medic
name = OUTFIT_JOB_NAME("HCZ Combat Medic")
uniform = /obj/item/clothing/under/rank/security/hcz
glasses = /obj/item/clothing/glasses/sunglasses/sechud/goggles
shoes = /obj/item/clothing/shoes/dutyboots
id_type = /obj/item/card/id/junseclvl3hcz
l_ear = /obj/item/device/radio/headset/headset_sec_hcz
suit = /obj/item/clothing/suit/armor/pcarrier/scp/tactical
l_pocket = /obj/item/handcuffs
r_pocket = /obj/item/melee/telebaton
backpack_contents = list(/obj/item/storage/firstaid/adv = 1, /obj/item/storage/firstaid/stab = 1, /obj/item/bodybag/cryobag = 1)
belt = /obj/item/storage/belt/holster/security/fullmk9
head = /obj/item/clothing/head/helmet/scp/hczsecurityguard
mask = /obj/item/clothing/mask/balaclava
gloves = /obj/item/clothing/gloves/latex/nitrile/armored

/decl/hierarchy/outfit/job/security/raisa_agent
name = OUTFIT_JOB_NAME("RAISA Agent")
uniform = /obj/item/clothing/under/rank/security/ez
Expand Down
56 changes: 28 additions & 28 deletions code/datums/supplypacks/security.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
cost = 30
containertype = /obj/structure/closet/crate/secure
containername = "light armor crate"
access = ACCESS_SECURITY
Copy link
Collaborator

Choose a reason for hiding this comment

The 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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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"
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -306,4 +306,4 @@
cost = 120
containername = "security voidsuit crate"
containertype = /obj/structure/closet/crate/secure/large
access = ACCESS_BRIG
access = ACCESS_SECURITY_LVL1
4 changes: 4 additions & 0 deletions code/game/jobs/job/engineering.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,10 @@
economic_power = 5
minimal_player_age = 10
ideal_character_age = 30
alt_titles = list(
Copy link
Collaborator

Choose a reason for hiding this comment

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

Тут аналогично. Подскажу. Ты делаешь папку своего модпака, или вгоняешь в уже существующий модпак изменения. Чтобы сделать модпак есть скрипты, они валяются в mod_celadon запускаешь вводишь название и все. Потом уже тут пишешь

кор_код.....
// [CELADON-ADD] - ТВОЙ_ID_МОДПАКА - (тут комментарий можно и без)
на этих строках твой код добавленый...
...
...
// [/CELADON-ADD]

Будет вот так:

...
ideal_character_age = 30
// [CELADON-ADD] - CELADON_SUPPLY_PACKS
alt_titles = list(
	    "Containment Specialist",
		"Containment Technician"
		)
// [/CELADON-ADD]
outfit_type = /decl/hierarchy/outfit/job/engineering/conteng
....

"Containment Specialist",
"Containment Technician"
)
outfit_type = /decl/hierarchy/outfit/job/engineering/conteng
requirements = list("Engineer" = 480, EXP_TYPE_ENGINEERING = 600)
class = CLASS_B
Expand Down
Loading
Loading