mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-28 22:48:38 +01:00
next new to init (#17400)
* next new to init * . * this needs thorough testing * . * needs an istype * also vnotice * mvoe to defines
This commit is contained in:
@@ -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)))
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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 = {"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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))
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user