cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

next new to init (#17400)

Browse Source 
* next new to init

* .

* this needs thorough testing

* .

* needs an istype

* also vnotice

* mvoe to defines
This commit is contained in:
Kashargul
2025-03-24 06:18:39 -04:00
committed by GitHub
parent 8a4ac36d15
commit d3b7ba8b43
141 changed files with 529 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/prop/snake.dm
+2 -3
View File
@@ -22,15 +22,14 @@
// Is the snake hunting a specific atom? (Will always try to meander toward this target.)
var/atom/hunting
/obj/effect/temporary_effect/pulse/snake/New(var/turf/T, var/atom/hunt_target, var/atom/Creator)
/obj/effect/temporary_effect/pulse/snake/Initialize(mapload, var/atom/hunt_target, var/atom/Creator)
. = ..()
if(hunt_target)
hunting = hunt_target
if(Creator)
creator = Creator
..()
/obj/effect/temporary_effect/pulse/snake/pulse_loop() // Override needed unfortunately to handle the possibility of not finding a target turf.
set waitfor = FALSE
code/game/objects/effects/spiders.dm
+9 -8
View File
@@ -104,9 +104,9 @@
START_PROCESSING(SSobj, src)
return ..()
/obj/effect/spider/eggcluster/New(var/location, var/atom/parent)
/obj/effect/spider/eggcluster/Initialize(mapload, var/atom/parent)
. = ..()
get_light_and_color(parent)
..()
/obj/effect/spider/eggcluster/Destroy()
STOP_PROCESSING(SSobj, src)
@@ -169,7 +169,8 @@
/mob/living/simple_mob/animal/giant_spider/webslinger, /mob/living/simple_mob/animal/giant_spider/phorogenic, /mob/living/simple_mob/animal/giant_spider/carrier,
/mob/living/simple_mob/animal/giant_spider/ion)
/obj/effect/spider/spiderling/New(var/location, var/atom/parent)
/obj/effect/spider/spiderling/Initialize(mapload, var/atom/parent)
. = ..()
pixel_x = rand(6,-6)
pixel_y = rand(6,-6)
START_PROCESSING(SSobj, src)
@@ -177,7 +178,6 @@
if(amount_grown != -1 && prob(50))
amount_grown = 1
get_light_and_color(parent)
..()
/obj/effect/spider/spiderling/Destroy()
STOP_PROCESSING(SSobj, src)
@@ -300,8 +300,8 @@
desc = "There's a special aura about this one."
grow_as = list(/mob/living/simple_mob/animal/giant_spider/nurse/queen)
/obj/effect/spider/spiderling/princess/New(var/location, var/atom/parent)
..()
/obj/effect/spider/spiderling/princess/Initialize(mapload, var/atom/parent)
. = ..()
amount_grown = 50
/obj/effect/decal/cleanable/spiderling_remains
@@ -316,8 +316,9 @@
icon_state = "cocoon1"
health = 60
/obj/effect/spider/cocoon/New()
icon_state = pick("cocoon1","cocoon2","cocoon3")
/obj/effect/spider/cocoon/Initialize(mapload)
. = ..()
icon_state = pick("cocoon1","cocoon2","cocoon3")
/obj/effect/spider/cocoon/Destroy()
src.visible_message(span_warning("\The [src] splits open."))
code/game/objects/items/devices/ai_detector.dm
+2 -2
View File
@@ -13,12 +13,12 @@
var/detect_state = PROXIMITY_NONE
origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2, TECH_ILLEGAL = 2)
/obj/item/multitool/ai_detector/New()
/obj/item/multitool/ai_detector/Initialize(mapload)
. = ..()
// It's really really unlikely for the view range to change. But why not be futureproof anyways?
range_alert = world.view
range_warning = world.view * 2
START_PROCESSING(SSobj, src)
..()
/obj/item/multitool/ai_detector/Destroy()
STOP_PROCESSING(SSobj, src)
code/game/objects/items/devices/defib.dm
+2 -2
View File
@@ -592,9 +592,9 @@
/obj/item/shockpaddles/linked
var/obj/item/defib_kit/base_unit
/obj/item/shockpaddles/linked/New(newloc, obj/item/defib_kit/defib)
/obj/item/shockpaddles/linked/Initialize(mapload, obj/item/defib_kit/defib)
. = ..()
base_unit = defib
..(newloc)
/obj/item/shockpaddles/linked/Destroy()
if(base_unit)
code/game/objects/items/devices/hacktool.dm
+2 -2
View File
@@ -17,8 +17,8 @@
max_level = 5
full_override = TRUE
/obj/item/multitool/hacktool/New()
..()
/obj/item/multitool/hacktool/Initialize(mapload)
. = ..()
known_targets = list()
max_known_targets = 5 + rand(1,3)
supported_types = list(/obj/machinery/door/airlock,/obj/structure/closet/crate/secure,/obj/structure/closet/secure_closet)
code/game/objects/items/devices/holowarrant.dm
+2 -2
View File
@@ -118,7 +118,7 @@
name = "holowarrant devices"
desc = "A box of holowarrant displays for security use."
/obj/item/storage/box/holowarrants/New()
..()
/obj/item/storage/box/holowarrants/Initialize(mapload)
. = ..()
for(var/i = 0 to 3)
new /obj/item/holowarrant(src) // VOREStation addition ends
code/game/objects/items/devices/personal_shield_generator_vr.dm
+4 -4
View File
@@ -44,8 +44,8 @@
/obj/item/personal_shield_generator/get_cell()
return bcell
/obj/item/personal_shield_generator/New()
..()
/obj/item/personal_shield_generator/Initialize(mapload)
. = ..()
if(ispath(bcell))
bcell = new bcell(src)
@@ -399,8 +399,8 @@
var/cooldown = 0
var/busy = 0
/obj/item/gun/energy/gun/generator/New(newloc, obj/item/personal_shield_generator/shield_gen)
..(newloc)
/obj/item/gun/energy/gun/generator/Initialize(mapload, obj/item/personal_shield_generator/shield_gen)
. = ..()
shield_generator = shield_gen
power_supply = shield_generator.bcell
code/game/objects/items/devices/pipe_painter.dm
+2 -2
View File
@@ -8,8 +8,8 @@
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
/obj/item/pipe_painter/New()
..()
/obj/item/pipe_painter/Initialize(mapload)
. = ..()
modes = new()
for(var/C in pipe_colors)
modes += "[C]"
code/game/objects/items/devices/scanners/health.dm
+2 -2
View File
@@ -21,10 +21,10 @@
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
/obj/item/healthanalyzer/New()
/obj/item/healthanalyzer/Initialize(mapload)
. = ..()
if(advscan >= 1)
verbs += /obj/item/healthanalyzer/proc/toggle_adv
..()
/obj/item/healthanalyzer/examine(mob/user)
. = ..()
code/game/objects/items/devices/translocator_vr.dm
+1 -4
View File
@@ -375,10 +375,7 @@ This device records all warnings given and teleport events for admin review in c
var/creator
var/warned_users = list()
var/tele_network = null
/obj/item/perfect_tele_beacon/New()
..()
flags |= NOBLUDGEON
flags = NOBLUDGEON
/obj/item/perfect_tele_beacon/Destroy()
tele_name = null
code/game/objects/items/devices/tvcamera.dm
+3 -3
View File
@@ -14,8 +14,8 @@
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
/obj/item/tvcamera/New()
..()
/obj/item/tvcamera/Initialize(mapload)
. = ..()
listening_objects += src
/obj/item/tvcamera/Destroy()
@@ -24,7 +24,7 @@
qdel(radio)
camera = null
radio = null
..()
. = ..()
/obj/item/tvcamera/examine()
. = ..()
code/game/objects/items/devices/uplink.dm
+2 -2
View File
@@ -226,8 +226,8 @@
if(hidden_uplink)
hidden_uplink.trigger(user)
/obj/item/multitool/uplink/New()
..()
/obj/item/multitool/uplink/Initialize(mapload)
. = ..()
hidden_uplink = new(src)
/obj/item/multitool/uplink/attack_self(mob/user as mob)
code/game/objects/items/robot/robot_parts.dm
+3 -6
View File
@@ -12,9 +12,6 @@
/obj/item/robot_parts/set_dir()
return
/obj/item/robot_parts/New(var/newloc, var/model)
..(newloc)
/obj/item/robot_parts/l_arm
name = "cyborg left arm"
desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
@@ -71,9 +68,9 @@
var/obj/item/robot_parts/head/head = null
var/created_name = ""
/obj/item/robot_parts/robot_suit/New()
..()
src.update_icon()
/obj/item/robot_parts/robot_suit/Initialize(mapload)
. = ..()
update_icon()
/obj/item/robot_parts/robot_suit/update_icon()
cut_overlays()
code/game/objects/items/toys/target_toy.dm
+2 -1
View File
@@ -8,5 +8,6 @@
/obj/item/paper/target
name = "target notice"
/obj/item/paper/target/New()
/obj/item/paper/target/Initialize(mapload, text, title)
. = ..()
info = "Your target is " + span_bold("[random_name(pick(MALE,FEMALE))]") + ". Make sure they don't get out of there alive."
code/game/objects/items/toys/toys_vr.dm
+6 -6
View File
@@ -709,8 +709,8 @@
var/bullets_left = 0
var/max_shots = 6
/obj/item/toy/russian_revolver/New()
..()
/obj/item/toy/russian_revolver/Initialize(mapload)
. = ..()
spin_cylinder()
/obj/item/toy/russian_revolver/attack_self(mob/user)
@@ -771,8 +771,8 @@
max_shots = 1
var/fake_bullets = 0
/obj/item/toy/russian_revolver/trick_revolver/New()
..()
/obj/item/toy/russian_revolver/trick_revolver/Initialize(mapload)
. = ..()
fake_bullets = rand(2, 7)
/obj/item/toy/russian_revolver/trick_revolver/examine(mob/user)
@@ -839,8 +839,8 @@
var/popped = 0
var/real = 0
/obj/item/toy/snake_popper/New()
..()
/obj/item/toy/snake_popper/Initialize(mapload)
. = ..()
if(prob(0.1))
real = 1
code/game/objects/items/trash.dm
+2 -5
View File
@@ -11,15 +11,12 @@
matter = list(MAT_STEEL = 30)
var/age = 0
/obj/item/trash/New(var/newloc, var/_age)
..(newloc)
/obj/item/trash/Initialize(mapload, var/_age)
. = ..()
if(!isnull(_age))
age = _age
/obj/item/trash/Initialize(mapload)
if(!mapload || !CONFIG_GET(flag/persistence_ignore_mapload))
SSpersistence.track_value(src, /datum/persistent/filth/trash)
. = ..()
/obj/item/trash/Destroy()
SSpersistence.forget_value(src, /datum/persistent/filth/trash)
code/game/objects/items/weapons/game_kit.dm
+3 -3
View File
@@ -3,9 +3,9 @@ CONTAINS:
THAT STUPID GAME KIT
*/
/obj/item/game_kit/New()
src.board_stat = "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"
src.selected = "CR"
/obj/item/game_kit
board_stat = "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"
selected = "CR"
/obj/item/game_kit/MouseDrop(mob/user as mob)
if (user == usr && !user.restrained() && !user.stat && (user.contents.Find(src) || in_range(src, user)))
code/game/objects/items/weapons/gift_wrappaper.dm
+2 -3
View File
@@ -16,15 +16,14 @@
drop_sound = 'sound/items/drop/cardboardbox.ogg'
pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
/obj/item/a_gift/New()
..()
/obj/item/a_gift/Initialize(mapload)
. = ..()
pixel_x = rand(-10,10)
pixel_y = rand(-10,10)
if(w_class > 0 && w_class < ITEMSIZE_LARGE)
icon_state = "gift[w_class]"
else
icon_state = "gift[pick(1, 2, 3)]"
return
/obj/item/gift/attack_self(mob/user as mob)
user.drop_item()
code/game/objects/items/weapons/grenades/confetti.dm
+4 -4
View File
@@ -9,10 +9,10 @@
var/datum/effect/effect/system/confetti_spread
var/confetti_strength = 8
/obj/item/grenade/confetti/New()
..()
src.confetti_spread = new /datum/effect/effect/system/confetti_spread()
src.confetti_spread.attach(src)
/obj/item/grenade/confetti/Initialize(mapload)
. = ..()
confetti_spread = new /datum/effect/effect/system/confetti_spread()
confetti_spread.attach(src)
/obj/item/grenade/confetti/Destroy()
qdel(confetti_spread)
code/game/objects/items/weapons/grenades/smokebomb.dm
+4 -4
View File
@@ -11,10 +11,10 @@
var/smoke_color
var/smoke_strength = 8
/obj/item/grenade/smokebomb/New()
..()
src.smoke = new /datum/effect/effect/system/smoke_spread/bad()
src.smoke.attach(src)
/obj/item/grenade/smokebomb/Initialize(mapload)
. = ..()
smoke = new /datum/effect/effect/system/smoke_spread/bad()
smoke.attach(src)
/obj/item/grenade/smokebomb/Destroy()
qdel(smoke)
code/game/objects/items/weapons/implants/implant.dm
+2 -2
View File
@@ -108,9 +108,9 @@ GLOBAL_LIST_BOILERPLATE(all_tracking_implants, /obj/item/implant/tracking)
/obj/item/implant/tracking/weak //This is for the loadout
degrade_time = 2.5 MINUTES
/obj/item/implant/tracking/New()
/obj/item/implant/tracking/Initialize(mapload, ...)
. = ..()
id = rand(1, 1000)
..()
/obj/item/implant/tracking/post_implant(var/mob/source)
START_PROCESSING(SSobj, src)
code/game/objects/items/weapons/implants/implantcircuits.dm
+3 -3
View File
@@ -8,15 +8,15 @@
/obj/item/implant/integrated_circuit/islegal()
return TRUE
/obj/item/implant/integrated_circuit/New()
..()
/obj/item/implant/integrated_circuit/Initialize(mapload)
. = ..()
IC = new(src)
IC.implant = src
/obj/item/implant/integrated_circuit/Destroy()
IC.implant = null
qdel(IC)
..()
. = ..()
/obj/item/implant/integrated_circuit/get_data()
var/dat = {"
code/game/objects/items/weapons/implants/implanter_vr.dm
+3 -4
View File
@@ -3,8 +3,7 @@
/obj/item/implanter/vrlanguage
name = "implanter-language"
/obj/item/implanter/vrlanguage/New()
src.imp = new /obj/item/implant/vrlanguage( src )
..()
/obj/item/implanter/vrlanguage/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/vrlanguage( src )
update()
return
code/game/objects/items/weapons/implants/implantuplink.dm
+2 -4
View File
@@ -3,13 +3,12 @@
desc = "Summon things."
var/activation_emote = "chuckle"
/obj/item/implant/uplink/New()
/obj/item/implant/uplink/Initialize(mapload)
activation_emote = pick("blink", "blink_r", "eyebrow", "chuckle", "twitch", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
hidden_uplink = new(src)
//hidden_uplink.uses = 5
//Code currently uses a mind var for telecrystals, balancing is currently an issue. Will investigate.
..()
return
. = ..()
/obj/item/implant/uplink/post_implant(mob/source)
var/choices = list("blink", "blink_r", "eyebrow", "chuckle", "twitch", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
@@ -22,4 +21,3 @@
/obj/item/implant/uplink/trigger(emote, mob/source as mob)
if(hidden_uplink && usr == source) // Let's not have another people activate our uplink
hidden_uplink.check_trigger(source, emote, activation_emote)
return
code/game/objects/items/weapons/manuals.dm
-9
View File
@@ -11,9 +11,6 @@
item_state = "book15"
author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
title = "Particle Accelerator User's Guide"
/obj/item/book/manual/engineering_particle_accelerator/New()
..()
dat = {"<html>
<head>
<style>
@@ -59,9 +56,6 @@
item_state = "book15"
author = "Central Engineering Division"
title = "Supermatter Engine Operating Manual"
/obj/item/book/manual/supermatter_engine/New()
..()
dat = {"<html>
<head>
<style>
@@ -215,9 +209,6 @@
item_state = "book15"
author = "Cindy Crawfish"
title = "R-UST Operating Manual"
/obj/item/book/manual/rust_engine/New()
..()
dat = {"<html>
<head>
<style>
code/game/objects/items/weapons/material/material_armor.dm
+2 -2
View File
@@ -35,8 +35,8 @@ Protectiveness | Armor %
var/material_slowdown_modifier = 0
var/material_slowdown_multiplier = 0.5
/obj/item/clothing/New(var/newloc, var/material_key)
..(newloc)
/obj/item/clothing/Initialize(mapload, var/material_key)
. = ..()
if(!material_key)
material_key = default_material
if(material_key) // May still be null if a material was not specified as a default.
code/game/objects/items/weapons/melee/energy.dm
+15 -15
View File
@@ -24,23 +24,23 @@
slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi',
)
/obj/item/melee/energy/sword/green/New()
/obj/item/melee/energy/sword/green
colorable = FALSE
lcolor = "#008000"
/obj/item/melee/energy/sword/red/New()
/obj/item/melee/energy/sword/red
colorable = FALSE
lcolor = "#FF0000"
/obj/item/melee/energy/sword/blue/New()
/obj/item/melee/energy/sword/blue
colorable = FALSE
lcolor = "#0000FF"
/obj/item/melee/energy/sword/purple/New()
/obj/item/melee/energy/sword/purple
colorable = FALSE
lcolor = "#800080"
/obj/item/melee/energy/sword/white/New()
/obj/item/melee/energy/sword/white
colorable = FALSE
lcolor = "#FFFFFF"
@@ -250,8 +250,8 @@
use_cell = TRUE
hitcost = 120
/obj/item/melee/energy/axe/charge/loaded/New()
..()
/obj/item/melee/energy/axe/charge/loaded/Initialize(mapload)
. = ..()
bcell = new/obj/item/cell/device/weapon(src)
/*
@@ -410,8 +410,8 @@
hitcost = 75
/obj/item/melee/energy/sword/charge/loaded/New()
..()
/obj/item/melee/energy/sword/charge/loaded/Initialize(mapload)
. = ..()
bcell = new/obj/item/cell/device/weapon(src)
//Energy Blade (ninja uses this)
@@ -438,8 +438,8 @@
projectile_parry_chance = 60
lcolor = "#00FF00"
/obj/item/melee/energy/blade/New()
/obj/item/melee/energy/blade/Initialize(mapload)
. = ..()
spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, src)
spark_system.attach(src)
@@ -449,15 +449,15 @@
/obj/item/melee/energy/blade/Destroy()
STOP_PROCESSING(SSobj, src)
..()
. = ..()
/obj/item/melee/energy/blade/attack_self(mob/user as mob)
user.drop_from_inventory(src)
spawn(1) if(src) qdel(src)
QDEL_IN(src, 1)
/obj/item/melee/energy/blade/dropped(mob/user)
..()
spawn(1) if(src) qdel(src)
QDEL_IN(src, 1)
/obj/item/melee/energy/blade/process()
if(!creator || loc != creator || !creator.item_is_in_hands(src))
@@ -472,7 +472,7 @@
host.pinned -= src
host.embedded -= src
host.drop_from_inventory(src)
spawn(1) if(src) qdel(src)
QDEL_IN(src, 1)
/obj/item/melee/energy/blade/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
if(default_parry_check(user, attacker, damage_source) && prob(60))
code/game/objects/items/weapons/stunbaton.dm
+4 -7
View File
@@ -24,10 +24,9 @@
var/grip_safety = TRUE
var/taped_safety = FALSE
/obj/item/melee/baton/New()
..()
/obj/item/melee/baton/Initialize(mapload)
. = ..()
update_icon()
return
/obj/item/melee/baton/get_cell()
return bcell
@@ -64,11 +63,9 @@
usr.put_in_l_hand(src)
src.add_fingerprint(usr)
/obj/item/melee/baton/loaded/New() //this one starts with a cell pre-installed.
..()
/obj/item/melee/baton/loaded/Initialize(mapload) //this one starts with a cell pre-installed.
bcell = new/obj/item/cell/device/weapon(src)
update_icon()
return
. = ..()
/obj/item/melee/baton/proc/deductcharge()
if(status == 1) //Only deducts charge when it's on
code/game/objects/items/weapons/tanks/tanks.dm
+14 -18
View File
@@ -563,30 +563,26 @@ var/list/global/tank_gauge_cache = list()
add_overlay("bomb_assembly")
/obj/item/tank/phoron/onetankbomb/New()
..()
src.onetankbomb()
/obj/item/tank/phoron/onetankbomb/Initialize(mapload, var/amount = 1)
. = ..()
onetankbomb(amount)
/obj/item/tank/oxygen/onetankbomb/New()
..()
src.onetankbomb()
/obj/item/tank/oxygen/onetankbomb/Initialize(mapload, var/amount = 1)
. = ..()
onetankbomb(amount)
/obj/item/tank/phoron/onetankbomb/full/New()
..()
src.onetankbomb(2)
/obj/item/tank/phoron/onetankbomb/full/Initialize(mapload)
. = ..(mapload, 2)
/obj/item/tank/oxygen/onetankbomb/full/New()
..()
src.onetankbomb(2)
/obj/item/tank/oxygen/onetankbomb/full/Initialize(mapload)
. = ..(mapload, 2)
/obj/item/tank/phoron/onetankbomb/small/New()
..()
src.onetankbomb(0)
/obj/item/tank/phoron/onetankbomb/small/Initialize(mapload)
. = ..(mapload, 0)
/obj/item/tank/oxygen/onetankbomb/small/New()
..()
src.onetankbomb(0)
/obj/item/tank/oxygen/onetankbomb/small/Initialize(mapload)
. = ..(mapload, 0)
/////////////////////////////////
///Pulled from rewritten bomb.dm
code/game/objects/items/weapons/tools/transforming.dm
+2 -2
View File
@@ -6,8 +6,8 @@
var/obj/item/weldingtool/welder
var/weldertype = /obj/item/weldingtool/dummy
/obj/item/tool/transforming/New(newloc, no_counterpart = TRUE)
..(newloc)
/obj/item/tool/transforming/Initialize(mapload, no_counterpart = TRUE)
. = ..()
if(TOOL_WELDER in possible_tooltypes)
welder = new weldertype(src)
on_tool_switch()
code/game/objects/items/weapons/weaponry.dm
+2 -2
View File
@@ -101,8 +101,8 @@
var/escape_time = 8 SECONDS
/obj/effect/energy_net/New()
..()
/obj/effect/energy_net/Initialize(mapload)
. = ..()
START_PROCESSING(SSobj, src)
/obj/effect/energy_net/Destroy()
code/game/objects/structures/bonfire.dm
+9 -10
View File
@@ -13,26 +13,25 @@
var/set_temperature = T0C + 30 //K
var/heating_power = 80000
/obj/structure/bonfire/New(newloc, material_name)
..(newloc)
/obj/structure/bonfire/Initialize(mapload, material_name)
. = ..()
if(!material_name)
material_name = MAT_WOOD
material = get_material_by_name("[material_name]")
if(!material)
qdel(src)
return
return INITIALIZE_HINT_QDEL
color = material.icon_colour
// Blue wood.
/obj/structure/bonfire/sifwood/New(newloc, material_name)
..(newloc, MAT_SIFWOOD)
/obj/structure/bonfire/sifwood/Initialize(mapload, material_name)
. = ..(mapload, MAT_SIFWOOD)
/obj/structure/bonfire/permanent/New(newloc, material_name)
..()
/obj/structure/bonfire/permanent/Initialize(mapload, material_name)
. = ..()
ignite()
/obj/structure/bonfire/permanent/sifwood/New(newloc, material_name)
..(newloc, MAT_SIFWOOD)
/obj/structure/bonfire/permanent/sifwood/Initialize(mapload, material_name)
. = ..(mapload, MAT_SIFWOOD)
/obj/structure/bonfire/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/stack/rods) && !can_buckle && !grill)
code/game/objects/structures/crates_lockers/closets/utility_closets_vr.dm
+1 -1
View File
@@ -2,6 +2,6 @@
starts_with += /obj/item/storage/toolbox/emergency
return ..()
/obj/structure/closet/hydrant/New()
/obj/structure/closet/hydrant/Initialize(mapload)
starts_with += /obj/item/storage/toolbox/emergency
return ..()
code/game/objects/structures/door_assembly.dm
+4 -3
View File
@@ -14,7 +14,8 @@
var/glass = 0 // 0 = glass can be installed. -1 = glass can't be installed. 1 = glass is already installed. Text = mineral plating is installed instead.
var/created_name = null
/obj/structure/door_assembly/New()
/obj/structure/door_assembly/Initialize(mapload)
. = ..()
update_state()
/obj/structure/door_assembly/door_assembly_com
@@ -136,14 +137,14 @@
airlock_type = "/multi_tile/glass"
glass = -1 //To prevent bugs in deconstruction process.
/obj/structure/door_assembly/multi_tile/New()
/obj/structure/door_assembly/multi_tile/Initialize(mapload)
if(dir in list(EAST, WEST))
bound_width = width * world.icon_size
bound_height = world.icon_size
else
bound_width = world.icon_size
bound_height = width * world.icon_size
update_state()
. = ..()
/obj/structure/door_assembly/multi_tile/Moved(atom/old_loc, direction, forced = FALSE)
. = ..()
code/game/objects/structures/flora/flora.dm
+37 -47
View File
@@ -103,8 +103,8 @@
harvest_loot = list(/obj/item/stack/material/fiber = 1)
max_harvests = 1
/obj/structure/flora/bush/New()
..()
/obj/structure/flora/bush/Initialize(mapload)
. = ..()
icon_state = "snowbush[rand(1, 6)]"
/obj/structure/flora/pottedplant
@@ -152,114 +152,104 @@
var/choice = pickweight(possibleseeds)
new choice(get_turf(user))
/obj/structure/flora/ausbushes/New()
..()
/obj/structure/flora/ausbushes/Initialize(mapload, var/bush_icon)
. = ..()
if(bush_icon)
icon_state = bush_icon
return
icon_state = "firstbush_[rand(1, 4)]"
/obj/structure/flora/ausbushes/reedbush
icon_state = "reedbush_1"
/obj/structure/flora/ausbushes/reedbush/New()
..()
icon_state = "reedbush_[rand(1, 4)]"
/obj/structure/flora/ausbushes/reedbush/Initialize(mapload)
. = ..(mapload, "reedbush_[rand(1, 4)]")
/obj/structure/flora/ausbushes/leafybush
icon_state = "leafybush_1"
/obj/structure/flora/ausbushes/leafybush/New()
..()
icon_state = "leafybush_[rand(1, 3)]"
/obj/structure/flora/ausbushes/leafybush/Initialize(mapload)
. = ..(mapload, "leafybush_[rand(1, 3)]")
/obj/structure/flora/ausbushes/palebush
icon_state = "palebush_1"
/obj/structure/flora/ausbushes/palebush/New()
..()
icon_state = "palebush_[rand(1, 4)]"
/obj/structure/flora/ausbushes/palebush/Initialize(mapload)
. = ..(mapload, "palebush_[rand(1, 4)]")
/obj/structure/flora/ausbushes/stalkybush
icon_state = "stalkybush_1"
/obj/structure/flora/ausbushes/stalkybush/New()
..()
icon_state = "stalkybush_[rand(1, 3)]"
/obj/structure/flora/ausbushes/stalkybush/Initialize(mapload)
. = ..(mapload, "stalkybush_[rand(1, 3)]")
/obj/structure/flora/ausbushes/grassybush
icon_state = "grassybush_1"
/obj/structure/flora/ausbushes/grassybush/New()
..()
icon_state = "grassybush_[rand(1, 4)]"
/obj/structure/flora/ausbushes/grassybush/Initialize(mapload)
. = ..(mapload, "grassybush_[rand(1, 4)]")
/obj/structure/flora/ausbushes/fernybush
icon_state = "fernybush_1"
/obj/structure/flora/ausbushes/fernybush/New()
..()
icon_state = "fernybush_[rand(1, 3)]"
/obj/structure/flora/ausbushes/fernybush/Initialize(mapload)
. = ..(mapload, "fernybush_[rand(1, 3)]")
/obj/structure/flora/ausbushes/sunnybush
icon_state = "sunnybush_1"
/obj/structure/flora/ausbushes/sunnybush/New()
..()
/obj/structure/flora/ausbushes/sunnybush/Initialize(mapload)
. = ..(mapload, )
icon_state = "sunnybush_[rand(1, 3)]"
/obj/structure/flora/ausbushes/genericbush
icon_state = "genericbush_1"
/obj/structure/flora/ausbushes/genericbush/New()
..()
/obj/structure/flora/ausbushes/genericbush/Initialize(mapload)
. = ..(mapload, )
icon_state = "genericbush_[rand(1, 4)]"
/obj/structure/flora/ausbushes/pointybush
icon_state = "pointybush_1"
/obj/structure/flora/ausbushes/pointybush/New()
..()
icon_state = "pointybush_[rand(1, 4)]"
/obj/structure/flora/ausbushes/pointybush/Initialize(mapload)
. = ..(mapload, "pointybush_[rand(1, 4)]")
/obj/structure/flora/ausbushes/lavendergrass
icon_state = "lavendergrass_1"
/obj/structure/flora/ausbushes/lavendergrass/New()
..()
icon_state = "lavendergrass_[rand(1, 4)]"
/obj/structure/flora/ausbushes/lavendergrass/Initialize(mapload)
. = ..(mapload, "lavendergrass_[rand(1, 4)]")
/obj/structure/flora/ausbushes/ywflowers
icon_state = "ywflowers_1"
/obj/structure/flora/ausbushes/ywflowers/New()
..()
icon_state = "ywflowers_[rand(1, 3)]"
/obj/structure/flora/ausbushes/ywflowers/Initialize(mapload)
. = ..(mapload, "ywflowers_[rand(1, 3)]")
/obj/structure/flora/ausbushes/brflowers
icon_state = "brflowers_1"
/obj/structure/flora/ausbushes/brflowers/New()
..()
icon_state = "brflowers_[rand(1, 3)]"
/obj/structure/flora/ausbushes/brflowers/Initialize(mapload)
. = ..(mapload, "brflowers_[rand(1, 3)]")
/obj/structure/flora/ausbushes/ppflowers
icon_state = "ppflowers_1"
/obj/structure/flora/ausbushes/ppflowers/New()
..()
icon_state = "ppflowers_[rand(1, 3)]"
/obj/structure/flora/ausbushes/ppflowers/Initialize(mapload)
. = ..(mapload, "ppflowers_[rand(1, 3)]")
/obj/structure/flora/ausbushes/sparsegrass
icon_state = "sparsegrass_1"
/obj/structure/flora/ausbushes/sparsegrass/New()
..()
icon_state = "sparsegrass_[rand(1, 3)]"
/obj/structure/flora/ausbushes/sparsegrass/Initialize(mapload)
. = ..(mapload, "sparsegrass_[rand(1, 3)]")
/obj/structure/flora/ausbushes/fullgrass
icon_state = "fullgrass_1"
/obj/structure/flora/ausbushes/fullgrass/New()
..()
icon_state = "fullgrass_[rand(1, 3)]"
/obj/structure/flora/ausbushes/fullgrass/Initialize(mapload)
. = ..(mapload, "fullgrass_[rand(1, 3)]")
/obj/structure/flora/skeleton
name = "hanging skeleton model"
code/game/objects/structures/flora/flora_vr.dm
+3 -2
View File
@@ -10,7 +10,8 @@
icon = 'icons/obj/flora/pumpkins.dmi'
icon_state = "spawner-jackolantern"
/obj/effect/landmark/carved_pumpkin_spawn/New()
/obj/effect/landmark/carved_pumpkin_spawn/Initialize(mapload)
..()
var/new_pumpkin = pick(
prob(70);/obj/structure/flora/pumpkin,
prob(60);/obj/structure/flora/pumpkin/carved,
@@ -18,7 +19,7 @@
prob(30);/obj/structure/flora/pumpkin/carved/girly,
prob(10);/obj/structure/flora/pumpkin/carved/owo)
new new_pumpkin(src.loc)
..()
return INITIALIZE_HINT_QDEL
/obj/structure/flora/pumpkin/carved
name = "jack o'lantern"
code/game/objects/structures/flora/grass.dm
+10 -9
View File
@@ -4,23 +4,24 @@
icon = 'icons/obj/flora/snowflora.dmi'
anchored = TRUE
/obj/structure/flora/grass/Initialize(mapload, var/grass_icon)
. = ..()
icon_state = grass_icon
/obj/structure/flora/grass/brown
icon_state = "snowgrass1bb"
/obj/structure/flora/grass/brown/New()
..()
icon_state = "snowgrass[rand(1, 3)]bb"
/obj/structure/flora/grass/brown/Initialize(mapload)
. = ..(mapload, "snowgrass[rand(1, 3)]bb")
/obj/structure/flora/grass/green
icon_state = "snowgrass1gb"
/obj/structure/flora/grass/green/New()
..()
icon_state = "snowgrass[rand(1, 3)]gb"
/obj/structure/flora/grass/green/Initialize(mapload)
. = ..(mapload, "snowgrass[rand(1, 3)]gb")
/obj/structure/flora/grass/both
icon_state = "snowgrassall1"
/obj/structure/flora/grass/both/New()
..()
icon_state = "snowgrassall[rand(1, 3)]"
/obj/structure/flora/grass/both/Initialize(mapload)
. = ..(mapload, "snowgrassall[rand(1, 3)]")
code/game/objects/structures/grille.dm
+2 -2
View File
@@ -225,8 +225,8 @@
icon_state = "grille-b"
density = FALSE
/obj/structure/grille/broken/New()
..()
/obj/structure/grille/broken/Initialize(mapload)
. = ..()
health = rand(-5, -1) //In the destroyed but not utterly threshold.
healthcheck() //Send this to healthcheck just in case we want to do something else with it.
code/game/objects/structures/inflatable.dm
+2 -2
View File
@@ -34,8 +34,8 @@
var/health = 50.0
/obj/structure/inflatable/New(location)
..()
/obj/structure/inflatable/Initialize(mapload)
. = ..()
update_nearby_tiles(need_rebuild=1)
/obj/structure/inflatable/Destroy()
code/game/objects/structures/medical_stand_vr.dm
+2 -2
View File
@@ -21,8 +21,8 @@
var/list/transfer_amounts = list(REM, 1, 2)
var/transfer_amount = 1
/obj/structure/medical_stand/New()
..()
/obj/structure/medical_stand/Initialize(mapload)
. = ..()
if (spawn_type)
tank = new spawn_type (src)
contained = new mask_type (src)
code/game/objects/structures/mop_bucket.dm
+2 -2
View File
@@ -12,9 +12,9 @@
GLOBAL_LIST_BOILERPLATE(all_mopbuckets, /obj/structure/mopbucket)
/obj/structure/mopbucket/New()
/obj/structure/mopbucket/Initialize(mapload, ...)
create_reagents(300)
..()
. = ..()
/obj/structure/mopbucket/examine(mob/user)
. = ..()
code/game/objects/structures/props/statue.dm
+2 -1
View File
@@ -60,7 +60,8 @@
layer = ABOVE_WINDOW_LAYER
interaction_message = span_notice("Cool to touch and unbelievable smooth. You can almost see your reflection in it.")
/obj/structure/prop/statue/phoron/New()
/obj/structure/prop/statue/phoron/Initialize(mapload)
. = ..()
set_light(2, 3, "#cc66ff")
/obj/structure/prop/statue/pillar
code/game/objects/structures/transit_tubes.dm
+5 -12
View File
@@ -78,20 +78,19 @@
/obj/structure/transit_tube_pod/New(loc)
..(loc)
/obj/structure/transit_tube_pod/Initialize(mapload)
. = ..()
air_contents.adjust_multi(GAS_O2, MOLES_O2STANDARD * 2, GAS_N2, MOLES_N2STANDARD)
air_contents.temperature = T20C
// Give auto tubes time to align before trying to start moving
spawn(5)
follow_tube()
follow_tube()
/obj/structure/transit_tube/New(loc)
..(loc)
/obj/structure/transit_tube/Initialize(mapload)
. = ..()
if(tube_dirs == null)
init_dirs()
@@ -107,12 +106,6 @@
AM.loc = src.loc
to_chat(AM, span_info("You slip under the tube."))
/obj/structure/transit_tube/station/New(loc)
..(loc)
/obj/structure/transit_tube/station/Bumped(mob/AM as mob|obj)
if(!pod_moving && icon_state == "open" && istype(AM, /mob))
for(var/obj/structure/transit_tube_pod/pod in loc)
code/game/objects/structures/trash_pile_vr.dm
+2 -2
View File
@@ -357,8 +357,8 @@
destructible = 1
spawn_delay = 1 HOUR
/obj/structure/mob_spawner/mouse_nest/New()
..()
/obj/structure/mob_spawner/mouse_nest/Initialize(mapload)
. = ..()
last_spawn = rand(world.time - spawn_delay, world.time)
icon_state = pick(
"pile1",
code/game/objects/structures/watercloset.dm
+2 -1
View File
@@ -12,7 +12,8 @@
var/w_items = 0 //the combined w_class of all the items in the cistern
var/mob/living/swirlie = null //the mob being given a swirlie
/obj/structure/toilet/New()
/obj/structure/toilet/Initialize(mapload)
. = ..()
open = round(rand(0, 1))
update_icon()