From e3620ccf6fe730499a9187b48536f89ab0353a2d Mon Sep 17 00:00:00 2001 From: John Chiffir Date: Fri, 22 Mar 2024 23:25:42 +0100 Subject: [PATCH 1/7] Fixes for supplypacks Adds some aid kits for all combat medics Adds alt names for Containment Engineer --- Foundation-19-Test.sln | 30 +++++++++ code/datums/outfits/jobs/security.dm | 69 +++++++++++++++++++- code/datums/supplypacks/security.dm | 56 ++++++++-------- code/game/jobs/job/engineering.dm | 4 ++ code/game/jobs/job/security.dm | 8 +-- code/game/objects/items/weapons/cards_ids.dm | 9 ++- 6 files changed, 141 insertions(+), 35 deletions(-) create mode 100644 Foundation-19-Test.sln diff --git a/Foundation-19-Test.sln b/Foundation-19-Test.sln new file mode 100644 index 0000000000..3297632a26 --- /dev/null +++ b/Foundation-19-Test.sln @@ -0,0 +1,30 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.002.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{DAE3F46F-6A9D-49F0-8E52-3E5E70F845B5}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreditsTool", "tools\CreditsTool\CreditsTool.csproj", "{5DAF8A9D-F9B7-4591-8A54-ED8967ECC39E}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5DAF8A9D-F9B7-4591-8A54-ED8967ECC39E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5DAF8A9D-F9B7-4591-8A54-ED8967ECC39E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5DAF8A9D-F9B7-4591-8A54-ED8967ECC39E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5DAF8A9D-F9B7-4591-8A54-ED8967ECC39E}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {5DAF8A9D-F9B7-4591-8A54-ED8967ECC39E} = {DAE3F46F-6A9D-49F0-8E52-3E5E70F845B5} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {DCF59432-F6F7-4264-91A1-542C8C88F78A} + EndGlobalSection +EndGlobal diff --git a/code/datums/outfits/jobs/security.dm b/code/datums/outfits/jobs/security.dm index c74756c55e..90315c7f05 100644 --- a/code/datums/outfits/jobs/security.dm +++ b/code/datums/outfits/jobs/security.dm @@ -102,11 +102,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 Sergeant") + 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 = 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 @@ -119,6 +135,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 @@ -129,7 +162,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 @@ -201,6 +234,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 @@ -217,6 +266,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 diff --git a/code/datums/supplypacks/security.dm b/code/datums/supplypacks/security.dm index f37c47eae7..8584b4799b 100644 --- a/code/datums/supplypacks/security.dm +++ b/code/datums/supplypacks/security.dm @@ -17,7 +17,7 @@ cost = 30 containertype = /obj/structure/closet/crate/secure containername = "light armor crate" - access = ACCESS_SECURITY + 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,7 +127,7 @@ 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" @@ -135,7 +135,7 @@ 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,7 +170,7 @@ 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" @@ -178,7 +178,7 @@ 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,7 +196,7 @@ 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" @@ -204,7 +204,7 @@ 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,7 +213,7 @@ 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" @@ -221,7 +221,7 @@ 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" @@ -229,7 +229,7 @@ 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,7 +276,7 @@ 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" @@ -284,7 +284,7 @@ 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 diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 2f26d68d36..c2e7c9a96f 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -144,6 +144,10 @@ economic_power = 5 minimal_player_age = 10 ideal_character_age = 30 + alt_titles = list( + "Containment Specialist", + "Containment Technician" + ) outfit_type = /decl/hierarchy/outfit/job/engineering/conteng requirements = list("Engineer" = 480, EXP_TYPE_ENGINEERING = 600) class = CLASS_B diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 656a4b81f5..9dc066dba1 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -270,7 +270,7 @@ supervisors = "the HCZ Zone Commander" economic_power = 4 requirements = list("HCZ Guard" = 480) - alt_titles = list("HCZ Senior Containment Response Agent", "HCZ Containment Response Sergeant", "HCZ Senior Combat Medic", "HCZ Senior Agent") + alt_titles = list("HCZ Senior Containment Response Agent", "HCZ Containment Response Sergeant", "HCZ Senior Combat Medic" = /decl/hierarchy/outfit/job/security/hcz_senmedic, "HCZ Senior Agent") minimal_player_age = 5 ideal_character_age = 25 outfit_type = /decl/hierarchy/outfit/job/security/hcz_sergeant @@ -314,7 +314,7 @@ supervisors = "the EZ Supervisor" economic_power = 4 requirements = list("EZ Agent" = 480) - alt_titles = list("Investigation Officer" = /decl/hierarchy/outfit/job/security/ez_sergeant_investigative, "EZ Senior Combat Medic" = /decl/hierarchy/outfit/job/security/ez_medic) + alt_titles = list("Investigation Officer" = /decl/hierarchy/outfit/job/security/ez_sergeant_investigative, "EZ Senior Combat Medic" = /decl/hierarchy/outfit/job/security/ez_senmedic) minimal_player_age = 5 ideal_character_age = 25 outfit_type = /decl/hierarchy/outfit/job/security/ez_sergeant @@ -367,7 +367,7 @@ supervisors = "the LCZ Sergeants and Zone Commander" economic_power = 4 requirements = list("Class D" = 60) - alt_titles = list("LCZ Containment Response Agent", "LCZ Containment Response Guard", "LCZ Combat Medic", "LCZ Riot Control Guard", "LCZ Riot Control Agent", "LCZ Agent") + alt_titles = list("LCZ Containment Response Agent", "LCZ Containment Response Guard", "LCZ Combat Medic" = /decl/hierarchy/outfit/job/security/lcz_medic, "LCZ Riot Control Guard", "LCZ Riot Control Agent", "LCZ Agent") minimal_player_age = 0 ideal_character_age = 25 balance_limited = TRUE @@ -415,7 +415,7 @@ supervisors = "the HCZ Sergeants and Zone Commander" economic_power = 4 requirements = list(EXP_TYPE_SECURITY = 120) - alt_titles = list("HCZ Containment Response Agent", "HCZ Containment Response Guard", "HCZ Combat Medic", "HCZ Agent") + alt_titles = list("HCZ Containment Response Agent", "HCZ Containment Response Guard", "HCZ Combat Medic" = /decl/hierarchy/outfit/job/security/hcz_medic, "HCZ Agent") // minimal_player_age = 0 ideal_character_age = 25 outfit_type = /decl/hierarchy/outfit/job/security/hcz_guard diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 8f4af91535..0c3d25d904 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -540,13 +540,20 @@ GLOBAL_LIST_EMPTY(conversion_cards) item_state = "Sec_ID2" job_access_type = /datum/job/ncoofficerlcz -/obj/item/card/id/seclvl3ez +/obj/item/card/id/seclvl3senez name = "security ID" desc = "A dark blue ID. Looks important. The person wearing it not so much." icon_state = "securitylvl3" item_state = "Sec_ID3" job_access_type = /datum/job/ncoofficerez +/obj/item/card/id/seclvl3ez + name = "security ID" + desc = "A dark blue ID. Looks important. The person wearing it not so much." + icon_state = "securitylvl3" + item_state = "Sec_ID3" + job_access_type = /datum/job/enlistedofficerez + /obj/item/card/id/seclvl3raisa name = "security ID" desc = "A dark blue ID. Looks important. The person wearing it not so much." From 09412851c9137937e47fde4138059e60279e3268 Mon Sep 17 00:00:00 2001 From: John Chiffir Date: Fri, 22 Mar 2024 23:33:52 +0100 Subject: [PATCH 2/7] fix --- code/datums/outfits/jobs/security.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/outfits/jobs/security.dm b/code/datums/outfits/jobs/security.dm index 90315c7f05..da1a212f2c 100644 --- a/code/datums/outfits/jobs/security.dm +++ b/code/datums/outfits/jobs/security.dm @@ -116,7 +116,7 @@ belt = /obj/item/storage/belt/holster/security/fullmk9 head = /obj/item/clothing/head/helmet/scp/hczsecurityguard mask = /obj/item/clothing/mask/balaclava - gloves = gloves = /obj/item/clothing/gloves/latex/nitrile/armored + gloves = /obj/item/clothing/gloves/latex/nitrile/armored /decl/hierarchy/outfit/job/security/ez_sergeant name = OUTFIT_JOB_NAME("EZ Senior Agent") From fbb3b84cc57e206addb7c63f2437053abc684744 Mon Sep 17 00:00:00 2001 From: John Chiffir Date: Sat, 23 Mar 2024 14:14:00 +0100 Subject: [PATCH 3/7] LCZ addition --- code/datums/outfits/jobs/security.dm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/code/datums/outfits/jobs/security.dm b/code/datums/outfits/jobs/security.dm index da1a212f2c..5a77527cab 100644 --- a/code/datums/outfits/jobs/security.dm +++ b/code/datums/outfits/jobs/security.dm @@ -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 + 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") @@ -103,7 +118,7 @@ gloves = /obj/item/clothing/gloves/tactical/scp /decl/hierarchy/outfit/job/security/hcz_senmedic - name = OUTFIT_JOB_NAME("HCZ Sergeant") + 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 From 985dfd48b36cf565d27a578b2a93ec5f1bed4556 Mon Sep 17 00:00:00 2001 From: John Chiffir Date: Sat, 23 Mar 2024 14:15:17 +0100 Subject: [PATCH 4/7] pam pam --- code/game/jobs/job/security.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 9dc066dba1..5f9d19e74d 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -222,7 +222,7 @@ supervisors = "the LCZ Zone Commander" economic_power = 4 requirements = list("LCZ Guard" = 480) - alt_titles = list("LCZ Senior Containment Response Agent", "LCZ Containment Response Sergeant", "LCZ Senior Combat Medic", "LCZ Riot Control Sergeant", "LCZ Senior Riot Control Agent", "LCZ Senior Agent") + alt_titles = list("LCZ Senior Containment Response Agent", "LCZ Containment Response Sergeant", "LCZ Senior Combat Medic" = /decl/hierarchy/outfit/job/security/lcz_senmedic, "LCZ Riot Control Sergeant", "LCZ Senior Riot Control Agent", "LCZ Senior Agent") minimal_player_age = 5 ideal_character_age = 25 outfit_type = /decl/hierarchy/outfit/job/security/lcz_sergeant From 520ed8c8d79df79c67397881d7c428a37397efbb Mon Sep 17 00:00:00 2001 From: John Chiffir Date: Thu, 28 Mar 2024 19:16:57 +0100 Subject: [PATCH 5/7] Readding some accesses for EZ guards --- code/game/jobs/job/security.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 5f9d19e74d..35b79b4dd4 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -324,6 +324,7 @@ access = list( ACCESS_SEC_COMMS, ACCESS_SCIENCE_LVL1, + ACCESS_SCIENCE_LVL2, ACCESS_MEDICAL_LVL1, ACCESS_MEDICAL_LVL2, ACCESS_MEDICAL_LVL3, @@ -472,6 +473,7 @@ ACCESS_SEC_COMMS, ACCESS_SECURITY_LVL1, ACCESS_SECURITY_LVL2, + ACCESS_SECURITY_LVL3, ACCESS_ENGINEERING_LVL1, ACCESS_MEDICAL_LVL1, ACCESS_MEDICAL_LVL2, From fe45fd8d31415008a604ec9a20c130fd5abd393b Mon Sep 17 00:00:00 2001 From: John Chiffir Date: Thu, 28 Mar 2024 19:32:49 +0100 Subject: [PATCH 6/7] I hate when it happens --- Foundation-19-Test.sln | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/Foundation-19-Test.sln b/Foundation-19-Test.sln index 3297632a26..5f282702bb 100644 --- a/Foundation-19-Test.sln +++ b/Foundation-19-Test.sln @@ -1,30 +1 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.5.002.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{DAE3F46F-6A9D-49F0-8E52-3E5E70F845B5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreditsTool", "tools\CreditsTool\CreditsTool.csproj", "{5DAF8A9D-F9B7-4591-8A54-ED8967ECC39E}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5DAF8A9D-F9B7-4591-8A54-ED8967ECC39E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5DAF8A9D-F9B7-4591-8A54-ED8967ECC39E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5DAF8A9D-F9B7-4591-8A54-ED8967ECC39E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5DAF8A9D-F9B7-4591-8A54-ED8967ECC39E}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {5DAF8A9D-F9B7-4591-8A54-ED8967ECC39E} = {DAE3F46F-6A9D-49F0-8E52-3E5E70F845B5} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {DCF59432-F6F7-4264-91A1-542C8C88F78A} - EndGlobalSection -EndGlobal + \ No newline at end of file From 3f21c9a96204b53d070b9ccad1e8af277e2443c1 Mon Sep 17 00:00:00 2001 From: JohnChiffir <126119749+JohnChiffir@users.noreply.github.com> Date: Thu, 28 Mar 2024 19:44:04 +0100 Subject: [PATCH 7/7] Delete Foundation-19-Test.sln oh fuck it thats why, I'm tired of that shit copying itself --- Foundation-19-Test.sln | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Foundation-19-Test.sln diff --git a/Foundation-19-Test.sln b/Foundation-19-Test.sln deleted file mode 100644 index 5f282702bb..0000000000 --- a/Foundation-19-Test.sln +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file