mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-26 13:39:16 +01:00
some more new to init (#17231)
* some more new to init * rigs * rigs * intellisense moment * telcoms and landmarks * fix that as well * some more minor things * re add missing message * fix trash eating...
This commit is contained in:
@@ -135,8 +135,8 @@
|
||||
can_repeat = FALSE
|
||||
banglet = TRUE
|
||||
|
||||
/obj/item/grenade/flashbang/clusterbang/segment/New()//Segments should never exist except part of the clusterbang, since these immediately 'do their thing' and asplode
|
||||
..()
|
||||
/obj/item/grenade/flashbang/clusterbang/segment/Initialize(mapload) //Segments should never exist except part of the clusterbang, since these immediately 'do their thing' and asplode
|
||||
. = ..()
|
||||
|
||||
icon_state = "clusterbang_segment_active"
|
||||
|
||||
@@ -144,15 +144,13 @@
|
||||
var/temploc = src.loc//Saves the current location to know where to step away from
|
||||
walk_away(src,temploc,stepdist)//I must go, my people need me
|
||||
|
||||
var/dettime = rand(15,60)
|
||||
spawn(dettime)
|
||||
detonate()
|
||||
addtimer(CALLBACK(src, PROC_REF(detonate)), rand(15, 60), TIMER_DELETE_ME)
|
||||
|
||||
/obj/item/grenade/flashbang/cluster
|
||||
banglet = TRUE
|
||||
|
||||
/obj/item/grenade/flashbang/cluster/New()//Same concept as the segments, so that all of the parts don't become reliant on the clusterbang
|
||||
..()
|
||||
/obj/item/grenade/flashbang/cluster/Initialize(mapload)//Same concept as the segments, so that all of the parts don't become reliant on the clusterbang
|
||||
. = ..()
|
||||
|
||||
icon_state = "flashbang_active"
|
||||
|
||||
@@ -160,6 +158,4 @@
|
||||
var/temploc = src.loc
|
||||
walk_away(src,temploc,stepdist)
|
||||
|
||||
var/dettime = rand(15,60)
|
||||
spawn(dettime)
|
||||
detonate()
|
||||
addtimer(CALLBACK(src, PROC_REF(detonate)), rand(15, 60), TIMER_DELETE_ME)
|
||||
|
||||
Reference in New Issue
Block a user