Defib logfix, more pref gear.

Pref gear updated to my latest post.
This commit is contained in:
Duck-
2014-08-17 14:44:49 -04:00
parent 4aeffad09c
commit 89de971dfd
2 changed files with 36 additions and 1 deletions
+1 -1
View File
@@ -107,7 +107,7 @@
playsound(get_turf(src), 'sound/weapons/Egloves.ogg', 50, 1, -1)
user.attack_log += "\[[time_stamp()]\]<font color='red'> Defibrillated [H.name] ([H.ckey]) with [src.name]</font>"
H.attack_log += "\[[time_stamp()]\]<font color='orange'> Defibrillated by [user.name] ([user.ckey]) with [src.name]</font>"
log_attack("<font color='red'>[user.name] ([user.ckey]) defibrillated [H.name] ([H.ckey]) with [src.name]</font>" )
msg_admin_attack("<font color='red'>[user.name] ([user.ckey]) defibrillated [H.name] ([H.ckey]) with [src.name]</font>" )
if(!iscarbon(user))
M.LAssailant = null
else
+35
View File
@@ -36,6 +36,11 @@ proc/populate_gear_list()
path = /obj/item/weapon/fluff/cado_keppel_1
cost = 1
/datum/gear/cane
display_name = "cane"
path = /obj/item/weapon/cane
cost = 2
/datum/gear/tie_horrible
display_name = "horrible tie"
path = /obj/item/clothing/tie/horrible
@@ -111,6 +116,18 @@ proc/populate_gear_list()
cost = 2
slot = slot_head
/datum/gear/greysoftcap
display_name = "grey softcap"
path = /obj/item/clothing/head/soft/grey
cost = 2
slot = slot_head
/datum/gear/purplesoftcap
display_name = "purple softcap"
path = /obj/item/clothing/head/soft/purple
cost = 2
slot = slot_head
/datum/gear/labcoat
display_name = "labcoat"
path = /obj/item/clothing/suit/storage/labcoat
@@ -321,6 +338,12 @@ proc/populate_gear_list()
slot = slot_w_uniform
cost = 3
/datum/gear/skirt_green
display_name = "green plaid skirt"
path = /obj/item/clothing/under/dress/plaid_green
slot = slot_w_uniform
cost = 3
/datum/gear/skirt_black
display_name = "black skirt"
path = /obj/item/clothing/under/blackskirt
@@ -366,6 +389,18 @@ proc/populate_gear_list()
slot = slot_w_uniform
cost = 3
/datum/gear/exec_suit
display_name = "executive suit"
path = /obj/item/clothing/under/suit_jacket/really_black
slot = slot_w_uniform
cost = 3
/datum/gear/oldmansuit
display_name = "old man suit"
path = /obj/item/clothing/under/lawyer/oldman
cost = 3
//Security
/datum/gear/security
display_name = "Security HUD"