diff --git a/SQL/tgmc-schema.sql b/SQL/tgmc-schema.sql index 235fc63be13..e80f8895f38 100644 --- a/SQL/tgmc-schema.sql +++ b/SQL/tgmc-schema.sql @@ -134,7 +134,6 @@ CREATE TABLE IF NOT EXISTS `death` ( `cloneloss` smallint(5) unsigned NOT NULL, `staminaloss` smallint(5) unsigned NOT NULL, `last_words` varchar(255) DEFAULT NULL, - `suicide` tinyint(1) NOT NULL DEFAULT 0, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; diff --git a/code/__DEFINES/span.dm b/code/__DEFINES/span.dm index 9df0220cab0..a903fd64d95 100644 --- a/code/__DEFINES/span.dm +++ b/code/__DEFINES/span.dm @@ -64,7 +64,6 @@ #define span_scannerburnb(str) ("" + str + "") #define span_season_additional_info(str) ("" + str + "") #define span_seasons_announce(str) ("" + str + "") -#define span_suicide(str) ("" + str + "") #define span_tip(str) ("" + str + "") #define span_userdanger(str) ("" + str + "") #define span_value(str) ("" + str + "") diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm index 05200b77561..5cf56335843 100644 --- a/code/controllers/subsystem/blackbox.dm +++ b/code/controllers/subsystem/blackbox.dm @@ -197,8 +197,8 @@ SUBSYSTEM_DEF(blackbox) return var/datum/db_query/query_report_death = SSdbcore.NewQuery({" - INSERT INTO [format_table_name("death")] (pod, x_coord, y_coord, z_coord, mapname, server_ip, server_port, round_id, tod, job, special, name, byondkey, laname, lakey, bruteloss, fireloss, brainloss, oxyloss, toxloss, cloneloss, staminaloss, last_words, suicide) - VALUES (:pod, :x_coord, :y_coord, :z_coord, :map, INET_ATON(:internet_address), :port, :round_id, :time, :job, :special, :name, :key, :laname, :lakey, :brute, :fire, :brain, :oxy, :tox, :clone, :stamina, :last_words, :suicide) + INSERT INTO [format_table_name("death")] (pod, x_coord, y_coord, z_coord, mapname, server_ip, server_port, round_id, tod, job, special, name, byondkey, laname, lakey, bruteloss, fireloss, brainloss, oxyloss, toxloss, cloneloss, staminaloss, last_words) + VALUES (:pod, :x_coord, :y_coord, :z_coord, :map, INET_ATON(:internet_address), :port, :round_id, :time, :job, :special, :name, :key, :laname, :lakey, :brute, :fire, :brain, :oxy, :tox, :clone, :stamina, :last_words) "}, list( "name" = L.real_name, "key" = L.ckey, @@ -218,7 +218,6 @@ SUBSYSTEM_DEF(blackbox) "y_coord" = L.y, "z_coord" = L.z, "last_words" = "no last words", - "suicide" = L.suiciding, "map" = SSmapping.configs[GROUND_MAP].map_name, "internet_address" = world.internet_address || "0", "port" = "[world.port]", diff --git a/code/datums/gamemodes/_game_mode.dm b/code/datums/gamemodes/_game_mode.dm index d2cc0d3ec01..fd2b4a6c47f 100644 --- a/code/datums/gamemodes/_game_mode.dm +++ b/code/datums/gamemodes/_game_mode.dm @@ -234,9 +234,7 @@ GLOBAL_VAR(common_report) //Contains common part of roundend report if(L.client.inactivity >= (ROUNDSTART_LOGOUT_REPORT_TIME / 2)) msg += "[ADMIN_TPMONTY(L)] the [L.job.title] (Connected, Inactive)
" else if(L.stat) - if(L.suiciding) - msg += "[ADMIN_TPMONTY(L)] the [L.job.title] (Suicide)
" - else if(L.stat == UNCONSCIOUS) + if(L.stat == UNCONSCIOUS) msg += "[ADMIN_TPMONTY(L)] the [L.job.title] (Dying)
" else if(L.stat == DEAD) msg += "[ADMIN_TPMONTY(L)] the [L.job.title] (Dead)
" @@ -246,10 +244,7 @@ GLOBAL_VAR(common_report) //Contains common part of roundend report continue var/mob/living/L = D.mind.current if(L.stat == DEAD) - if(L.suiciding) - msg += "[ADMIN_TPMONTY(L)] the [L.job.title] (Suicide)
" - else - msg += "[ADMIN_TPMONTY(L)] the [L.job.title] (Dead)
" + msg += "[ADMIN_TPMONTY(L)] the [L.job.title] (Dead)
" else if(!D.can_reenter_corpse) msg += "[ADMIN_TPMONTY(L)] the [L.job.title] (Ghosted)
" diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 13f5687d9fb..f22021efb47 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -179,16 +179,6 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan /obj/item/proc/update_item_state(mob/user) item_state = "[initial(icon_state)][flags_item & WIELDED ? "_w" : ""]" -//user: The mob that is suiciding -//damagetype: The type of damage the item will inflict on the user -//BRUTELOSS = 1 -//FIRELOSS = 2 -//TOXLOSS = 4 -//OXYLOSS = 8 -//Output a creative message and then return the damagetype done -/obj/item/proc/suicide_act(mob/user) - return - /obj/item/verb/move_to_top() set name = "Move To Top" set category = "Object.Mob" diff --git a/code/game/objects/items/defibrillator.dm b/code/game/objects/items/defibrillator.dm index 03ef43911bb..875a33162ad 100644 --- a/code/game/objects/items/defibrillator.dm +++ b/code/game/objects/items/defibrillator.dm @@ -23,10 +23,6 @@ ///Cooldown for toggling the defib var/defib_cooldown = 0 -/obj/item/defibrillator/suicide_act(mob/user) - user.visible_message(span_danger("[user] is putting the live paddles on [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide.")) - return (FIRELOSS) - /obj/item/defibrillator/Initialize(mapload) . = ..() sparks = new @@ -182,7 +178,7 @@ user.visible_message(span_warning("[icon2html(src, viewers(user))] \The [src] buzzes: Vital signs detected. Aborting.")) return - if((HAS_TRAIT(H, TRAIT_UNDEFIBBABLE) && !issynth(H)) || H.suiciding) //synthetic species have no expiration date + if((HAS_TRAIT(H, TRAIT_UNDEFIBBABLE) && !issynth(H))) //synthetic species have no expiration date user.visible_message(span_warning("[icon2html(src, viewers(user))] \The [src] buzzes: Patient is braindead. No remedy possible.")) return @@ -229,7 +225,7 @@ if(!issynth(H) && !isrobot(H) && heart && prob(90) && !advanced) heart.take_damage(5) //Allow the defibrillator to possibly worsen heart damage. Still rare enough to just be the "clone damage" of the defib - if(HAS_TRAIT(H, TRAIT_UNDEFIBBABLE) || H.suiciding) + if(HAS_TRAIT(H, TRAIT_UNDEFIBBABLE)) user.visible_message(span_warning("[icon2html(src, viewers(user))] \The [src] buzzes: Patient's brain has decayed too much. No remedy possible.")) return diff --git a/code/game/objects/items/power_cells.dm b/code/game/objects/items/power_cells.dm index 9445afed4ab..551fc99d316 100644 --- a/code/game/objects/items/power_cells.dm +++ b/code/game/objects/items/power_cells.dm @@ -172,10 +172,6 @@ else corrupt() -/obj/item/cell/suicide_act(mob/user) - user.visible_message(span_danger("[user] is licking the electrodes of the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.")) - return (FIRELOSS) - /obj/item/cell/use(amount) // use power from a cell if(rigged && amount > 0) explode() diff --git a/code/game/objects/items/shards.dm b/code/game/objects/items/shards.dm index f6602fb24f4..866116dcb7c 100644 --- a/code/game/objects/items/shards.dm +++ b/code/game/objects/items/shards.dm @@ -19,10 +19,6 @@ var/source_sheet_type = /obj/item/stack/sheet/glass var/shardsize = TRUE -/obj/item/shard/suicide_act(mob/user) - user.visible_message(span_danger("[user] is slitting [user.p_their()] [pick("wrists", "throat")] with [src]! It looks like [user.p_theyre()] trying to commit suicide.")) - return (BRUTELOSS) - /obj/item/shard/attack(mob/living/carbon/M, mob/living/carbon/user) playsound(loc, 'sound/weapons/bladeslice.ogg', 25, 1, 6) return ..() diff --git a/code/game/objects/items/tools/kitchen_tools.dm b/code/game/objects/items/tools/kitchen_tools.dm index edd3bc06f0b..19f7f062794 100644 --- a/code/game/objects/items/tools/kitchen_tools.dm +++ b/code/game/objects/items/tools/kitchen_tools.dm @@ -87,12 +87,6 @@ sharp = IS_SHARP_ITEM_ACCURATE edge = 1 -/obj/item/tool/kitchen/utensil/knife/suicide_act(mob/user) - user.visible_message(pick(span_danger("[user] is slitting [user.p_their()] wrists with the [name]! It looks like [user.p_theyre()] trying to commit suicide."), \ - span_danger("[user] is slitting [user.p_their()] throat with the [name]! It looks like [user.p_theyre()] trying to commit suicide."), \ - span_danger("[user] is slitting [user.p_their()] stomach open with the [name]! It looks like [user.p_theyre()] trying to commit seppuku."))) - return (BRUTELOSS) - /obj/item/tool/kitchen/utensil/knife/attack(target as mob, mob/living/user as mob) playsound(loc, 'sound/weapons/bladeslice.ogg', 25, 1, 5) return ..() @@ -121,12 +115,6 @@ throw_range = 6 attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") -/obj/item/tool/kitchen/knife/suicide_act(mob/user) - user.visible_message(pick(span_danger("[user] is slitting [user.p_their()] wrists with the [name]! It looks like [user.p_theyre()] trying to commit suicide."), \ - span_danger("[user] is slitting [user.p_their()] throat with the [name]! It looks like [user.p_theyre()] trying to commit suicide."), \ - span_danger("[user] is slitting [user.p_their()] stomach open with the [name]! It looks like [user.p_theyre()] trying to commit seppuku."))) - return (BRUTELOSS) - /obj/item/tool/kitchen/knife/ritual name = "ritual knife" desc = "The unearthly energies that once powered this blade are now dormant." diff --git a/code/game/objects/items/tools/maintenance_tools.dm b/code/game/objects/items/tools/maintenance_tools.dm index 66c0beaf489..027c6455683 100644 --- a/code/game/objects/items/tools/maintenance_tools.dm +++ b/code/game/objects/items/tools/maintenance_tools.dm @@ -38,12 +38,6 @@ "yellow" = "#ffa500" ) - -/obj/item/tool/screwdriver/suicide_act(mob/user) - user.visible_message(span_danger("[user] is stabbing the [name] into [user.p_their()] [pick("temple","heart")]! It looks like [user.p_theyre()] trying to commit suicide.")) - return(BRUTELOSS) - - /obj/item/tool/screwdriver/Initialize(mapload) if(random_color) set_greyscale_config(/datum/greyscale_config/screwdriver) diff --git a/code/game/objects/items/tools/surgery_tools.dm b/code/game/objects/items/tools/surgery_tools.dm index df5d9222b9c..26377ce98b4 100644 --- a/code/game/objects/items/tools/surgery_tools.dm +++ b/code/game/objects/items/tools/surgery_tools.dm @@ -40,10 +40,6 @@ w_class = WEIGHT_CLASS_SMALL attack_verb = list("drilled") -/obj/item/tool/surgery/surgicaldrill/suicide_act(mob/user) - user.visible_message(span_danger("[user] is pressing the [name] to [user.p_their()] [pick("temple","chest")] and activating it! It looks like [user.p_theyre()] trying to commit suicide.")) - return (BRUTELOSS) - /obj/item/tool/surgery/scalpel name = "scalpel" desc = "Cut, cut, and once more cut." @@ -58,12 +54,6 @@ throw_range = 5 attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") -/obj/item/tool/surgery/scalpel/suicide_act(mob/user) - user.visible_message(pick(span_danger("[user] is slitting [user.p_their()] wrists with the [name]! It looks like [user.p_theyre()] trying to commit suicide."), \ - span_danger("[user] is slitting [user.p_their()] throat with the [name]! It looks like [user.p_theyre()] trying to commit suicide."), \ - span_danger("[user] is slitting [user.p_their()] stomach open with the [name]! It looks like [user.p_theyre()] trying to commit seppuku."))) - return (BRUTELOSS) - /* * Researchable Scalpels */ diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index 6945968b569..c1e137a1195 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -134,10 +134,6 @@ var/instant = 0 var/colourName = "red" //for updateIcon purposes -/obj/item/toy/crayon/suicide_act(mob/user) - user.visible_message(span_danger("[user] is jamming the [name] up [user.p_their()] nose and into [user.p_their()] brain. It looks like [user.p_theyre()] trying to commit suicide.")) - return (BRUTELOSS|OXYLOSS) - /* * Snap pops */ diff --git a/code/game/objects/items/weapons/blades.dm b/code/game/objects/items/weapons/blades.dm index 2139e30aeb5..5bf9c903d79 100644 --- a/code/game/objects/items/weapons/blades.dm +++ b/code/game/objects/items/weapons/blades.dm @@ -35,10 +35,6 @@ . = ..() AddElement(/datum/element/scalping) -/obj/item/weapon/claymore/suicide_act(mob/user) - user.visible_message(span_danger("[user] is falling on the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.")) - return(BRUTELOSS) - /obj/item/weapon/claymore/mercsword name = "combat sword" desc = "A dusty sword commonly seen in historical museums. Where you got this is a mystery, for sure. Only a mercenary would be nuts enough to carry one of these. Sharpened to deal massive damage." @@ -243,10 +239,6 @@ w_class = WEIGHT_CLASS_NORMAL attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") -/obj/item/weapon/katana/suicide_act(mob/user) - user.visible_message(span_danger("[user] is slitting [user.p_their()] stomach open with the [name]! It looks like [user.p_theyre()] trying to commit seppuku.")) - return(BRUTELOSS) - //To do: replace the toys. /obj/item/weapon/katana/replica name = "replica katana" @@ -330,12 +322,6 @@ AddElement(/datum/element/scalping) AddElement(/datum/element/shrapnel_removal, 12 SECONDS, 12 SECONDS, 10) -/obj/item/weapon/combat_knife/suicide_act(mob/user) - user.visible_message(pick(span_danger("[user] is slitting [user.p_their()] wrists with the [name]! It looks like [user.p_theyre()] trying to commit suicide."), \ - span_danger("[user] is slitting [user.p_their()] throat with the [name]! It looks like [user.p_theyre()] trying to commit suicide."), \ - span_danger("[user] is slitting [user.p_their()] stomach open with the [name]! It looks like [user.p_theyre()] trying to commit seppuku."))) - return (BRUTELOSS) - /obj/item/weapon/combat_knife/upp name = "\improper Type 30 survival knife" icon_state = "upp_knife" @@ -555,10 +541,6 @@ playsound(loc, 'sound/weapons/chainsawhit.ogg', 100, 1) return ..() -/obj/item/weapon/chainsword/suicide_act(mob/user) - user.visible_message(span_danger("[user] is falling on the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.")) - return(BRUTELOSS) - /obj/item/weapon/chainsword/civilian name = "chainsaw" desc = "A chainsaw. Good for turning big things into little things." diff --git a/code/game/objects/items/weapons/energy.dm b/code/game/objects/items/weapons/energy.dm index a7faf3b0921..ad67f77d141 100644 --- a/code/game/objects/items/weapons/energy.dm +++ b/code/game/objects/items/weapons/energy.dm @@ -1,13 +1,6 @@ /obj/item/weapon/energy flags_atom = NOBLOODY -/obj/item/weapon/energy/suicide_act(mob/user) - user.visible_message(pick(span_danger("[user] is slitting [user.p_their()] stomach open with the [name]! It looks like [user.p_theyre()] trying to commit seppuku."), \ - span_danger("[user] is falling on the [name]! It looks like [user.p_theyre()] trying to commit suicide."))) - return (BRUTELOSS|FIRELOSS) - - - /obj/item/weapon/energy/axe name = "energy axe" desc = "An energised battle axe." @@ -22,10 +15,6 @@ sharp = IS_SHARP_ITEM_BIG edge = 1 -/obj/item/weapon/energy/axe/suicide_act(mob/user) - user.visible_message(span_danger("[user] swings the [name] towards [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide.")) - return (BRUTELOSS|FIRELOSS) - /obj/item/weapon/energy/axe/attack_self(mob/user) active = !active if(active) diff --git a/code/game/objects/items/weapons/misc.dm b/code/game/objects/items/weapons/misc.dm index 369b4692e14..581a5c77ab5 100644 --- a/code/game/objects/items/weapons/misc.dm +++ b/code/game/objects/items/weapons/misc.dm @@ -10,10 +10,6 @@ w_class = WEIGHT_CLASS_NORMAL attack_verb = list("flogged", "whipped", "lashed", "disciplined") -/obj/item/weapon/chainofcommand/suicide_act(mob/user) - user.visible_message(span_danger("[user] is strangling [p_them()]self with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.")) - return (OXYLOSS) - /obj/item/weapon/cane name = "cane" desc = "A cane used by a true gentlemen. Or a clown." diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 3dcb2b5c921..486831ca0e8 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -18,10 +18,6 @@ var/hitcost = 1000 //oh god why do power cells carry so much charge? We probably need to make a distinction between "industrial" sized power cells for APCs and power cells for everything else. var/has_user_lock = TRUE //whether the baton prevents people without correct access from using it. -/obj/item/weapon/baton/suicide_act(mob/user) - user.visible_message(span_suicide("[user] is putting the live [name] in [user.p_their()] mouth! It looks like [user.p_theyre()] trying to commit suicide.")) - return (FIRELOSS) - /obj/item/weapon/baton/Initialize(mapload) . = ..() bcell = new/obj/item/cell/high(src) @@ -217,12 +213,6 @@ var/charges = 12 var/status = 0 - -/obj/item/weapon/stunprod/suicide_act(mob/user) - user.visible_message(span_danger("[user] is putting the live [src] in [user.p_their()] mouth! It looks like [p_theyre()] trying to commit suicide.")) - return FIRELOSS - - /obj/item/weapon/stunprod/update_icon_state() . = ..() if(status) diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 60a22c43925..2bc74c0363c 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -1,5 +1,3 @@ - - /obj/item/weapon/banhammer desc = "A banhammer" name = "banhammer" @@ -11,10 +9,6 @@ throw_range = 15 attack_verb = list("banned") -/obj/item/weapon/banhammer/suicide_act(mob/user) - user.visible_message(span_danger("[user] is hitting [p_them()]self with the [name]! It looks like [user.p_theyre()] trying to ban [p_them()]self from life.")) - return (BRUTELOSS|FIRELOSS|TOXLOSS|OXYLOSS) - /obj/item/weapon/nullrod name = "null rod" desc = "A rod of pure obsidian, its very presence disrupts and dampens the powers of paranormal phenomenae." @@ -27,10 +21,6 @@ throwforce = 10 w_class = WEIGHT_CLASS_SMALL -/obj/item/weapon/nullrod/suicide_act(mob/user) - user.visible_message(span_danger("[user] is impaling [p_them()]self with the [name]! It looks like [user.p_theyre()] trying to commit suicide.")) - return (BRUTELOSS|FIRELOSS) - /obj/item/weapon/harpoon name = "harpoon" sharp = IS_SHARP_ITEM_SIMPLE diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm deleted file mode 100644 index 398118cbe61..00000000000 --- a/code/game/verbs/suicide.dm +++ /dev/null @@ -1,107 +0,0 @@ -/mob/var/suiciding = 0 - -/mob/living/carbon/human/verb/suicide() - set hidden = 1 - - if (stat == DEAD) - to_chat(src, "You're already dead!") - return - - if (!SSticker) - to_chat(src, "You can't commit suicide before the game starts!") - return - - - if(!mind?.bypass_ff) - message_admins("[ADMIN_TPMONTY(usr)] has tried to suicide using the suicide verb, but they were not permitted due to not being an antagonist.") - to_chat(src, "Suicide is easy! Just attack yourself with a gun, while targeting your mouth.") - to_chat(src, "Please don't do so flippantly! If you want to just leave the round, enter a hypersleep bed.") - return - - - if (suiciding) - to_chat(src, "You're already committing suicide! Be patient!") - return - - var/confirm = tgui_alert(usr, "Are you sure you want to commit suicide?", "Confirm Suicide", list("Yes", "No")) - - if(confirm == "Yes") - if(!canmove || restrained()) //just while I finish up the new 'fun' suiciding verb. This is to prevent metagaming via suicide - to_chat(src, "You can't commit suicide whilst restrained! ((You can type Ghost instead however.))") - return - suiciding = 1 - var/obj/item/held_item = get_active_held_item() - if(held_item) - var/damagetype = held_item.suicide_act(src) - if(damagetype) - var/damage_mod = 1 - switch(damagetype) //Sorry about the magic numbers. - //brute = 1, burn = 2, tox = 4, oxy = 8 - if(15) //4 damage types - damage_mod = 4 - - if(6, 11, 13, 14) //3 damage types - damage_mod = 3 - - if(3, 5, 7, 9, 10, 12) //2 damage types - damage_mod = 2 - - if(1, 2, 4, 8) //1 damage type - damage_mod = 1 - - else //This should not happen, but if it does, everything should still work - damage_mod = 1 - - //Do 175 damage divided by the number of damage types applied. - if(damagetype & BRUTELOSS) - adjustBruteLoss(30/damage_mod) //hack to prevent gibbing - adjustOxyLoss(145/damage_mod) - - if(damagetype & FIRELOSS) - adjustFireLoss(175/damage_mod) - - if(damagetype & TOXLOSS) - adjustToxLoss(175/damage_mod) - - if(damagetype & OXYLOSS) - adjustOxyLoss(175/damage_mod) - - //If something went wrong, just do normal oxyloss - if(!(damagetype|BRUTELOSS) && !(damagetype|FIRELOSS) && !(damagetype|TOXLOSS) && !(damagetype|OXYLOSS)) - adjustOxyLoss(max(175 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) - - updatehealth() - return - - - visible_message(pick(span_danger("[src] is attempting to bite [p_their()] tongue off! It looks like [p_theyre()] trying to commit suicide."), \ - span_danger("[src] is jamming [p_their()] thumbs into [p_their()] eye sockets! It looks like [p_theyre()] trying to commit suicide."), \ - span_danger("[src] is twisting [p_their()] own neck! It looks like [p_theyre()] trying to commit suicide."), \ - span_danger("[src] is holding [p_their()] breath! It looks like [p_theyre()] trying to commit suicide."))) - adjustOxyLoss(max(175 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) - updatehealth() - -/mob/living/brain/verb/suicide() - set hidden = 1 - - if (stat == 2) - to_chat(src, "You're already dead!") - return - - if (!SSticker) - to_chat(src, "You can't commit suicide before the game starts!") - return - - if (suiciding) - to_chat(src, "You're already committing suicide! Be patient!") - return - - var/confirm = tgui_alert(usr, "Are you sure you want to commit suicide?", "Confirm Suicide", list("Yes", "No")) - - if(confirm == "Yes") - suiciding = 1 - viewers(loc) << span_danger("[src]'s brain is growing dull and lifeless. It looks like it's lost the will to live.") - spawn(50) - death() - suiciding = 0 - diff --git a/code/modules/instruments/items.dm b/code/modules/instruments/items.dm index 5b3ba0b8880..c842d2eda66 100644 --- a/code/modules/instruments/items.dm +++ b/code/modules/instruments/items.dm @@ -30,10 +30,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) - user.visible_message(span_suicide("[user] begins to play 'Gloomy Sunday'! It looks like [user.p_theyre()] trying to commit suicide!")) - return (BRUTELOSS) - /datum/action/item_action/instrument name = "Use Instrument" desc = "Use the instrument specified" diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 6cef737b3a0..32e39f2d312 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -194,9 +194,6 @@ if(holo_card_color) msg += "[t_He] [t_has] a [holo_card_color] holo card on [t_his] chest.\n" - if(suiciding) - msg += "[span_warning("[t_He] appear[p_s()] to have commited suicide... there is no hope of recovery.")]\n" - if(stat) msg += "[span_warning("[t_He] [t_is]n't responding to anything around [t_him] and seem[p_s()] to be asleep.")]\n" if(stat == DEAD || health < get_crit_threshold()) diff --git a/tgmc.dme b/tgmc.dme index c9bd61a037f..f7e0bd2d5f3 100644 --- a/tgmc.dme +++ b/tgmc.dme @@ -1175,7 +1175,6 @@ #include "code\game\turfs\walls\wall_types.dm" #include "code\game\turfs\walls\walls.dm" #include "code\game\verbs\ooc.dm" -#include "code\game\verbs\suicide.dm" #include "code\game\verbs\who.dm" #include "code\modules\admin\admin_ranks.dm" #include "code\modules\admin\admin_verbs.dm"