cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into patch-7

Browse Source
This commit is contained in:
Izac Joof Forsgren
2020-03-16 20:23:31 +01:00
committed by GitHub
parent 7719004c46 1ef0c96fd4
commit 4e8e9eaf6f
6 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/datums/supplypacks/misc_yw.dm
View File

@@ -12,7 +12,7 @@
cost = 80 cost = 80
containertype = /obj/structure/closet/crate/secure/weapon containertype = /obj/structure/closet/crate/secure/weapon
containername = "Blueshield equipment" containername = "Blueshield equipment"
access = access_heads access = access_blueshield
/datum/supply_pack/misc/blueshieldweapons /datum/supply_pack/misc/blueshieldweapons
name = "Blueshield Weapon Kits" name = "Blueshield Weapon Kits"
@@ -23,4 +23,4 @@
cost = 100 cost = 100
containertype = /obj/structure/closet/crate/secure/weapon containertype = /obj/structure/closet/crate/secure/weapon
containername = "Blueshield armaments" containername = "Blueshield armaments"
access = access_heads access = access_blueshield

4
code/game/jobs/access_datum.dm
View File

@@ -298,7 +298,7 @@
region = ACCESS_REGION_SUPPLY region = ACCESS_REGION_SUPPLY
// /var/const/free_access_id = 51 // /var/const/free_access_id = 51
// /var/const/free_access_id= 52 // /var/const/free_access_id = 52
/var/const/access_heads_vault = 53 /var/const/access_heads_vault = 53
/datum/access/heads_vault /datum/access/heads_vault
@@ -472,4 +472,4 @@
/datum/access/alien /datum/access/alien
id = access_alien id = access_alien
desc = "#%_^&*@!" desc = "#%_^&*@!"
access_type = ACCESS_TYPE_PRIVATE access_type = ACCESS_TYPE_PRIVATE

5
code/game/jobs/access_datum_yw.dm Normal file
View File

@@ -0,0 +1,5 @@
/var/const/access_blueshield = 52
/datum/access/blueshield
id = access_blueshield
desc = "Blueshield Special Access"
region = ACCESS_REGION_COMMAND

4
code/game/jobs/job/blueshield.dm
View File

@@ -17,8 +17,8 @@
access = list(access_security, access_sec_doors, access_brig, access = list(access_security, access_sec_doors, access_brig,
access_medical, access_eva, access_heads, access_teleporter, access_medical, access_eva, access_heads, access_teleporter,
access_maint_tunnels, access_morgue, access_maint_tunnels, access_morgue,
access_crematorium, access_research, access_hop, access_RC_announce, access_keycard_auth, access_gateway) access_crematorium, access_research, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_blueshield)
minimal_access = list(access_forensics_lockers, access_sec_doors, access_medical, access_maint_tunnels, access_RC_announce, access_keycard_auth, access_heads) minimal_access = list(access_forensics_lockers, access_sec_doors, access_medical, access_maint_tunnels, access_RC_announce, access_keycard_auth, access_heads, access_blueshield)
outfit_type = /decl/hierarchy/outfit/job/blueshield outfit_type = /decl/hierarchy/outfit/job/blueshield

2
code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm
View File

@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/blueshield /obj/structure/closet/secure_closet/blueshield
name = "blueshield's locker" name = "blueshield's locker"
req_access = list(access_teleporter) req_access = list(access_blueshield)
icon = 'icons/obj/closet_yw.dmi' icon = 'icons/obj/closet_yw.dmi'
icon_state = "bssecure1" icon_state = "bssecure1"
icon_closed = "bssecure" icon_closed = "bssecure"

1
vorestation.dme
View File

@@ -712,6 +712,7 @@
#include "code\game\jobs\access.dm" #include "code\game\jobs\access.dm"
#include "code\game\jobs\access_datum.dm" #include "code\game\jobs\access_datum.dm"
#include "code\game\jobs\access_datum_vr.dm" #include "code\game\jobs\access_datum_vr.dm"
#include "code\game\jobs\access_datum_yw.dm"
#include "code\game\jobs\job_controller.dm" #include "code\game\jobs\job_controller.dm"
#include "code\game\jobs\jobs.dm" #include "code\game\jobs\jobs.dm"
#include "code\game\jobs\whitelist.dm" #include "code\game\jobs\whitelist.dm"