diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 81ae3551..3be86dfa 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -107,7 +107,7 @@ playsound(get_turf(src), 'sound/weapons/Egloves.ogg', 50, 1, -1) user.attack_log += "\[[time_stamp()]\] Defibrillated [H.name] ([H.ckey]) with [src.name]" H.attack_log += "\[[time_stamp()]\] Defibrillated by [user.name] ([user.ckey]) with [src.name]" - log_attack("[user.name] ([user.ckey]) defibrillated [H.name] ([H.ckey]) with [src.name]" ) + msg_admin_attack("[user.name] ([user.ckey]) defibrillated [H.name] ([H.ckey]) with [src.name]" ) if(!iscarbon(user)) M.LAssailant = null else diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 43767aec..a598c02c 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -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"