cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-16 13:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8311 from Atermonera/remove_suicide_act

Browse Source 
Remove suicide act
This commit is contained in:
MistakeNot4892
2021-09-22 11:15:16 +10:00
committed by GitHub
parent f8718ae0bc d8d9a09b38
commit 786c7db60c
22 changed files with 5 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/paperwork/pen.dm
View File

@@ -291,11 +291,6 @@
drop_sound = 'sound/items/drop/gloves.ogg'
pickup_sound = 'sound/items/pickup/gloves.ogg'
/obj/item/weapon/pen/crayon/suicide_act(mob/user)
var/datum/gender/TU = gender_datums[user.get_visible_gender()]
to_chat(viewers(user),"<font color='red'><b>[user] is jamming the [src.name] up [TU.his] nose and into [TU.his] brain. It looks like [TU.he] [TU.is] trying to commit suicide.</b></font>")
return (BRUTELOSS|OXYLOSS)
/obj/item/weapon/pen/crayon/New()
name = "[colourName] crayon"

8
code/modules/power/cable.dm
View File

@@ -520,14 +520,6 @@ var/list/possible_cable_coil_colours = list(
uses_charge = 1
charge_costs = list(1)
/obj/item/stack/cable_coil/suicide_act(mob/user)
var/datum/gender/TU = gender_datums[user.get_visible_gender()]
if(locate(/obj/item/weapon/stool) in user.loc)
user.visible_message("<span class='suicide'>[user] is making a noose with the [src.name]! It looks like [TU.he] [TU.is] trying to commit suicide.</span>")
else
user.visible_message("<span class='suicide'>[user] is strangling [TU.himself] with the [src.name]! It looks like [TU.he] [TU.is] trying to commit suicide.</span>")
return(OXYLOSS)
/obj/item/stack/cable_coil/New(loc, length = MAXCOIL, var/param_color = null)
..()
src.amount = length

7
code/modules/power/cell.dm
View File

@@ -264,9 +264,4 @@
if (1000 to 50000-1)
return min(rand(10,20),rand(10,20))
else
return 0
/obj/item/weapon/cell/suicide_act(mob/user)
var/datum/gender/TU = gender_datums[user.get_visible_gender()]
to_chat(viewers(user),"<span class='danger'>\The [user] is licking the electrodes of \the [src]! It looks like [TU.he] [TU.is] trying to commit suicide.</span>")
return (FIRELOSS)
return 0

13
code/modules/virus2/effect.dm
View File

@@ -122,19 +122,6 @@
var/mob/living/carbon/human/h = mob
h.monkeyize()
/datum/disease2/effect/suicide
name = "Windpipe Contraction"
stage = 4
badness = 3
/datum/disease2/effect/suicide/activate(var/mob/living/carbon/mob,var/multiplier)
var/datum/gender/TM = gender_datums[mob.get_visible_gender()]
mob.suiciding = 30
//instead of killing them instantly, just put them at -175 health and let 'em gasp for a while
to_chat(viewers(mob),"<font color='red'><b>[mob.name] is holding [TM.his] breath. It looks like [TM.he] [TM.is] trying to commit suicide.</b></font>")
mob.adjustOxyLoss(175 - mob.getToxLoss() - mob.getFireLoss() - mob.getBruteLoss() - mob.getOxyLoss())
mob.updatehealth()
/datum/disease2/effect/killertoxins
name = "Autoimmune Response"
stage = 4