mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-19 02:56:14 +01:00
Sorts out this PR
This commit is contained in:
@@ -262,7 +262,7 @@ steam.start() -- spawns the effect
|
||||
opacity = FALSE
|
||||
var/strength = 5 // How much damage to do inside each affect()
|
||||
|
||||
/obj/effect/effect/smoke/elemental/initialize()
|
||||
/obj/effect/effect/smoke/elemental/Initialize()
|
||||
processing_objects += src
|
||||
return ..()
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ GLOBAL_LIST_EMPTY(all_beam_points)
|
||||
var/beam_type = /obj/effect/ebeam // The type of beam. Default has no special properties. Some others may do things like hurt things touching it.
|
||||
var/beam_sleep_time = 3 // How often the beam updates visually. Suggested to leave this alone, 3 is already fast.
|
||||
|
||||
/obj/effect/map_effect/beam_point/initialize()
|
||||
/obj/effect/map_effect/beam_point/Initialize()
|
||||
GLOB.all_beam_points += src
|
||||
if(make_beams_on_init)
|
||||
create_beams()
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
var/effect_cardinals_only = FALSE // If true, effects only move in cardinal directions.
|
||||
var/effect_forced_dir = null // If set, effects emitted will always move in this direction.
|
||||
|
||||
/obj/effect/map_effect/interval/effect_emitter/initialize()
|
||||
/obj/effect/map_effect/interval/effect_emitter/Initialize()
|
||||
effect_system = new effect_system_type()
|
||||
effect_system.attach(src)
|
||||
configure_effects()
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
var/interval_upper_bound = 5 SECONDS // Higher number for above.
|
||||
var/halt = FALSE // Set to true to stop the loop when it reaches the next iteration.
|
||||
|
||||
/obj/effect/map_effect/interval/initialize()
|
||||
/obj/effect/map_effect/interval/Initialize()
|
||||
handle_interval_delay()
|
||||
return ..()
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
icon_state = "radiation_emitter"
|
||||
var/radiation_power = 30 // Bigger numbers means more radiation.
|
||||
|
||||
/obj/effect/map_effect/radiation_emitter/initialize()
|
||||
/obj/effect/map_effect/radiation_emitter/Initialize()
|
||||
processing_objects += src
|
||||
return ..()
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
var/duration = 10 //in deciseconds
|
||||
var/randomdir = TRUE
|
||||
|
||||
/obj/effect/temp_visual/initialize()
|
||||
/obj/effect/temp_visual/Initialize()
|
||||
. = ..()
|
||||
if(randomdir)
|
||||
set_dir(pick(global.cardinal))
|
||||
|
||||
@@ -1058,7 +1058,7 @@ var/list/multi_point_spawns
|
||||
var/id // Group id
|
||||
var/weight // Probability weight for this spawn point
|
||||
|
||||
/obj/random_multi/initialize()
|
||||
/obj/random_multi/Initialize()
|
||||
. = ..()
|
||||
weight = max(1, round(weight))
|
||||
|
||||
|
||||
@@ -95,7 +95,7 @@
|
||||
/obj/item/clothing/shoes/boots/jackboots,
|
||||
/obj/item/clothing/shoes/boots/jackboots/toeless)
|
||||
|
||||
/obj/structure/closet/secure_closet/nanotrasen_security/initialize()
|
||||
/obj/structure/closet/secure_closet/nanotrasen_security/Initialize()
|
||||
if(prob(25))
|
||||
starts_with += /obj/item/weapon/storage/backpack/security
|
||||
else
|
||||
@@ -149,7 +149,7 @@
|
||||
/obj/item/clothing/shoes/boots/jackboots/toeless,
|
||||
/obj/item/clothing/under/nanotrasen/security/commander)
|
||||
|
||||
/obj/structure/closet/secure_closet/nanotrasen_commander/initialize()
|
||||
/obj/structure/closet/secure_closet/nanotrasen_commander/Initialize()
|
||||
if(prob(25))
|
||||
starts_with += /obj/item/weapon/storage/backpack/security
|
||||
else
|
||||
@@ -195,7 +195,7 @@
|
||||
/obj/item/clothing/shoes/boots/jackboots,
|
||||
/obj/item/clothing/shoes/boots/jackboots/toeless)
|
||||
|
||||
/obj/structure/closet/secure_closet/nanotrasen_warden/initialize()
|
||||
/obj/structure/closet/secure_closet/nanotrasen_warden/Initialize()
|
||||
if(prob(25))
|
||||
new /obj/item/weapon/storage/backpack/security(src)
|
||||
else
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/obj/structure/closet/firecloset/initialize()
|
||||
/obj/structure/closet/firecloset/Initialize()
|
||||
starts_with += /obj/item/weapon/storage/toolbox/emergency
|
||||
return ..()
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
name = "Predator carrier"
|
||||
starts_with = list(/mob/living/simple_mob/vore/catgirl)
|
||||
|
||||
/obj/structure/largecrate/animal/pred/initialize() //This is nessesary to get a random one each time.
|
||||
/obj/structure/largecrate/animal/pred/Initialize() //This is nessesary to get a random one each time.
|
||||
starts_with = list(pick(/mob/living/simple_mob/vore/bee,
|
||||
/mob/living/simple_mob/vore/catgirl;3,
|
||||
/mob/living/simple_mob/vore/frog,
|
||||
@@ -61,7 +61,7 @@
|
||||
name = "Dangerous Predator carrier"
|
||||
starts_with = list(/mob/living/simple_mob/animal/space/alien)
|
||||
|
||||
/obj/structure/largecrate/animal/dangerous/initialize()
|
||||
/obj/structure/largecrate/animal/dangerous/Initialize()
|
||||
starts_with = list(pick(/mob/living/simple_mob/animal/space/carp/large,
|
||||
/mob/living/simple_mob/hostile/deathclaw,
|
||||
/mob/living/simple_mob/vore/dino,
|
||||
@@ -101,7 +101,7 @@
|
||||
desc = "VARMAcorp experimental hostile environment adaptive breeding development kit. WARNING, DO NOT RELEASE IN WILD!"
|
||||
starts_with = list(/mob/living/simple_mob/otie/cotie/phoron)
|
||||
|
||||
/obj/structure/largecrate/animal/otie/phoron/initialize()
|
||||
/obj/structure/largecrate/animal/otie/phoron/Initialize()
|
||||
starts_with = list(pick(/mob/living/simple_mob/otie/cotie/phoron;2,
|
||||
/mob/living/simple_mob/otie/red/friendly;0.5))
|
||||
return ..()
|
||||
@@ -129,7 +129,7 @@
|
||||
desc = "Bounces around a lot. Looks messily packaged, were they in a hurry?"
|
||||
starts_with = list(/mob/living/simple_mob/fennec)
|
||||
|
||||
/obj/structure/largecrate/animal/fennec/initialize()
|
||||
/obj/structure/largecrate/animal/fennec/Initialize()
|
||||
starts_with = list(pick(/mob/living/simple_mob/fennec,
|
||||
/mob/living/simple_mob/vore/fennix;0.5))
|
||||
return ..()
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
density = 1
|
||||
unacidable = 1
|
||||
|
||||
/obj/effect/blocker/initialize() // For non-gateway maps.
|
||||
/obj/effect/blocker/Initialize() // For non-gateway maps.
|
||||
. = ..()
|
||||
icon = null
|
||||
icon_state = null
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
var/global/list/allocated_gamma = list()
|
||||
|
||||
/obj/structure/trash_pile/initialize()
|
||||
/obj/structure/trash_pile/Initialize()
|
||||
. = ..()
|
||||
icon_state = pick(
|
||||
"pile1",
|
||||
|
||||
Reference in New Issue
Block a user