cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-14 16:46:28 +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)
code/modules/clothing/head/helmet.dm
+1 -1
View File
@@ -1,6 +1,6 @@
/obj/item/clothing/head/helmet
name = "helmet"
desc = "Standard Security gear. Protects the head from impacts. This one has a adjustable visor."
desc = "Standard Security gear. Protects the head from impacts."
icon_state = "helmet"
item_state_slots = list(
slot_l_hand_str = "helmet",
code/modules/clothing/spacesuits/syndi.dm
+21
View File
@@ -22,11 +22,13 @@
//Green syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/green
name = "green space helmet"
desc = "A green helmet sporting clean lines and durable plating. Engineered to look menacing."
icon_state = "syndicate-helm-green"
item_state = "syndicate-helm-green"
/obj/item/clothing/suit/space/syndicate/green
name = "green space suit"
desc = "A green spacesuit sporting clean lines and durable plating. Robust, reliable, and slightly suspicious."
icon_state = "syndicate-green"
item_state = "syndicate-green"
@@ -34,11 +36,13 @@
//Dark green syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/green/dark
name = "dark green space helmet"
desc = "A dark green helmet sporting clean lines and durable plating. Engineered to look menacing."
icon_state = "syndicate-helm-green-dark"
item_state = "syndicate-helm-green-dark"
/obj/item/clothing/suit/space/syndicate/green/dark
name = "dark green space suit"
desc = "A dark green spacesuit sporting clean lines and durable plating. Robust, reliable, and slightly suspicious."
icon_state = "syndicate-green-dark"
item_state = "syndicate-green-dark"
@@ -46,11 +50,13 @@
//Orange syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/orange
name = "orange space helmet"
desc = "An orange helmet sporting clean lines and durable plating. Engineered to look menacing."
icon_state = "syndicate-helm-orange"
item_state = "syndicate-helm-orange"
/obj/item/clothing/suit/space/syndicate/orange
name = "orange space suit"
desc = "An orange spacesuit sporting clean lines and durable plating. Robust, reliable, and slightly suspicious."
icon_state = "syndicate-orange"
item_state = "syndicate-orange"
@@ -58,11 +64,13 @@
//Blue syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/blue
name = "blue space helmet"
desc = "A blue helmet sporting clean lines and durable plating. Engineered to look menacing."
icon_state = "syndicate-helm-blue"
item_state = "syndicate-helm-blue"
/obj/item/clothing/suit/space/syndicate/blue
name = "blue space suit"
desc = "A blue spacesuit sporting clean lines and durable plating. Robust, reliable, and slightly suspicious."
icon_state = "syndicate-blue"
item_state = "syndicate-blue"
@@ -70,11 +78,13 @@
//Black syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/black
name = "black space helmet"
desc = "A black helmet sporting durable plating. Engineered to look menacing."
icon_state = "syndicate-helm-black"
item_state = "syndicate-helm-black"
/obj/item/clothing/suit/space/syndicate/black
name = "black space suit"
desc = "A black spacesuit sporting durable plating. Robust, reliable, and slightly suspicious."
icon_state = "syndicate-black"
item_state = "syndicate-black"
@@ -82,11 +92,13 @@
//Black-green syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/black/green
name = "black and green space helmet"
desc = "A black helmet sporting a single green stripe and durable plating. Engineered to look menacing."
icon_state = "syndicate-helm-black-green"
item_state = "syndicate-helm-black-green"
/obj/item/clothing/suit/space/syndicate/black/green
name = "black and green space suit"
desc = "A black spacesuit sporting green stripes and durable plating. Robust, reliable, and slightly suspicious."
icon_state = "syndicate-black-green"
item_state = "syndicate-black-green"
@@ -94,11 +106,13 @@
//Black-blue syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/black/blue
name = "black and blue space helmet"
desc = "A black helmet sporting a single blue stripe and durable plating. Engineered to look menacing."
icon_state = "syndicate-helm-black-blue"
item_state = "syndicate-helm-black-blue"
/obj/item/clothing/suit/space/syndicate/black/blue
name = "black and blue space suit"
desc = "A black spacesuit sporting blue stripes and durable plating. Robust, reliable, and slightly suspicious."
icon_state = "syndicate-black-blue"
item_state = "syndicate-black-blue"
@@ -106,11 +120,13 @@
//Black medical syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/black/med
name = "black medical space helmet"
desc = "A black helmet sporting a medical cross and durable plating. Hopefully the wearer abides by space geneva."
icon_state = "syndicate-helm-black-med"
item_state_slots = list(slot_head_str = "syndicate-black-med")
/obj/item/clothing/suit/space/syndicate/black/med
name = "black medical space suit"
desc = "A black spacesuit sporting a medical cross and durable plating. Robust, reliable, and slightly suspicious."
icon_state = "syndicate-black-med"
item_state = "syndicate-black"
@@ -123,6 +139,7 @@
/obj/item/clothing/suit/space/syndicate/black/orange
name = "black and orange space suit"
desc = "A black spacesuit sporting orange stripes and durable plating. Robust, reliable, and slightly suspicious."
icon_state = "syndicate-black-orange"
item_state = "syndicate-black"
@@ -130,21 +147,25 @@
//Black-red syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/black/red
name = "black and red space helmet"
desc = "A black helmet sporting a single red stripe and durable plating. Engineered to look menacing."
icon_state = "syndicate-helm-black-red"
item_state = "syndicate-helm-black-red"
/obj/item/clothing/suit/space/syndicate/black/red
name = "black and red space suit"
desc = "A black spacesuit sporting red stripes and durable plating. Robust, reliable, and slightly suspicious."
icon_state = "syndicate-black-red"
item_state = "syndicate-black-red"
//Black with yellow/red engineering syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/black/engie
name = "black engineering space helmet"
desc = "A black helmet sporting red and yellow stripes and durable plating. Engineered to look well... engineering-ish."
icon_state = "syndicate-helm-black-engie"
item_state_slots = list(slot_head_str = "syndicate-helm-black-engie")
/obj/item/clothing/suit/space/syndicate/black/engie
name = "black engineering space suit"
desc = "A black spacesuit sporting red and yellow stripes and durable plating. Robust, reliable, and slightly suspicious."
icon_state = "syndicate-black-engie"
item_state = "syndicate-black"