cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 18:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #134 from MefAnneFeminene/patch-1

Browse Source 
Department Sec Update
This commit is contained in:
projectkepler-RU
2023-03-28 09:35:08 +07:00
committed by GitHub
parent 9ea476d06f 34b5588fd0
commit cd9d3d979a
1 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
modular_skyrat/modules/goofsec/code/department_guards.dm
View File

@@ -180,8 +180,8 @@
/obj/item/food/donut/caramel = 10, /obj/item/food/donut/caramel = 10,
/obj/item/food/donut/matcha = 10, /obj/item/food/donut/matcha = 10,
/obj/item/food/donut/blumpkin = 5, /obj/item/food/donut/blumpkin = 5,
/obj/item/clothing/mask/whistle = 5, /obj/item/clothing/mask/whistle = 10,
/obj/item/melee/baton/security/boomerang/loaded = 1 /obj/item/melee/baton = 5
) )
job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN
@@ -193,13 +193,14 @@
ears = /obj/item/radio/headset/headset_sci ears = /obj/item/radio/headset/headset_sci
uniform = /obj/item/clothing/under/rank/security/officer/blueshirt/skyrat uniform = /obj/item/clothing/under/rank/security/officer/blueshirt/skyrat
shoes = /obj/item/clothing/shoes/jackboots shoes = /obj/item/clothing/shoes/jackboots
head = /obj/item/clothing/head/helmet/blueshirt/skyrat head = /obj/item/clothing/head/beret/sec/science
suit = /obj/item/clothing/suit/armor/vest/blueshirt/skyrat suit = /obj/item/clothing/suit/armor/vest/alt
r_pocket = /obj/item/assembly/flash/handheld r_pocket = /obj/item/reagent_containers/spray/pepper
l_pocket = /obj/item/restraints/handcuffs/cable/pink l_pocket = /obj/item/restraints/handcuffs
backpack_contents = list( backpack_contents = list(
/obj/item/melee/baton/security/loaded/departmental/science = 1, /obj/item/melee/baton/security/loaded/departmental/science = 1,
/obj/item/storage/box/gunset/pepperball = 1, /obj/item/gun/energy/disabler = 1,
/obj/item/holosign_creator/security = 1
) )
backpack = /obj/item/storage/backpack/science backpack = /obj/item/storage/backpack/science
@@ -282,8 +283,8 @@
/obj/item/food/donut/caramel = 10, /obj/item/food/donut/caramel = 10,
/obj/item/food/donut/matcha = 10, /obj/item/food/donut/matcha = 10,
/obj/item/food/donut/blumpkin = 5, /obj/item/food/donut/blumpkin = 5,
/obj/item/clothing/mask/whistle = 5, /obj/item/clothing/mask/whistle = 10,
/obj/item/melee/baton/security/boomerang/loaded = 1 /obj/item/melee/baton = 5
) )
job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN
@@ -296,13 +297,15 @@
ears = /obj/item/radio/headset/headset_med ears = /obj/item/radio/headset/headset_med
uniform = /obj/item/clothing/under/rank/security/officer/blueshirt/skyrat/orderly uniform = /obj/item/clothing/under/rank/security/officer/blueshirt/skyrat/orderly
shoes = /obj/item/clothing/shoes/sneakers/white shoes = /obj/item/clothing/shoes/sneakers/white
head = /obj/item/clothing/head/helmet/blueshirt/skyrat/guard head = /obj/item/clothing/head/beret/sec/medical
suit = /obj/item/clothing/suit/armor/vest/blueshirt/skyrat/orderly suit = /obj/item/clothing/suit/armor/vest/blueshirt/skyrat/orderly
r_pocket = /obj/item/assembly/flash/handheld glasses = /obj/item/clothing/glasses/hud/health/sunglasses
l_pocket = /obj/item/restraints/handcuffs/cable/blue r_pocket = /obj/item/reagent_containers/spray/pepper
l_pocket = /obj/item/restraints/handcuffs
backpack_contents = list( backpack_contents = list(
/obj/item/melee/baton/security/loaded/departmental/medical = 1, /obj/item/melee/baton/security/loaded/departmental/medical = 1,
/obj/item/storage/box/gunset/pepperball = 1, /obj/item/gun/energy/disabler = 1,
/obj/item/holosign_creator/security = 1
) )
backpack = /obj/item/storage/backpack/medic backpack = /obj/item/storage/backpack/medic
@@ -380,8 +383,8 @@
/obj/item/food/donut/caramel = 10, /obj/item/food/donut/caramel = 10,
/obj/item/food/donut/matcha = 10, /obj/item/food/donut/matcha = 10,
/obj/item/food/donut/blumpkin = 5, /obj/item/food/donut/blumpkin = 5,
/obj/item/clothing/mask/whistle = 5, /obj/item/clothing/mask/whistle = 10,
/obj/item/melee/baton/security/boomerang/loaded = 1 /obj/item/melee/baton = 5
) )
job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN
@@ -393,13 +396,14 @@
ears = /obj/item/radio/headset/headset_eng ears = /obj/item/radio/headset/headset_eng
shoes = /obj/item/clothing/shoes/workboots shoes = /obj/item/clothing/shoes/workboots
uniform = /obj/item/clothing/under/rank/security/officer/blueshirt/skyrat/engineering_guard uniform = /obj/item/clothing/under/rank/security/officer/blueshirt/skyrat/engineering_guard
head = /obj/item/clothing/head/helmet/blueshirt/skyrat/guard head = /obj/item/clothing/head/beret/sec/engineering
suit = /obj/item/clothing/suit/armor/vest/blueshirt/skyrat/engineering_guard suit = /obj/item/clothing/suit/armor/vest/blueshirt/skyrat/engineering_guard
r_pocket = /obj/item/assembly/flash/handheld r_pocket = /obj/item/reagent_containers/spray/pepper
l_pocket = /obj/item/restraints/handcuffs/cable/yellow l_pocket = /obj/item/restraints/handcuffs
backpack_contents = list( backpack_contents = list(
/obj/item/melee/baton/security/loaded/departmental/engineering = 1, /obj/item/melee/baton/security/loaded/departmental/engineering = 1,
/obj/item/storage/box/gunset/pepperball = 1, /obj/item/gun/energy/disabler = 1,
/obj/item/holosign_creator/security = 1
) )
backpack = /obj/item/storage/backpack/industrial backpack = /obj/item/storage/backpack/industrial
@@ -483,8 +487,8 @@
/obj/item/food/donut/caramel = 10, /obj/item/food/donut/caramel = 10,
/obj/item/food/donut/matcha = 10, /obj/item/food/donut/matcha = 10,
/obj/item/food/donut/blumpkin = 5, /obj/item/food/donut/blumpkin = 5,
/obj/item/clothing/mask/whistle = 5, /obj/item/clothing/mask/whistle = 10,
/obj/item/melee/baton/security/boomerang/loaded = 1 /obj/item/melee/baton = 5
) )
job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN
@@ -496,14 +500,15 @@
ears = /obj/item/radio/headset/headset_cargo ears = /obj/item/radio/headset/headset_cargo
shoes = /obj/item/clothing/shoes/sneakers/black shoes = /obj/item/clothing/shoes/sneakers/black
uniform = /obj/item/clothing/under/rank/security/officer/blueshirt/skyrat/customs_agent uniform = /obj/item/clothing/under/rank/security/officer/blueshirt/skyrat/customs_agent
head = /obj/item/clothing/head/helmet/blueshirt/skyrat/guard head = /obj/item/clothing/head/beret/sec/cargo
suit = /obj/item/clothing/suit/armor/vest/blueshirt/skyrat/customs_agent suit = /obj/item/clothing/suit/armor/vest/blueshirt/skyrat/customs_agent
glasses = /obj/item/clothing/glasses/hud/gun_permit glasses = /obj/item/clothing/glasses/hud/gun_permit
r_pocket = /obj/item/assembly/flash/handheld r_pocket = /obj/item/reagent_containers/spray/pepper
l_pocket = /obj/item/restraints/handcuffs/cable/orange l_pocket = /obj/item/restraints/handcuffs
backpack_contents = list( backpack_contents = list(
/obj/item/melee/baton/security/loaded/departmental/cargo = 1, /obj/item/melee/baton/security/loaded/departmental/cargo = 1,
/obj/item/storage/box/gunset/pepperball = 1, /obj/item/gun/energy/disabler = 1,
/obj/item/holosign_creator/security = 1
) )
backpack = /obj/item/storage/backpack backpack = /obj/item/storage/backpack
@@ -580,8 +585,8 @@
/obj/item/food/donut/caramel = 10, /obj/item/food/donut/caramel = 10,
/obj/item/food/donut/matcha = 10, /obj/item/food/donut/matcha = 10,
/obj/item/food/donut/blumpkin = 5, /obj/item/food/donut/blumpkin = 5,
/obj/item/clothing/mask/whistle = 5, /obj/item/clothing/mask/whistle = 10,
/obj/item/melee/baton/security/boomerang/loaded = 1 /obj/item/melee/baton = 5
) )
job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN
@@ -593,15 +598,16 @@
ears = /obj/item/radio/headset/headset_srv ears = /obj/item/radio/headset/headset_srv
uniform = /obj/item/clothing/under/rank/security/officer/blueshirt/skyrat/bouncer uniform = /obj/item/clothing/under/rank/security/officer/blueshirt/skyrat/bouncer
shoes = /obj/item/clothing/shoes/sneakers/black shoes = /obj/item/clothing/shoes/sneakers/black
head = /obj/item/clothing/head/helmet/blueshirt/skyrat/guard head = /obj/item/clothing/head/beret/sec/service
suit = /obj/item/clothing/suit/armor/vest/blueshirt/skyrat/guard suit = /obj/item/clothing/suit/armor/vest/alt
l_pocket = /obj/item/restraints/handcuffs/cable/green l_pocket = /obj/item/restraints/handcuffs
r_pocket = /obj/item/assembly/flash/handheld r_pocket = /obj/item/reagent_containers/spray/pepper
backpack_contents = list( backpack_contents = list(
/obj/item/melee/baton/security/loaded/departmental/service = 1, /obj/item/melee/baton/security/loaded/departmental/service = 1,
/obj/item/storage/box/gunset/pepperball = 1, /obj/item/gun/energy/disabler = 1,
/obj/item/holosign_creator/security = 1
) )
glasses = /obj/item/clothing/glasses/sunglasses glasses = /obj/item/clothing/glasses/hud/security/sunglasses
backpack = /obj/item/storage/backpack backpack = /obj/item/storage/backpack
satchel = /obj/item/storage/backpack/satchel satchel = /obj/item/storage/backpack/satchel