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

Merge pull request #727 from Mark9013100/1/3/2016edits

Browse Source 
Edits/Changes, 1/3/2016
This commit is contained in:
Zuhayr
2016-01-12 04:31:38 +10:30
parent 5464e3fedd 1bf73936cd
commit 0c2ec6422a
8 changed files with 55 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/objects/items/devices/whistle.dm
View File

@@ -5,6 +5,7 @@
item_state = "flashbang" //looks exactly like a flash (and nothing like a flashbang)
w_class = 1.0
flags = CONDUCT
slot_flags = SLOT_EARS
var/use_message = "Halt! Security!"
var/spamcheck = 0

32
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
View File

@@ -108,8 +108,40 @@
new /obj/item/clothing/suit/storage/hooded/wintercoat/medical(src)
return
/obj/structure/closet/secure_closet/paramedic
name = "paramedic locker"
desc = "Supplies for a first responder."
icon_state = "medical1"
icon_closed = "medical"
icon_locked = "medical1"
icon_opened = "medicalopen"
icon_broken = "medicalbroken"
icon_off = "medicaloff"
req_access = list(access_medical_equip)
New()
..()
new /obj/item/weapon/storage/box/autoinjectors(src)
new /obj/item/weapon/storage/box/syringes(src)
new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
new /obj/item/weapon/storage/belt/medical/emt(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/suit/storage/toggle/fr_jacket(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/emt(src)
new /obj/item/device/radio/headset/headset_med/alt(src)
new /obj/item/weapon/cartridge/medical(src)
new /obj/item/device/flashlight(src)
new /obj/item/weapon/tank/emergency_oxygen/engi(src)
new /obj/item/clothing/glasses/hud/health(src)
new /obj/item/device/healthanalyzer(src)
new /obj/item/device/radio/off(src)
new /obj/random/medical(src)
new /obj/item/weapon/crowbar(src)
new /obj/item/weapon/extinguisher/mini(src)
return
/obj/structure/closet/secure_closet/CMO
name = "chief medical officer's locker"
req_access = list(access_cmo)

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

@@ -295,6 +295,9 @@
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/head/soft/mime(src)
new /obj/item/clothing/head/soft/mime(src)
new /obj/item/clothing/head/soft/mime(src)
return
@@ -447,6 +450,11 @@
new /obj/item/clothing/under/rank/medical/blue(src)
new /obj/item/clothing/under/rank/medical/green(src)
new /obj/item/clothing/under/rank/medical/purple(src)
new /obj/item/clothing/under/rank/medical/black(src)
new /obj/item/clothing/head/surgery/purple(src)
new /obj/item/clothing/head/surgery/blue(src)
new /obj/item/clothing/head/surgery/green(src)
new /obj/item/clothing/head/surgery/black(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/suit/storage/toggle/labcoat(src)

10
code/modules/client/preferences_gear.dm
View File

@@ -234,13 +234,13 @@ var/global/list/gear_datums = list()
slot = slot_head
/datum/gear/santahat
display_name = "santa hat, red"
display_name = "santa hat, red (holiday)"
path = /obj/item/clothing/head/santa
cost = 1
cost = 11
slot = slot_head
/datum/gear/santahat/green
display_name = "santa hat, green"
display_name = "santa hat, green (holiday)"
path = /obj/item/clothing/head/santa/green
// This was sprited and coded specifically for Zhan-Khazan characters. Before you
@@ -1209,14 +1209,14 @@ var/global/list/gear_datums = list()
whitelisted = "Tajara" // You do have a monopoly on a fur suit tho
/datum/gear/forensics/red
display_name = "forensics, red"
display_name = "forensics long, red"
path = /obj/item/clothing/suit/storage/forensics/red/long
cost = 2
slot = slot_wear_suit
allowed_roles = list("Detective")
/datum/gear/forensics/blue
display_name = "forensics, blue"
display_name = "forensics long, blue"
path = /obj/item/clothing/suit/storage/forensics/blue/long
cost = 2
slot = slot_wear_suit

2
code/modules/clothing/suits/jobs.dm
View File

@@ -59,7 +59,7 @@
//Chef
/obj/item/clothing/suit/chef/classic
name = "A classic chef's apron."
name = "classic chef's apron"
desc = "A basic, dull, white chef's apron."
icon_state = "apronchef"
item_state = "apronchef"