cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into spacearea

Browse Source 
Conflicts:
	maps/tgstation2.dmm
This commit is contained in:
Chinsky
2014-08-16 05:59:21 +04:00
parent 03cdfaf896 68fc5d91c6
commit 1de0e2cb44
4 changed files with 153 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,8 +135,8 @@
flag = OFFICER
department_flag = ENGSEC
faction = "Station"
total_positions = 5
spawn_positions = 5
total_positions = 3
spawn_positions = 3
supervisors = "the head of security"
selection_color = "#ffeeee"
access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_morgue)

3
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
View File

@@ -26,6 +26,9 @@
new /obj/item/clothing/head/beret/sec(src)
new /obj/item/clothing/head/beret/sec(src)
new /obj/item/clothing/head/beret/sec(src)
new /obj/item/clothing/head/beret/sec/alt(src)
new /obj/item/clothing/head/beret/sec/alt(src)
new /obj/item/clothing/head/beret/sec/alt(src)
return