diff --git a/code/modules/instruments/items.dm b/code/modules/instruments/items.dm index 31d4c396cca..41a921cd335 100644 --- a/code/modules/instruments/items.dm +++ b/code/modules/instruments/items.dm @@ -29,11 +29,6 @@ /obj/item/instrument/proc/should_stop_playing(mob/user) return user.incapacitated() || !((loc == user) || (isturf(loc) && Adjacent(user))) // sorry, no more TK playing. -/obj/item/instrument/suicide_act(mob/user) - var/datum/gender/T = gender_datums[user.get_visible_gender()] - user.visible_message("[user] begins to play 'Gloomy Sunday'! It looks like [T.hes] trying to commit suicide!") - return (BRUTELOSS) - /obj/item/instrument/attack_self(mob/user) if(!user.IsAdvancedToolUser()) to_chat(user, "You don't have the dexterity to do this!") diff --git a/code/modules/projectiles/guns/energy/gunsword_vr.dm b/code/modules/projectiles/guns/energy/gunsword_vr.dm index cd28b53c905..cd28874afb4 100644 --- a/code/modules/projectiles/guns/energy/gunsword_vr.dm +++ b/code/modules/projectiles/guns/energy/gunsword_vr.dm @@ -115,12 +115,5 @@ add_fingerprint(user) return -/obj/item/weapon/cell/device/weapon/gunsword/suicide_act(mob/user) - var/datum/gender/TU = gender_datums[user.get_visible_gender()] - if(active) - user.visible_message(pick("\The [user] is slitting [TU.his] stomach open with \the [src]! It looks like [TU.he] [TU.is] trying to commit seppuku.",\ - "\The [user] is falling on \the [src]! It looks like [TU.he] [TU.is] trying to commit suicide.")) - return (BRUTELOSS|FIRELOSS) - /obj/item/weapon/cell/device/weapon/gunsword/update_icon() cut_overlays() \ No newline at end of file diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 79b061004d1..8f1c678a0fd 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1078,13 +1078,6 @@ add_fingerprint(user) return -/obj/item/weapon/melee/fluffstuff/suicide_act(mob/user) - var/tempgender = "[user.gender == MALE ? "he's" : user.gender == FEMALE ? "she's" : "they are"]" - if(active) - user.visible_message(pick("\The [user] is slitting \his stomach open with \the [src]! It looks like [tempgender] trying to commit seppuku.",\ - "\The [user] is falling on \the [src]! It looks like [tempgender] trying to commit suicide.")) - return (BRUTELOSS|FIRELOSS) - /obj/item/weapon/melee/fluffstuff/wolfgirlsword name = "Wolfgirl Sword Replica" desc = "A replica of a large, scimitar-like sword with a dull edge. Ceremonial... until it isn't."