Adds ~70 more suicides

This commit is contained in:
MrDoomBringer
2018-01-23 02:38:31 -05:00
committed by CitadelStationBot
parent 5e1ff26276
commit 4d206f56e8
52 changed files with 585 additions and 130 deletions
+11 -1
View File
@@ -15,6 +15,17 @@
var/cooldown = 0
var/last_trigger = 0 //Last time it was successfully triggered.
/obj/item/device/assembly/flash/suicide_act(mob/living/user)
if (crit_fail)
user.visible_message("<span class='suicide'>[user] raises \the [src] up to [user.p_their()] eyes and activates it ... but its burnt out!</span>")
return SHAME
else if (user.eye_blind)
user.visible_message("<span class='suicide'>[user] raises \the [src] up to [user.p_their()] eyes and activates it ... but [user.p_theyre()] blind!</span>")
return SHAME
user.visible_message("<span class='suicide'>[user] raises \the [src] up to [user.p_their()] eyes and activates it! It looks like [user.p_theyre()] trying to commit suicide!</span>")
attack(user,user)
return FIRELOSS
/obj/item/device/assembly/flash/update_icon(flash = FALSE)
cut_overlays()
attached_overlays = list()
@@ -134,7 +145,6 @@
user.visible_message("<span class='disarm'>[user] fails to blind [M] with the flash!</span>", "<span class='warning'>You fail to blind [M] with the flash!</span>")
/obj/item/device/assembly/flash/attack_self(mob/living/carbon/user, flag = 0, emp = 0)
if(holder)
return FALSE
+44
View File
@@ -1,3 +1,4 @@
<<<<<<< HEAD
/obj/item/device/assembly/igniter
name = "igniter"
desc = "A small electronic device able to ignite combustible substances."
@@ -34,3 +35,46 @@
light [A].</span>"
activate()
add_fingerprint(user)
=======
/obj/item/device/assembly/igniter
name = "igniter"
desc = "A small electronic device able to ignite combustible substances."
icon_state = "igniter"
materials = list(MAT_METAL=500, MAT_GLASS=50)
var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread
heat = 1000
/obj/item/device/assembly/igniter/suicide_act(mob/living/carbon/user)
user.visible_message("<span class='suicide'>[user] is trying to ignite [user.p_them()]self with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
user.IgniteMob()
return FIRELOSS
/obj/item/device/assembly/igniter/New()
..()
sparks.set_up(2, 0, src)
sparks.attach(src)
/obj/item/device/assembly/igniter/Destroy()
qdel(sparks)
sparks = null
. = ..()
/obj/item/device/assembly/igniter/activate()
if(!..())
return 0//Cooldown check
var/turf/location = get_turf(loc)
if(location)
location.hotspot_expose(1000,1000)
sparks.start()
return 1
/obj/item/device/assembly/igniter/attack_self(mob/user)
activate()
add_fingerprint(user)
/obj/item/device/assembly/igniter/ignition_effect(atom/A, mob/user)
. = "<span class='notice'>[user] fiddles with [src], and manages to \
light [A].</span>"
activate()
add_fingerprint(user)
>>>>>>> 20a6c0c... Adds ~70 more suicides (#34522)
+15
View File
@@ -13,6 +13,19 @@
var/frequency = FREQ_SIGNALER
var/delay = 0
var/datum/radio_frequency/radio_connection
var/suicider = null
/obj/item/device/assembly/signaler/suicide_act(mob/living/carbon/user)
user.visible_message("<span class='suicide'>[user] eats \the [src]! If it is signaled, [user.p_they()] will die!</span>")
playsound(src, 'sound/items/eatfood.ogg', 50, 1)
user.transferItemToLoc(src, user, TRUE)
suicider = user
return MANUAL_SUICIDE
/obj/item/device/assembly/signaler/proc/manual_suicide(mob/living/carbon/user)
user.visible_message("<span class='suicide'>[user]'s \the [src] recieves a signal, killing them instantly!</span>")
user.adjustOxyLoss(200)//it sends an electrical pulse to their heart, killing them. or something.
user.death(0)
/obj/item/device/assembly/signaler/New()
..()
@@ -123,6 +136,8 @@ Code:
return 0
if(!(src.wires & WIRE_RADIO_RECEIVE))
return 0
if(suicider)
manual_suicide(suicider)
pulse(1)
audible_message("[icon2html(src, hearers(src))] *beep* *beep*", null, 1)
return
+10
View File
@@ -10,6 +10,16 @@
var/saved_time = 5
var/loop = 0
/obj/item/device/assembly/timer/suicide_act(mob/living/user)
user.visible_message("<span class='suicide'>[user] looks at the timer and decides [user.p_their()] fate! It looks like [user.p_theyre()] going to commit suicide!</span>")
activate()//doesnt rely on timer_end to prevent weird metas where one person can control the timer and therefore someone's life. (maybe that should be how it works...)
addtimer(CALLBACK(src, .proc/manual_suicide, user), time*10)//kill yourself once the time runs out
return MANUAL_SUICIDE
/obj/item/device/assembly/timer/proc/manual_suicide(mob/living/user)
user.visible_message("<span class='suicide'>[user]'s time is up!</span>")
user.adjustOxyLoss(200)
user.death(0)
/obj/item/device/assembly/timer/New()
..()