cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-25 14:16:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #353 from Mark9013100/11/29/2015FixesandEdits1

Browse Source 
Combination of my previous PRs, mostly fixes
This commit is contained in:
Neerti
2015-12-01 00:46:12 -05:00
parent 80f7cdd535 7a26afb464
commit 88d090ab34
7 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/jobs/job/medical.dm
+2 -2
View File
@@ -46,8 +46,8 @@
supervisors = "the chief medical officer"
selection_color = "#ffeef0"
economic_modifier = 7
access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics)
minimal_access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_virology)
access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_eva)
minimal_access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_virology, access_eva)
alt_titles = list("Surgeon","Emergency Physician","Nurse","Virologist")
equip(var/mob/living/carbon/human/H)
code/game/objects/items/weapons/storage/boxes.dm
-10
View File
@@ -681,13 +681,3 @@
max_storage_space = 21
use_to_pickup = 1 // for picking up broken bulbs, not that most people will try
/obj/item/weapon/storage/box/fcard //Serves as a replacement to the fcard holder.
name = "finger-print card box"
desc = "Holds fingerprint cards."
icon = 'icons/obj/storage.dmi'
icon_state = "box"
item_state = "syringe_kit"
storage_slots=21
max_w_class = 1
can_hold = list(/obj/item/weapon/f_card)
use_to_pickup = 1 // for picking up broken bulbs, not that most people will try
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+2 -1
View File
@@ -181,7 +181,7 @@
/obj/structure/closet/secure_closet/security
name = "security officer's locker"
req_access = list(access_security)
req_access = list(access_brig)
icon_state = "sec1"
icon_closed = "sec"
icon_locked = "sec1"
@@ -278,6 +278,7 @@
new /obj/item/clothing/shoes/laceup(src)
new /obj/item/weapon/storage/box/evidence(src)
new /obj/item/device/radio/headset/headset_sec(src)
new /obj/item/device/radio/headset/headset_sec/alt(src)
new /obj/item/device/detective_scanner(src)
new /obj/item/clothing/suit/storage/vest/detective(src)
new /obj/item/ammo_magazine/c45m/rubber(src)
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+12 -8
View File
@@ -152,9 +152,12 @@
new /obj/item/clothing/under/color/green(src)
new /obj/item/clothing/under/color/green(src)
new /obj/item/clothing/under/color/green(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/green(src)
new /obj/item/clothing/shoes/green(src)
new /obj/item/clothing/shoes/green(src)
new /obj/item/clothing/head/soft/green(src)
new /obj/item/clothing/head/soft/green(src)
new /obj/item/clothing/head/soft/green(src)
new /obj/item/clothing/mask/bandana/green(src)
new /obj/item/clothing/mask/bandana/green(src)
new /obj/item/clothing/mask/bandana/green(src)
@@ -206,9 +209,12 @@
new /obj/item/clothing/under/color/yellow(src)
new /obj/item/clothing/under/color/yellow(src)
new /obj/item/clothing/under/color/yellow(src)
new /obj/item/clothing/shoes/orange(src)
new /obj/item/clothing/shoes/orange(src)
new /obj/item/clothing/shoes/orange(src)
new /obj/item/clothing/shoes/yellow(src)
new /obj/item/clothing/shoes/yellow(src)
new /obj/item/clothing/shoes/yellow(src)
new /obj/item/clothing/head/soft/yellow(src)
new /obj/item/clothing/head/soft/yellow(src)
new /obj/item/clothing/head/soft/yellow(src)
new /obj/item/clothing/mask/bandana/gold(src)
new /obj/item/clothing/mask/bandana/gold(src)
new /obj/item/clothing/mask/bandana/gold(src)
@@ -481,7 +487,6 @@
new /obj/item/clothing/under/color/blue(src)
new /obj/item/clothing/under/color/yellow(src)
new /obj/item/clothing/under/color/green(src)
new /obj/item/clothing/under/color/orange(src)
new /obj/item/clothing/under/color/pink(src)
new /obj/item/clothing/under/dress/plaid_blue(src)
new /obj/item/clothing/under/dress/plaid_red(src)
@@ -489,7 +494,6 @@
new /obj/item/clothing/shoes/blue(src)
new /obj/item/clothing/shoes/yellow(src)
new /obj/item/clothing/shoes/green(src)
new /obj/item/clothing/shoes/orange(src)
new /obj/item/clothing/shoes/purple(src)
new /obj/item/clothing/shoes/red(src)
new /obj/item/clothing/shoes/leather(src)