Skip to content

Commit

Permalink
Deletes suicide verb and suicide_act. (#148)
Browse files Browse the repository at this point in the history
* delete

* Update tgmc-schema.sql
  • Loading branch information
Helg2 authored Aug 27, 2024
1 parent b8b5fec commit 253a87d
Show file tree
Hide file tree
Showing 21 changed files with 6 additions and 236 deletions.
1 change: 0 additions & 1 deletion SQL/tgmc-schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion code/__DEFINES/span.dm
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
#define span_scannerburnb(str) ("<span class='scannerburnb'>" + str + "</span>")
#define span_season_additional_info(str) ("<span class='season_additional_info'>" + str + "</span>")
#define span_seasons_announce(str) ("<span class='seasons_announce'>" + str + "</span>")
#define span_suicide(str) ("<span class='suicide'>" + str + "</span>")
#define span_tip(str) ("<span class='tip'>" + str + "</span>")
#define span_userdanger(str) ("<span class='userdanger'>" + str + "</span>")
#define span_value(str) ("<span class='value'>" + str + "</span>")
Expand Down
5 changes: 2 additions & 3 deletions code/controllers/subsystem/blackbox.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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]",
Expand Down
9 changes: 2 additions & 7 deletions code/datums/gamemodes/_game_mode.dm
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,7 @@ GLOBAL_VAR(common_report) //Contains common part of roundend report
if(L.client.inactivity >= (ROUNDSTART_LOGOUT_REPORT_TIME / 2))
msg += "<b>[ADMIN_TPMONTY(L)]</b> the [L.job.title] (<b>Connected, Inactive</b>)<br>"
else if(L.stat)
if(L.suiciding)
msg += "<b>[ADMIN_TPMONTY(L)]</b> the [L.job.title] (<b>Suicide</b>)<br>"
else if(L.stat == UNCONSCIOUS)
if(L.stat == UNCONSCIOUS)
msg += "<b>[ADMIN_TPMONTY(L)]</b> the [L.job.title] (Dying)<br>"
else if(L.stat == DEAD)
msg += "<b>[ADMIN_TPMONTY(L)]</b> the [L.job.title] (Dead)<br>"
Expand All @@ -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 += "<b>[ADMIN_TPMONTY(L)]</b> the [L.job.title] (<b>Suicide</b>)<br>"
else
msg += "<b>[ADMIN_TPMONTY(L)]</b> the [L.job.title] (Dead)<br>"
msg += "<b>[ADMIN_TPMONTY(L)]</b> the [L.job.title] (Dead)<br>"
else if(!D.can_reenter_corpse)
msg += "<b>[ADMIN_TPMONTY(L)]</b> the [L.job.title] (<b>Ghosted</b>)<br>"

Expand Down
10 changes: 0 additions & 10 deletions code/game/objects/items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 2 additions & 6 deletions code/game/objects/items/defibrillator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
4 changes: 0 additions & 4 deletions code/game/objects/items/power_cells.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 0 additions & 4 deletions code/game/objects/items/shards.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..()
Expand Down
12 changes: 0 additions & 12 deletions code/game/objects/items/tools/kitchen_tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..()
Expand Down Expand Up @@ -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."
Expand Down
6 changes: 0 additions & 6 deletions code/game/objects/items/tools/maintenance_tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 0 additions & 10 deletions code/game/objects/items/tools/surgery_tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand All @@ -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
*/
Expand Down
4 changes: 0 additions & 4 deletions code/game/objects/items/toys/toys.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
18 changes: 0 additions & 18 deletions code/game/objects/items/weapons/blades.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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."
Expand Down
11 changes: 0 additions & 11 deletions code/game/objects/items/weapons/energy.dm
Original file line number Diff line number Diff line change
@@ -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."
Expand All @@ -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)
Expand Down
4 changes: 0 additions & 4 deletions code/game/objects/items/weapons/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
10 changes: 0 additions & 10 deletions code/game/objects/items/weapons/stunbaton.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
10 changes: 0 additions & 10 deletions code/game/objects/items/weapons/weaponry.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


/obj/item/weapon/banhammer
desc = "A banhammer"
name = "banhammer"
Expand All @@ -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."
Expand All @@ -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
Expand Down
Loading

0 comments on commit 253a87d

Please sign in to comment.