mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
[MIRROR] New to init final (#10649)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
e1b14a3570
commit
5853b61b55
@@ -49,15 +49,13 @@
|
||||
else
|
||||
add_overlay("open")
|
||||
|
||||
//VOREStation Add Start
|
||||
/obj/structure/closet/secure_closet/guncabinet/excursion
|
||||
name = "expedition weaponry cabinet"
|
||||
req_one_access = list(access_explorer,access_armory) //CHOMP keep explo
|
||||
|
||||
/obj/structure/closet/secure_closet/guncabinet/excursion/New()
|
||||
..()
|
||||
/obj/structure/closet/secure_closet/guncabinet/excursion/Initialize(mapload)
|
||||
. = ..()
|
||||
for(var/i = 1 to 2)
|
||||
new /obj/item/gun/energy/locked/frontier(src)
|
||||
for(var/i = 1 to 2)
|
||||
new /obj/item/gun/energy/locked/frontier/holdout(src)
|
||||
//VOREStation Add End
|
||||
|
||||
@@ -164,8 +164,8 @@
|
||||
var/self_del = 1
|
||||
anchored = 0
|
||||
|
||||
/obj/structure/closet/secure_closet/mind/New(var/datum/mind/mind_target, var/del_self = 1)
|
||||
.=..()
|
||||
/obj/structure/closet/secure_closet/mind/Initialize(mapload, var/datum/mind/mind_target, var/del_self = 1)
|
||||
. = ..()
|
||||
self_del = del_self
|
||||
if(mind_target)
|
||||
owner = mind_target
|
||||
|
||||
@@ -13,7 +13,8 @@
|
||||
var/intialOxy = 0
|
||||
var/timer = 240 //eventually the person will be freed
|
||||
|
||||
/obj/structure/closet/statue/New(loc, var/mob/living/L)
|
||||
/obj/structure/closet/statue/Initialize(mapload, var/mob/living/L)
|
||||
. = ..()
|
||||
if(L && (ishuman(L) || L.isMonkey() || iscorgi(L)))
|
||||
if(L.buckled)
|
||||
L.buckled = 0
|
||||
@@ -41,11 +42,9 @@
|
||||
desc = "If it takes forever, I will wait for you..."
|
||||
|
||||
if(health == 0) //meaning if the statue didn't find a valid target
|
||||
qdel(src)
|
||||
return
|
||||
return INITIALIZE_HINT_QDEL
|
||||
|
||||
START_PROCESSING(SSobj, src)
|
||||
..()
|
||||
|
||||
/obj/structure/closet/statue/process()
|
||||
timer--
|
||||
|
||||
Reference in New Issue
Block a user