mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-24 04:28:12 +01:00
more new to Init (#17147)
* more new to Init * fix pumps * style update * fix atmos memory leak * fix mech * qdel in here * Update hands.dm * Update rings.dm
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
var/list/obj/effect/bump_teleporter/BUMP_TELEPORTERS = list()
|
||||
GLOBAL_LIST_EMPTY(bump_teleporters)
|
||||
|
||||
/obj/effect/bump_teleporter
|
||||
name = "bump-teleporter"
|
||||
@@ -11,12 +11,12 @@ var/list/obj/effect/bump_teleporter/BUMP_TELEPORTERS = list()
|
||||
density = TRUE
|
||||
opacity = 0
|
||||
|
||||
/obj/effect/bump_teleporter/New()
|
||||
..()
|
||||
BUMP_TELEPORTERS += src
|
||||
/obj/effect/bump_teleporter/Initialize()
|
||||
. = ..()
|
||||
GLOB.bump_teleporters += src
|
||||
|
||||
/obj/effect/bump_teleporter/Destroy()
|
||||
BUMP_TELEPORTERS -= src
|
||||
GLOB.bump_teleporters -= src
|
||||
return ..()
|
||||
|
||||
/obj/effect/bump_teleporter/Bumped(atom/user)
|
||||
@@ -28,7 +28,7 @@ var/list/obj/effect/bump_teleporter/BUMP_TELEPORTERS = list()
|
||||
//user.loc = src.loc //Stop at teleporter location, there is nowhere to teleport to.
|
||||
return
|
||||
|
||||
for(var/obj/effect/bump_teleporter/BT in BUMP_TELEPORTERS)
|
||||
for(var/obj/effect/bump_teleporter/BT in GLOB.bump_teleporters)
|
||||
if(BT.id == src.id_target)
|
||||
M.forceMove(BT.loc) //Teleport to location with correct id. //VOREStation Edit
|
||||
return
|
||||
|
||||
@@ -6,10 +6,9 @@
|
||||
anchored = TRUE
|
||||
mouse_opacity = 0
|
||||
|
||||
/obj/effect/expl_particles/New()
|
||||
..()
|
||||
spawn (15)
|
||||
qdel(src)
|
||||
/obj/effect/expl_particles/Initialize()
|
||||
. = ..()
|
||||
QDEL_IN(src, 1.5 SECONDS)
|
||||
return
|
||||
|
||||
/datum/effect/system/expl_particles
|
||||
@@ -42,10 +41,9 @@
|
||||
pixel_x = -32
|
||||
pixel_y = -32
|
||||
|
||||
/obj/effect/explosion/New()
|
||||
..()
|
||||
spawn (10)
|
||||
qdel(src)
|
||||
/obj/effect/explosion/Initialize()
|
||||
. = ..()
|
||||
QDEL_IN(src, 1 SECOND)
|
||||
return
|
||||
|
||||
/datum/effect/system/explosion
|
||||
@@ -60,13 +58,17 @@
|
||||
var/datum/effect/system/expl_particles/P = new/datum/effect/system/expl_particles()
|
||||
P.set_up(10,location)
|
||||
P.start()
|
||||
spawn(5)
|
||||
var/datum/effect/effect/system/smoke_spread/S = new/datum/effect/effect/system/smoke_spread()
|
||||
S.set_up(5,0,location,null)
|
||||
S.start()
|
||||
addtimer(CALLBACK(src, PROC_REF(spread_smoke)), 0.5 SECONDS)
|
||||
|
||||
/datum/effect/system/explosion/proc/spread_smoke()
|
||||
PRIVATE_PROC(TRUE)
|
||||
SHOULD_NOT_OVERRIDE(TRUE)
|
||||
var/datum/effect/effect/system/smoke_spread/S = new/datum/effect/effect/system/smoke_spread()
|
||||
S.set_up(5,0,location,null)
|
||||
S.start()
|
||||
|
||||
/datum/effect/system/explosion/smokeless/start()
|
||||
new/obj/effect/explosion(location)
|
||||
var/datum/effect/system/expl_particles/P = new/datum/effect/system/expl_particles()
|
||||
P.set_up(10,location)
|
||||
P.start()
|
||||
P.start()
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
icon_state = "x"
|
||||
unacidable = TRUE//Just to be sure.
|
||||
|
||||
/obj/effect/manifest/New()
|
||||
/obj/effect/manifest/Initialize()
|
||||
. = ..()
|
||||
|
||||
src.invisibility = 101
|
||||
return
|
||||
invisibility = 101
|
||||
|
||||
/obj/effect/manifest/proc/manifest()
|
||||
var/dat = span_bold("Crew Manifest") + ":<BR>"
|
||||
|
||||
@@ -175,7 +175,7 @@ GLOBAL_LIST_EMPTY(mapped_autostrips_mob)
|
||||
|
||||
/obj/effect/step_trigger/teleporter/landmark/Initialize()
|
||||
. = ..()
|
||||
for(var/obj/effect/landmark/teleport_mark/mark in tele_landmarks)
|
||||
for(var/obj/effect/landmark/teleport_mark/mark in GLOB.tele_landmarks)
|
||||
if(mark.landmark_id == landmark_id)
|
||||
the_landmark = mark
|
||||
return
|
||||
@@ -185,17 +185,17 @@ GLOBAL_LIST_EMPTY(mapped_autostrips_mob)
|
||||
A.forceMove(get_turf(the_landmark))
|
||||
|
||||
|
||||
var/global/list/tele_landmarks = list() // Terrible, but the alternative is looping through world.
|
||||
GLOBAL_LIST_EMPTY(tele_landmarks)
|
||||
|
||||
/obj/effect/landmark/teleport_mark
|
||||
var/landmark_id = null
|
||||
|
||||
/obj/effect/landmark/teleport_mark/New()
|
||||
..()
|
||||
tele_landmarks += src
|
||||
/obj/effect/landmark/teleport_mark/Initialize()
|
||||
. = ..()
|
||||
GLOB.tele_landmarks += src
|
||||
|
||||
/obj/effect/landmark/teleport_mark/Destroy()
|
||||
tele_landmarks -= src
|
||||
GLOB.tele_landmarks -= src
|
||||
return ..()
|
||||
|
||||
/* Teleporter which simulates falling out of the sky. */
|
||||
|
||||
@@ -13,17 +13,17 @@
|
||||
slot_flags = SLOT_BACK
|
||||
|
||||
//Predefined materials go here.
|
||||
/obj/item/material/twohanded/baseballbat/metal/New(var/newloc)
|
||||
..(newloc,MAT_STEEL)
|
||||
/obj/item/material/twohanded/baseballbat/metal/Initialize(mapload)
|
||||
. = ..(mapload,MAT_STEEL)
|
||||
|
||||
/obj/item/material/twohanded/baseballbat/uranium/New(var/newloc)
|
||||
..(newloc,MAT_URANIUM)
|
||||
/obj/item/material/twohanded/baseballbat/uranium/Initialize(mapload)
|
||||
. = ..(mapload,MAT_URANIUM)
|
||||
|
||||
/obj/item/material/twohanded/baseballbat/gold/New(var/newloc)
|
||||
..(newloc,MAT_GOLD)
|
||||
/obj/item/material/twohanded/baseballbat/gold/Initialize(mapload)
|
||||
. = ..(mapload,MAT_GOLD)
|
||||
|
||||
/obj/item/material/twohanded/baseballbat/platinum/New(var/newloc)
|
||||
..(newloc,MAT_PLATINUM)
|
||||
/obj/item/material/twohanded/baseballbat/platinum/Initialize(mapload)
|
||||
. = ..(mapload,MAT_PLATINUM)
|
||||
|
||||
/obj/item/material/twohanded/baseballbat/diamond/New(var/newloc)
|
||||
..(newloc,MAT_DIAMOND)
|
||||
/obj/item/material/twohanded/baseballbat/diamond/Initialize(mapload)
|
||||
. = ..(mapload,MAT_DIAMOND)
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
|
||||
var/list/spawned_mobs = list()
|
||||
|
||||
/obj/structure/mob_spawner/New()
|
||||
..()
|
||||
/obj/structure/mob_spawner/Initialize(mapload)
|
||||
. = ..()
|
||||
START_PROCESSING(SSobj, src)
|
||||
last_spawn = world.time + rand(0,spawn_delay)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user