mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 02:09:41 +00:00
[MIRROR] next new to init (#10524)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
9156a08bf0
commit
55d696e503
@@ -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
|
||||
|
||||
|
||||
@@ -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,8 +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)
|
||||
@@ -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 = 15
|
||||
|
||||
/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."))
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -593,9 +593,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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -402,8 +402,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
|
||||
|
||||
|
||||
@@ -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]"
|
||||
|
||||
@@ -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)
|
||||
. = ..()
|
||||
|
||||
@@ -376,10 +376,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
|
||||
|
||||
@@ -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()
|
||||
. = ..()
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -718,8 +718,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)
|
||||
@@ -780,8 +780,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)
|
||||
@@ -848,8 +848,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
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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,7 @@
|
||||
item_state = "book15"
|
||||
author = "Central Engineering Division"
|
||||
title = "Supermatter Engine Operating Manual"
|
||||
|
||||
/obj/item/book/manual/supermatter_engine/New()
|
||||
..() //CHOMPEdit Start - Updated Supermatter Engine Manual
|
||||
//CHOMPEdit Start - Updated Supermatter Engine Manual
|
||||
dat = {"<html>
|
||||
<head>
|
||||
<style>
|
||||
@@ -216,10 +211,7 @@
|
||||
item_state = "book15"
|
||||
author = "Central Engineering Division"
|
||||
title = "R-UST Operating Manual"
|
||||
|
||||
//R-UST guide Re-Writen by Gozulio to reflect how the R-UST actually operates. (CHOMPedit, re-written again :3 By Foxglove)
|
||||
/obj/item/book/manual/rust_engine/New()
|
||||
..()
|
||||
//R-UST guide Re-Writen by Gozulio to reflect how the R-UST actually operates. (CHOMPedit, re-written again :3 By Foxglove)
|
||||
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()
|
||||
|
||||
@@ -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)
|
||||
|
||||
//CHOMPStation Addition Start
|
||||
/obj/structure/bonfire/examine(mob/user)
|
||||
|
||||
@@ -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 ..()
|
||||
|
||||
@@ -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)
|
||||
. = ..()
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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)]")
|
||||
|
||||
@@ -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.
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
. = ..()
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -369,8 +369,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",
|
||||
|
||||
@@ -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()
|
||||
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
var/mob/living/carbon/human/watchowner = null
|
||||
|
||||
|
||||
/obj/item/deadringer/New()
|
||||
..()
|
||||
/obj/item/deadringer/Initialize(mapload)
|
||||
. = ..()
|
||||
START_PROCESSING(SSobj, src)
|
||||
|
||||
/obj/item/deadringer/Destroy() //just in case some smartass tries to stay invisible by destroying the watch
|
||||
reveal()
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/deadringer/dropped(mob/user)
|
||||
..()
|
||||
|
||||
@@ -4,12 +4,10 @@
|
||||
/obj/item/implanter/exile
|
||||
name = "implanter-exile"
|
||||
|
||||
/obj/item/implanter/exile/New()
|
||||
src.imp = new /obj/item/implant/exile( src )
|
||||
..()
|
||||
/obj/item/implanter/exile/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/exile(src)
|
||||
update()
|
||||
return
|
||||
|
||||
|
||||
/obj/item/implant/exile
|
||||
name = "exile"
|
||||
@@ -29,10 +27,9 @@
|
||||
icon_state = "implantcase-r"
|
||||
|
||||
|
||||
/obj/item/implantcase/exile/New()
|
||||
src.imp = new /obj/item/implant/exile( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/exile/Initialize(mapload)
|
||||
. = ..()
|
||||
src.imp = new /obj/item/implant/exile(src)
|
||||
|
||||
|
||||
/obj/structure/closet/secure_closet/exile
|
||||
|
||||
@@ -17,10 +17,10 @@
|
||||
var/fire_resist = 1
|
||||
var/expandType = /obj/effect/blob
|
||||
|
||||
/obj/effect/blob/New(loc)
|
||||
/obj/effect/blob/Initialize(mapload)
|
||||
. = ..()
|
||||
health = maxHealth
|
||||
update_icon()
|
||||
return ..(loc)
|
||||
|
||||
/obj/effect/blob/CanPass(var/atom/movable/mover, var/turf/target)
|
||||
return FALSE
|
||||
@@ -164,9 +164,9 @@
|
||||
/obj/effect/blob/core/update_icon()
|
||||
return
|
||||
|
||||
/obj/effect/blob/core/New(loc)
|
||||
/obj/effect/blob/core/Initialize(mapload)
|
||||
. = ..()
|
||||
START_PROCESSING(SSobj, src)
|
||||
return ..(loc)
|
||||
|
||||
/obj/effect/blob/core/Destroy()
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
@@ -188,8 +188,8 @@
|
||||
brute_resist = 1
|
||||
fire_resist = 2
|
||||
|
||||
/obj/effect/blob/shield/New()
|
||||
..()
|
||||
/obj/effect/blob/shield/Initialize(mapload)
|
||||
. = ..()
|
||||
update_nearby_tiles()
|
||||
|
||||
/obj/effect/blob/shield/Destroy()
|
||||
|
||||
@@ -119,13 +119,13 @@
|
||||
|
||||
/datum/category_item/player_setup_item/vore/size/OnTopic(var/href, var/list/href_list, var/mob/user)
|
||||
if(href_list["size_multiplier"])
|
||||
var/new_size = tgui_input_number(user, "Choose your character's size, ranging from 25% to 200%", "Set Size", pref.size_multiplier*100, 200, 25)
|
||||
if (!ISINRANGE(new_size,25,200))
|
||||
var/new_size = tgui_input_number(user, "Choose your character's size, ranging from [RESIZE_MINIMUM * 100]% to [RESIZE_MAXIMUM * 100]%", "Set Size", pref.size_multiplier * 100, RESIZE_MAXIMUM * 100, RESIZE_MINIMUM * 100)
|
||||
if (!ISINRANGE(new_size, RESIZE_MINIMUM * 100, RESIZE_MAXIMUM * 100))
|
||||
pref.size_multiplier = 1
|
||||
to_chat(user, span_notice("Invalid size."))
|
||||
return TOPIC_REFRESH_UPDATE_PREVIEW
|
||||
else if(new_size)
|
||||
pref.size_multiplier = (new_size/100)
|
||||
pref.size_multiplier = (new_size / 100)
|
||||
return TOPIC_REFRESH_UPDATE_PREVIEW
|
||||
|
||||
else if(href_list["toggle_fuzzy"])
|
||||
|
||||
@@ -92,9 +92,9 @@ var/list/spawntypes = list()
|
||||
name = "JoinLateShuttle"
|
||||
delete_me = 1
|
||||
|
||||
/obj/effect/landmark/arrivals/New()
|
||||
/obj/effect/landmark/arrivals/Initialize(mapload)
|
||||
latejoin += loc
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
var/global/list/latejoin_tram = list()
|
||||
|
||||
@@ -102,9 +102,9 @@ var/global/list/latejoin_tram = list()
|
||||
name = "JoinLateTram"
|
||||
delete_me = 1
|
||||
|
||||
/obj/effect/landmark/tram/New()
|
||||
/obj/effect/landmark/tram/Initialize(mapload)
|
||||
latejoin_tram += loc // There's no tram but you know whatever man!
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/datum/spawnpoint/tram
|
||||
display_name = "Tram Station"
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
var/burn_damage = 0 // Specifically burn damage.
|
||||
var/base_name // Used to keep the original name safe while we apply modifiers.
|
||||
|
||||
/obj/item/clothing/suit/space/New()
|
||||
..()
|
||||
/obj/item/clothing/suit/space/Initialize(mapload)
|
||||
. = ..()
|
||||
base_name = "[name]"
|
||||
|
||||
//Some simple descriptors for breaches. Global because lazy, TODO: work out a better way to do this.
|
||||
|
||||
@@ -15,7 +15,8 @@
|
||||
drop_sound = 'sound/items/drop/ring.ogg'
|
||||
pickup_sound = 'sound/items/pickup/ring.ogg'
|
||||
|
||||
/obj/item/aliencoin/New()
|
||||
/obj/item/aliencoin/Initialize(mapload)
|
||||
. = ..()
|
||||
randpixel_xy()
|
||||
|
||||
/obj/item/aliencoin/basic
|
||||
|
||||
@@ -11,7 +11,8 @@
|
||||
var/tamper_proof = FALSE //Set to TRUE if the die needs to be unable to be weighted, such as for events
|
||||
attack_verb = list("diced")
|
||||
|
||||
/obj/item/dice/New()
|
||||
/obj/item/dice/Initialize(mapload)
|
||||
. = ..()
|
||||
icon_state = "[name][rand(1,sides)]"
|
||||
|
||||
/obj/item/dice/attackby(obj/item/W, mob/user)
|
||||
@@ -126,10 +127,10 @@
|
||||
drop_sound = 'sound/items/drop/hat.ogg'
|
||||
pickup_sound = 'sound/items/pickup/hat.ogg'
|
||||
|
||||
/obj/item/storage/pill_bottle/dice/New()
|
||||
..()
|
||||
/obj/item/storage/pill_bottle/dice/Initialize(mapload)
|
||||
. = ..()
|
||||
for(var/i = 1 to 7)
|
||||
new /obj/item/dice( src )
|
||||
new /obj/item/dice(src)
|
||||
|
||||
/obj/item/storage/pill_bottle/dice_nerd //DnD dice
|
||||
name = "bag of gaming dice"
|
||||
@@ -139,15 +140,15 @@
|
||||
drop_sound = 'sound/items/drop/hat.ogg'
|
||||
pickup_sound = 'sound/items/pickup/hat.ogg'
|
||||
|
||||
/obj/item/storage/pill_bottle/dice_nerd/New()
|
||||
..()
|
||||
new /obj/item/dice/d4( src )
|
||||
new /obj/item/dice( src )
|
||||
new /obj/item/dice/d8( src )
|
||||
new /obj/item/dice/d10( src )
|
||||
new /obj/item/dice/d12( src )
|
||||
new /obj/item/dice/d20( src )
|
||||
new /obj/item/dice/d100( src )
|
||||
/obj/item/storage/pill_bottle/dice_nerd/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/dice/d4(src)
|
||||
new /obj/item/dice(src)
|
||||
new /obj/item/dice/d8(src)
|
||||
new /obj/item/dice/d10(src)
|
||||
new /obj/item/dice/d12(src)
|
||||
new /obj/item/dice/d20(src)
|
||||
new /obj/item/dice/d100(src)
|
||||
|
||||
/*
|
||||
*Liar's Dice cup
|
||||
@@ -198,7 +199,7 @@
|
||||
revealDice(player)
|
||||
|
||||
|
||||
/obj/item/storage/dicecup/loaded/New()
|
||||
..()
|
||||
/obj/item/storage/dicecup/loaded/Initialize(mapload)
|
||||
. = ..()
|
||||
for(var/i = 1 to 5)
|
||||
new /obj/item/dice( src )
|
||||
new /obj/item/dice(src)
|
||||
|
||||
@@ -184,8 +184,8 @@
|
||||
power_draw_per_use = 20
|
||||
var/list/sounds = list()
|
||||
|
||||
/obj/item/integrated_circuit/output/sound/New()
|
||||
..()
|
||||
/obj/item/integrated_circuit/output/sound/Initialize(mapload)
|
||||
. = ..()
|
||||
extended_desc = list()
|
||||
extended_desc += "The first input pin determines which sound is used. The choices are; "
|
||||
extended_desc += jointext(sounds, ", ")
|
||||
|
||||
@@ -92,12 +92,9 @@ var/static/list/fake_sunlight_zs = list()
|
||||
var/weather_visuals_icon = 'icons/effects/weather.dmi'
|
||||
var/weather_visuals_icon_state = null
|
||||
|
||||
/obj/effect/fake_sun/New(loc, ...)
|
||||
/obj/effect/fake_sun/Initialize(mapload)
|
||||
. = ..()
|
||||
world_suns += src
|
||||
|
||||
/obj/effect/fake_sun/Initialize(mapload)
|
||||
..()
|
||||
if(!advanced_lighting)
|
||||
return INITIALIZE_HINT_LATELOAD
|
||||
do_sun = FALSE
|
||||
|
||||
@@ -105,9 +105,10 @@ GLOBAL_DATUM_INIT(mhelp_tickets, /datum/mentor_help_tickets, new)
|
||||
/obj/effect/statclick/mticket_list
|
||||
var/current_state
|
||||
|
||||
/obj/effect/statclick/mticket_list/New(loc, name, state)
|
||||
INITIALIZE_IMMEDIATE(/obj/effect/statclick/mticket_list)
|
||||
/obj/effect/statclick/mticket_list/Initialize(mapload, name, state)
|
||||
. = ..()
|
||||
current_state = state
|
||||
..()
|
||||
|
||||
/obj/effect/statclick/mticket_list/Click()
|
||||
GLOB.mhelp_tickets.BrowseTickets(current_state)
|
||||
@@ -398,9 +399,10 @@ GLOBAL_DATUM_INIT(mhelp_tickets, /datum/mentor_help_tickets, new)
|
||||
/obj/effect/statclick/mhelp
|
||||
var/datum/mentor_help/mhelp_datum
|
||||
|
||||
/obj/effect/statclick/mhelp/New(loc, datum/mentor_help/MH)
|
||||
INITIALIZE_IMMEDIATE(/obj/effect/statclick/mhelp)
|
||||
/obj/effect/statclick/mhelp/Initialize(mapload, datum/mentor_help/MH)
|
||||
mhelp_datum = MH
|
||||
..(loc)
|
||||
. = ..()
|
||||
|
||||
/obj/effect/statclick/mhelp/update()
|
||||
return ..(mhelp_datum.name)
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
var/codelen = 4
|
||||
locked = 1
|
||||
|
||||
/obj/structure/closet/crate/secure/loot/New()
|
||||
..()
|
||||
/obj/structure/closet/crate/secure/loot/Initialize(mapload)
|
||||
. = ..()
|
||||
var/list/digits = list("1", "2", "3", "4", "5", "6", "7", "8", "9", "0")
|
||||
|
||||
for(var/i in 1 to codelen)
|
||||
|
||||
@@ -678,7 +678,7 @@ var/list/mining_overlay_cache = list()
|
||||
if(is_clean)
|
||||
X = new /obj/item/archaeological_find(src, F.find_type)
|
||||
else
|
||||
X = new /obj/item/strangerock(src, inside_item_type = F.find_type)
|
||||
X = new /obj/item/strangerock(src, F.find_type)
|
||||
geologic_data.UpdateNearbyArtifactInfo(src)
|
||||
var/obj/item/strangerock/SR = X
|
||||
SR.geologic_data = geologic_data
|
||||
|
||||
@@ -209,11 +209,11 @@ GLOBAL_LIST_EMPTY(unique_deployable)
|
||||
/obj/structure/table/survival_pod/update_icon()
|
||||
icon_state = "table"
|
||||
|
||||
/obj/structure/table/survival_pod/New()
|
||||
/obj/structure/table/survival_pod/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_STEEL)
|
||||
. = ..()
|
||||
verbs -= /obj/structure/table/verb/do_flip
|
||||
verbs -= /obj/structure/table/proc/do_put
|
||||
..()
|
||||
|
||||
/obj/structure/table/survival_pod/dismantle(obj/item/tool/wrench/W, mob/user)
|
||||
to_chat(user, span_warning("You cannot dismantle \the [src]."))
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/mob/living/silicon/ai/New(loc, var/datum/ai_laws/L, var/obj/item/mmi/B, var/safety = 0)
|
||||
..(loc, L, B, safety)
|
||||
/mob/living/silicon/ai/Initialize(mapload, var/datum/ai_laws/L, var/obj/item/mmi/B, var/safety = 0)
|
||||
. = ..(mapload, L, B, safety)
|
||||
add_language(LANGUAGE_BIRDSONG, 1)
|
||||
add_language(LANGUAGE_SAGARU, 1)
|
||||
add_language(LANGUAGE_CANILUNZT, 1)
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
var/hudmode = null
|
||||
|
||||
/mob/living/silicon/New()
|
||||
silicon_mob_list |= src
|
||||
silicon_mob_list += src
|
||||
..()
|
||||
add_language(LANGUAGE_GALCOM)
|
||||
apply_default_language(GLOB.all_languages[LANGUAGE_GALCOM])
|
||||
|
||||
@@ -39,8 +39,8 @@
|
||||
|
||||
faction = FACTION_CATGIRL
|
||||
|
||||
/mob/living/simple_mob/vore/catgirl/New()
|
||||
..()
|
||||
/mob/living/simple_mob/vore/catgirl/Initialize(mapload)
|
||||
. = ..()
|
||||
if(random_skin)
|
||||
icon_living = pick(skins)
|
||||
icon_rest = "[icon_living]asleep"
|
||||
|
||||
@@ -48,11 +48,11 @@
|
||||
allow_mind_transfer = TRUE
|
||||
|
||||
// Pepe is love, not hate.
|
||||
/mob/living/simple_mob/vore/aggressive/frog/New()
|
||||
/mob/living/simple_mob/vore/aggressive/frog/Initialize(mapload)
|
||||
. = ..()
|
||||
if(rand(1,1000000) == 1)
|
||||
name = "rare Pepe"
|
||||
desc = "You found a rare Pepe. Screenshot for good luck."
|
||||
..()
|
||||
|
||||
/mob/living/simple_mob/vore/aggressive/frog/do_special_attack(atom/A)
|
||||
set_AI_busy(TRUE)
|
||||
|
||||
@@ -148,8 +148,8 @@
|
||||
|
||||
glow_toggle = !glow_toggle
|
||||
|
||||
/mob/living/simple_mob/vore/leopardmander/exotic/New()
|
||||
..()
|
||||
/mob/living/simple_mob/vore/leopardmander/exotic/Initialize(mapload)
|
||||
. = ..()
|
||||
add_verb(src, /mob/living/simple_mob/vore/leopardmander/exotic/proc/toggle_glow)
|
||||
|
||||
/mob/living/simple_mob/vore/leopardmander/exotic/init_vore()
|
||||
|
||||
@@ -2,6 +2,6 @@
|
||||
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
|
||||
faction = FACTION_CLOWN
|
||||
|
||||
/mob/living/simple_mob/clowns/big/c_shift/New()
|
||||
..()
|
||||
/mob/living/simple_mob/clowns/big/c_shift/Initialize(mapload)
|
||||
. = ..()
|
||||
add_verb(src, /mob/living/simple_mob/clowns/big/c_shift/proc/phase_shift)
|
||||
|
||||
@@ -30,8 +30,8 @@
|
||||
|
||||
faction = FACTION_PEASANT
|
||||
|
||||
/mob/living/simple_mob/vore/peasant/New()
|
||||
..()
|
||||
/mob/living/simple_mob/vore/peasant/Initialize(mapload)
|
||||
. = ..()
|
||||
if(random_skin)
|
||||
icon_living = pick(skins)
|
||||
icon_rest = "[icon_living]asleep"
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
var/last_pet // This tracks the last time someone patted us.
|
||||
var/grump_decay = 5 SECONDS // This is how quickly our grumpiness decays.
|
||||
|
||||
/mob/living/simple_mob/vore/rabbit/New()
|
||||
/mob/living/simple_mob/vore/rabbit/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
if(!body_color)
|
||||
|
||||
@@ -65,8 +65,8 @@
|
||||
vore_pounce_maxhealth = 125
|
||||
vore_bump_emote = "tries to snap up"
|
||||
|
||||
/mob/living/simple_mob/vore/raptor/New()
|
||||
..()
|
||||
/mob/living/simple_mob/vore/raptor/Initialize(mapload)
|
||||
. = ..()
|
||||
if(random_skin)
|
||||
icon_living = pick(skins)
|
||||
initial_icon = icon_living
|
||||
|
||||
@@ -58,8 +58,8 @@
|
||||
|
||||
allow_mind_transfer = TRUE
|
||||
|
||||
/mob/living/simple_mob/vore/scel/New()
|
||||
..()
|
||||
/mob/living/simple_mob/vore/scel/Initialize(mapload)
|
||||
. = ..()
|
||||
if(random_skin)
|
||||
icon_living = pick(skins)
|
||||
icon_rest = "[icon_living]-rest"
|
||||
|
||||
@@ -54,8 +54,8 @@
|
||||
say_list_type = /datum/say_list/softdog
|
||||
swallowTime = 0.1 SECONDS
|
||||
|
||||
/mob/living/simple_mob/vore/woof/New()
|
||||
..()
|
||||
/mob/living/simple_mob/vore/woof/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
add_verb(src, /mob/living/proc/ventcrawl)
|
||||
add_verb(src, /mob/living/proc/hide)
|
||||
|
||||
@@ -53,8 +53,8 @@ var/global/list/grub_machine_overlays = list()
|
||||
|
||||
glow_override = TRUE
|
||||
|
||||
/mob/living/simple_mob/animal/solargrub_larva/New()
|
||||
..()
|
||||
/mob/living/simple_mob/animal/solargrub_larva/Initialize(mapload)
|
||||
. = ..()
|
||||
existing_solargrubs += src
|
||||
powermachine = new(src)
|
||||
sparks = new(src)
|
||||
|
||||
@@ -19,11 +19,6 @@
|
||||
broken_damage = 150
|
||||
w_class = ITEMSIZE_HUGE
|
||||
|
||||
/obj/item/modular_computer/telescreen/New()
|
||||
..()
|
||||
// Allows us to create "north bump" "south bump" etc. named objects, for more comfortable mapping.
|
||||
name = "telescreen"
|
||||
|
||||
/obj/item/modular_computer/telescreen/attackby(var/obj/item/W as obj, var/mob/user as mob)
|
||||
if(W.has_tool_quality(TOOL_CROWBAR))
|
||||
if(anchored)
|
||||
|
||||
@@ -297,8 +297,8 @@
|
||||
icon = 'icons/obj/boxes.dmi'
|
||||
icon_state = "nifsoft_kit_sec"
|
||||
|
||||
/obj/item/storage/box/nifsofts_security/New()
|
||||
..()
|
||||
/obj/item/storage/box/nifsofts_security/Initialize(mapload)
|
||||
. = ..()
|
||||
for(var/i = 0 to 7)
|
||||
new /obj/item/disk/nifsoft/security(src)
|
||||
|
||||
@@ -323,8 +323,8 @@
|
||||
icon = 'icons/obj/boxes.dmi'
|
||||
icon_state = "nifsoft_kit_eng"
|
||||
|
||||
/obj/item/storage/box/nifsofts_engineering/New()
|
||||
..()
|
||||
/obj/item/storage/box/nifsofts_engineering/Initialize(mapload)
|
||||
. = ..()
|
||||
for(var/i = 0 to 7)
|
||||
new /obj/item/disk/nifsoft/engineering(src)
|
||||
|
||||
@@ -348,8 +348,8 @@
|
||||
icon = 'icons/obj/boxes.dmi'
|
||||
icon_state = "nifsoft_kit_med"
|
||||
|
||||
/obj/item/storage/box/nifsofts_medical/New()
|
||||
..()
|
||||
/obj/item/storage/box/nifsofts_medical/Initialize(mapload)
|
||||
. = ..()
|
||||
for(var/i = 0 to 7)
|
||||
new /obj/item/disk/nifsoft/medical(src)
|
||||
|
||||
@@ -377,8 +377,8 @@
|
||||
icon = 'icons/obj/boxes.dmi'
|
||||
icon_state = "nifsoft_kit_mining"
|
||||
|
||||
/obj/item/storage/box/nifsofts_mining/New()
|
||||
..()
|
||||
/obj/item/storage/box/nifsofts_mining/Initialize(mapload)
|
||||
. = ..()
|
||||
for(var/i = 0 to 7)
|
||||
new /obj/item/disk/nifsoft/mining(src)
|
||||
|
||||
@@ -406,8 +406,8 @@
|
||||
icon = 'icons/obj/boxes_vr.dmi'
|
||||
icon_state = "nifsoft_kit_pilot"
|
||||
|
||||
/obj/item/storage/box/nifsofts_pilot/New()
|
||||
..()
|
||||
/obj/item/storage/box/nifsofts_pilot/Initialize(mapload)
|
||||
. = ..()
|
||||
for(var/i = 0 to 7)
|
||||
new /obj/item/disk/nifsoft/pilot(src)
|
||||
|
||||
@@ -429,7 +429,7 @@
|
||||
icon = 'icons/obj/boxes.dmi'
|
||||
icon_state = "nifsoft_kit_mining"
|
||||
|
||||
/obj/item/storage/box/nifsofts_sizechange/New()
|
||||
..()
|
||||
/obj/item/storage/box/nifsofts_sizechange/Initialize(mapload)
|
||||
. = ..()
|
||||
for(var/i = 0 to 7)
|
||||
new /obj/item/disk/nifsoft/sizechange(src)
|
||||
|
||||
@@ -1,13 +1,8 @@
|
||||
GLOBAL_DATUM_INIT(overmap_event_handler, /decl/overmap_event_handler, new)
|
||||
|
||||
/decl/overmap_event_handler
|
||||
var/list/hazard_by_turf
|
||||
var/list/ship_events
|
||||
|
||||
/decl/overmap_event_handler/New()
|
||||
..()
|
||||
hazard_by_turf = list()
|
||||
ship_events = list()
|
||||
var/list/hazard_by_turf = list()
|
||||
var/list/ship_events = list()
|
||||
|
||||
// Populates overmap with random events! Should be called once at startup at some point.
|
||||
/decl/overmap_event_handler/proc/create_events(var/z_level, var/overmap_size, var/number_of_events)
|
||||
|
||||
@@ -1,8 +1,3 @@
|
||||
var/list/exploration_cartridges = list(
|
||||
/obj/item/cartridge/explorer,
|
||||
/obj/item/cartridge/sar
|
||||
)
|
||||
|
||||
/obj/item/cartridge
|
||||
slot_flags = SLOT_EARS
|
||||
|
||||
|
||||
@@ -517,8 +517,8 @@ var/global/list/obj/item/pda/PDAs = list()
|
||||
icon = 'icons/obj/pda_vr.dmi' //VOREStation edit
|
||||
icon_state = "pdabox"
|
||||
|
||||
/obj/item/storage/box/PDAs/New()
|
||||
..()
|
||||
/obj/item/storage/box/PDAs/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/pda(src)
|
||||
new /obj/item/pda(src)
|
||||
new /obj/item/pda(src)
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
/obj/item/pda
|
||||
var/delete_id = FALSE //Guaranteed deletion of ID upon deletion of PDA
|
||||
|
||||
/obj/item/pda/multicaster/exploration/New()
|
||||
..()
|
||||
/obj/item/pda/multicaster/exploration
|
||||
owner = "Exploration Department" //CHOMP keep explo
|
||||
name = "Exploration Department (Relay)" //CHOMP keep explo
|
||||
cartridges_to_send_to = exploration_cartridges
|
||||
cartridges_to_send_to = list(/obj/item/cartridge/explorer,/obj/item/cartridge/sar)
|
||||
|
||||
/obj/item/pda/centcom
|
||||
default_cartridge = /obj/item/cartridge/captain
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
var/graffiti_age = 0
|
||||
var/author = "unknown"
|
||||
|
||||
/obj/effect/decal/writing/New(var/newloc, var/_age, var/_message, var/_author)
|
||||
..(newloc)
|
||||
/obj/effect/decal/writing/Initialize(mapload, var/_age, var/_message, var/_author)
|
||||
. = ..()
|
||||
if(!isnull(_age))
|
||||
graffiti_age = _age
|
||||
if(!isnull(_message))
|
||||
|
||||
@@ -12,13 +12,10 @@
|
||||
var/radioactivity = 0
|
||||
var/const/initial_amount = 3000000
|
||||
|
||||
/obj/item/fuel_assembly/New(var/newloc, var/_material, var/_colour)
|
||||
/obj/item/fuel_assembly/Initialize(mapload, var/_material, var/_colour)
|
||||
. = ..()
|
||||
fuel_type = _material
|
||||
fuel_colour = _colour
|
||||
..(newloc)
|
||||
|
||||
/obj/item/fuel_assembly/Initialize(mapload)
|
||||
. = ..()
|
||||
var/datum/material/material = get_material_by_name(fuel_type)
|
||||
if(istype(material))
|
||||
name = "[material.use_name] fuel rod assembly"
|
||||
@@ -53,14 +50,14 @@
|
||||
return ..()
|
||||
|
||||
// Mapper shorthand.
|
||||
/obj/item/fuel_assembly/deuterium/New(var/newloc)
|
||||
..(newloc, MAT_DEUTERIUM)
|
||||
/obj/item/fuel_assembly/deuterium/Initialize(mapload)
|
||||
. = ..(mapload, MAT_DEUTERIUM)
|
||||
|
||||
/obj/item/fuel_assembly/tritium/New(var/newloc)
|
||||
..(newloc, MAT_TRITIUM)
|
||||
/obj/item/fuel_assembly/tritium/Initialize(mapload)
|
||||
. = ..(mapload, MAT_TRITIUM)
|
||||
|
||||
/obj/item/fuel_assembly/phoron/New(var/newloc)
|
||||
..(newloc, MAT_PHORON)
|
||||
/obj/item/fuel_assembly/phoron/Initialize(mapload)
|
||||
. = ..(mapload, MAT_PHORON)
|
||||
|
||||
/obj/item/fuel_assembly/supermatter/New(var/newloc)
|
||||
..(newloc, MAT_SUPERMATTER)
|
||||
/obj/item/fuel_assembly/supermatter/Initialize(mapload)
|
||||
. = ..(mapload, MAT_SUPERMATTER)
|
||||
|
||||
@@ -1095,8 +1095,8 @@ var/global/list/light_type_cache = list()
|
||||
desc = "A broken [name]."
|
||||
|
||||
|
||||
/obj/item/light/New(atom/newloc, obj/machinery/light/fixture = null)
|
||||
..()
|
||||
/obj/item/light/Initialize(mapload, obj/machinery/light/fixture = null)
|
||||
. = ..()
|
||||
if(fixture)
|
||||
status = fixture.status
|
||||
rigged = fixture.rigged
|
||||
|
||||
@@ -633,10 +633,10 @@
|
||||
icon = 'icons/obj/supermatter.dmi'
|
||||
icon_state = "darkmatter_broken"
|
||||
|
||||
/obj/item/broken_sm/New()
|
||||
/obj/item/broken_sm/Initialize(mapload)
|
||||
. = ..()
|
||||
message_admins("Broken SM shard created at ([x],[y],[z] - <A href='byond://?_src_=holder;[HrefToken()];adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
|
||||
START_PROCESSING(SSobj, src)
|
||||
return ..()
|
||||
|
||||
/obj/item/broken_sm/process()
|
||||
SSradiation.radiate(src, 50)
|
||||
|
||||
@@ -17,8 +17,8 @@
|
||||
var/obj/item/projectile/BB = null //The loaded bullet - make it so that the projectiles are created only when needed?
|
||||
var/caseless = null //Caseless ammo deletes its self once the projectile is fired.
|
||||
|
||||
/obj/item/ammo_casing/New()
|
||||
..()
|
||||
/obj/item/ammo_casing/Initialize(mapload)
|
||||
. = ..()
|
||||
if(ispath(projectile_type))
|
||||
BB = new projectile_type(src)
|
||||
randpixel_xy()
|
||||
@@ -124,8 +124,8 @@
|
||||
var/list/icon_keys = list() //keys
|
||||
var/list/ammo_states = list() //values
|
||||
|
||||
/obj/item/ammo_magazine/New()
|
||||
..()
|
||||
/obj/item/ammo_magazine/Initialize(mapload)
|
||||
. = ..()
|
||||
pixel_x = rand(-5, 5)
|
||||
pixel_y = rand(-5, 5)
|
||||
if(multiple_sprites)
|
||||
|
||||
@@ -26,13 +26,13 @@
|
||||
|
||||
var/emagged = 0 // If you emag the smart mag, you can get the bullets out by clicking it
|
||||
|
||||
/obj/item/ammo_magazine/smart/New()
|
||||
/obj/item/ammo_magazine/smart/Initialize(mapload)
|
||||
. = ..()
|
||||
START_PROCESSING(SSobj, src)
|
||||
..()
|
||||
|
||||
/obj/item/ammo_magazine/smart/Destroy()
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/ammo_magazine/smart/process()
|
||||
if(!holding_gun) // Yes, this is awful, sorry. Don't know a better way to figure out if we've been moved into or out of a gun.
|
||||
|
||||
@@ -9,19 +9,18 @@
|
||||
|
||||
var/do_rotation = TRUE
|
||||
|
||||
/obj/item/broken_gun/New(var/newloc, var/path)
|
||||
..()
|
||||
/obj/item/broken_gun/Initialize(mapload, path)
|
||||
. = ..()
|
||||
if(path)
|
||||
if(!setup_gun(path))
|
||||
qdel(src)
|
||||
return
|
||||
return INITIALIZE_HINT_QDEL
|
||||
setup_repair_needs()
|
||||
|
||||
/obj/item/broken_gun/Initialize(mapload)
|
||||
. = ..()
|
||||
spawn(30 SECONDS)
|
||||
if(!my_guntype && !QDELETED(src))
|
||||
qdel(src)
|
||||
addtimer(CALLBACK(src, PROC_REF(validate_gun_type)), 30 SECONDS, TIMER_DELETE_ME)
|
||||
|
||||
/obj/item/broken_gun/proc/validate_gun_type()
|
||||
if(!my_guntype)
|
||||
qdel(src)
|
||||
|
||||
/obj/item/broken_gun/examine(mob/user)
|
||||
. = ..()
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
|
||||
/obj/item/broken_gun/laserrifle/New(var/newloc)
|
||||
..(newloc, /obj/item/gun/energy/laser/empty)
|
||||
/obj/item/broken_gun/laserrifle/Initialize(mapload)
|
||||
. = ..(mapload, /obj/item/gun/energy/laser/empty)
|
||||
|
||||
/obj/item/broken_gun/laser_retro/New(var/newloc)
|
||||
..(newloc, /obj/item/gun/energy/retro/empty)
|
||||
/obj/item/broken_gun/laser_retro/Initialize(mapload)
|
||||
. = ..(mapload, /obj/item/gun/energy/retro/empty)
|
||||
|
||||
/obj/item/broken_gun/ionrifle/New(var/newloc)
|
||||
..(newloc, /obj/item/gun/energy/ionrifle/empty)
|
||||
/obj/item/broken_gun/ionrifle/Initialize(mapload)
|
||||
. = ..(mapload, /obj/item/gun/energy/ionrifle/empty)
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
|
||||
/obj/item/broken_gun/grenadelauncher/New(var/newloc)
|
||||
..(newloc, /obj/item/gun/launcher/grenade)
|
||||
/obj/item/broken_gun/grenadelauncher/Initialize(mapload)
|
||||
. = ..(mapload, /obj/item/gun/launcher/grenade)
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
|
||||
/obj/item/broken_gun/flechette/New(var/newloc)
|
||||
..(newloc, /obj/item/gun/magnetic/railgun/flechette)
|
||||
/obj/item/broken_gun/flechette/Initialize(mapload)
|
||||
. = ..(mapload, /obj/item/gun/magnetic/railgun/flechette)
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
|
||||
/obj/item/broken_gun/c20r/New(var/newloc)
|
||||
..(newloc, /obj/item/gun/projectile/automatic/c20r/empty)
|
||||
/obj/item/broken_gun/c20r/Initialize(mapload)
|
||||
. = ..(mapload, /obj/item/gun/projectile/automatic/c20r/empty)
|
||||
|
||||
/obj/item/broken_gun/silenced45/New(var/newloc)
|
||||
..(newloc, /obj/item/gun/projectile/silenced/empty)
|
||||
/obj/item/broken_gun/silenced45/Initialize(mapload)
|
||||
. = ..(mapload, /obj/item/gun/projectile/silenced/empty)
|
||||
|
||||
/obj/item/broken_gun/pumpshotgun/New(var/newloc)
|
||||
..(newloc, /obj/item/gun/projectile/shotgun/pump/empty)
|
||||
/obj/item/broken_gun/pumpshotgun/Initialize(mapload)
|
||||
. = ..(mapload, /obj/item/gun/projectile/shotgun/pump/empty)
|
||||
|
||||
/obj/item/broken_gun/pumpshotgun_combat/New(var/newloc)
|
||||
..(newloc, /obj/item/gun/projectile/shotgun/pump/combat/empty)
|
||||
/obj/item/broken_gun/pumpshotgun_combat/Initialize(mapload)
|
||||
. = ..(mapload, /obj/item/gun/projectile/shotgun/pump/combat/empty)
|
||||
|
||||
/obj/item/broken_gun/z8/New(var/newloc)
|
||||
..(newloc, /obj/item/gun/projectile/automatic/z8/empty)
|
||||
/obj/item/broken_gun/z8/Initialize(mapload)
|
||||
. = ..(mapload, /obj/item/gun/projectile/automatic/z8/empty)
|
||||
|
||||
/obj/item/broken_gun/dartgun/New(var/newloc)
|
||||
..(newloc, /obj/item/gun/projectile/dartgun)
|
||||
/obj/item/broken_gun/dartgun/Initialize(mapload)
|
||||
. = ..(mapload, /obj/item/gun/projectile/dartgun)
|
||||
|
||||
@@ -126,8 +126,8 @@
|
||||
update_icon()
|
||||
//VOREStation Add End
|
||||
|
||||
/obj/item/gun/New()
|
||||
..()
|
||||
/obj/item/gun/Initialize(mapload)
|
||||
. = ..()
|
||||
for(var/i in 1 to firemodes.len)
|
||||
firemodes[i] = new /datum/firemode(src, firemodes[i])
|
||||
|
||||
|
||||
@@ -14,14 +14,12 @@
|
||||
var/active = 0//Just tells us that it was clicked on so we should start shooting
|
||||
var/delay_del = 0//Delays the del if we retarget without shooting
|
||||
|
||||
/obj/screen/auto_target/New(loc, var/obj/item/gun/G)
|
||||
..()
|
||||
gun = G
|
||||
var/image/I = image('icons/effects/Targeted.dmi', src, "locked")
|
||||
I.override = 1
|
||||
usr << I
|
||||
//autodel() //Currently doesn't really work right.
|
||||
return
|
||||
/obj/screen/auto_target/Initialize(mapload, var/obj/item/gun/G)
|
||||
. = ..()
|
||||
gun = G
|
||||
var/image/I = image('icons/effects/Targeted.dmi', src, "locked")
|
||||
I.override = 1
|
||||
usr << I
|
||||
|
||||
/obj/screen/auto_target/CanPass()//Everything should ignore this guy and just pass by
|
||||
return 1
|
||||
|
||||
@@ -29,8 +29,8 @@
|
||||
var/battery_lock = 0 //If set, weapon cannot switch batteries
|
||||
var/random_start_ammo = FALSE //if TRUE, the weapon will spawn with randomly-determined ammo
|
||||
|
||||
/obj/item/gun/energy/New()
|
||||
//..() CHOMPEdit moved to bottom
|
||||
/obj/item/gun/energy/Initialize(mapload)
|
||||
. = ..()
|
||||
var/static/list/gun_icons = icon_states('icons/obj/gun_ch.dmi')
|
||||
if (icon == 'icons/obj/gun_ch.dmi' && !(icon_state in gun_icons))
|
||||
icon = 'icons/obj/gun.dmi'
|
||||
@@ -45,14 +45,7 @@
|
||||
//random starting power! gives us a random number of shots in the battery between 0 and the max possible
|
||||
if(random_start_ammo && cell_type)
|
||||
power_supply.charge = charge_cost*rand(0,power_supply.maxcharge/charge_cost)
|
||||
//update_icon() //CHOMPRemove
|
||||
..() //CHOMPEdit if you see this, it is a cry for help. Please tell people to stop putting ..() at the top of New() :(
|
||||
|
||||
//CHOMPEdit Start
|
||||
/obj/item/gun/energy/Initialize(mapload)
|
||||
. = ..()
|
||||
update_icon()
|
||||
//CHOMPEdit End
|
||||
|
||||
/obj/item/gun/energy/Destroy()
|
||||
if(self_recharge)
|
||||
|
||||
@@ -248,8 +248,8 @@
|
||||
max_w_class = ITEMSIZE_NORMAL
|
||||
can_hold = list(/obj/item/gun/projectile/cell_loaded,/obj/item/ammo_magazine/cell_mag,/obj/item/ammo_casing/microbattery)
|
||||
|
||||
/obj/item/storage/secure/briefcase/nsfw_pack_hybrid/New()
|
||||
..()
|
||||
/obj/item/storage/secure/briefcase/nsfw_pack_hybrid/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/gun/projectile/cell_loaded(src)
|
||||
new /obj/item/ammo_magazine/cell_mag/advanced(src)
|
||||
new /obj/item/ammo_casing/microbattery/combat/stun(src)
|
||||
@@ -270,8 +270,8 @@
|
||||
max_w_class = ITEMSIZE_NORMAL
|
||||
can_hold = list(/obj/item/gun/projectile/cell_loaded,/obj/item/ammo_magazine/cell_mag,/obj/item/ammo_casing/microbattery)
|
||||
|
||||
/obj/item/storage/secure/briefcase/nsfw_pack_hybrid_combat/New()
|
||||
..()
|
||||
/obj/item/storage/secure/briefcase/nsfw_pack_hybrid_combat/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/gun/projectile/cell_loaded(src)
|
||||
new /obj/item/ammo_magazine/cell_mag/advanced(src)
|
||||
new /obj/item/ammo_casing/microbattery/combat/shotstun(src)
|
||||
|
||||
@@ -50,8 +50,8 @@
|
||||
max_w_class = ITEMSIZE_NORMAL
|
||||
can_hold = list(/obj/item/gun/projectile/cell_loaded/medical,/obj/item/ammo_magazine/cell_mag/medical,/obj/item/ammo_casing/microbattery/medical)
|
||||
|
||||
/obj/item/storage/secure/briefcase/ml3m_pack_med/New()
|
||||
..()
|
||||
/obj/item/storage/secure/briefcase/ml3m_pack_med/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/gun/projectile/cell_loaded/medical(src)
|
||||
new /obj/item/ammo_magazine/cell_mag/medical(src)
|
||||
new /obj/item/ammo_casing/microbattery/medical/brute(src)
|
||||
@@ -66,8 +66,8 @@
|
||||
max_w_class = ITEMSIZE_NORMAL
|
||||
can_hold = list(/obj/item/gun/projectile/cell_loaded/medical,/obj/item/ammo_magazine/cell_mag/medical,/obj/item/ammo_casing/microbattery/medical)
|
||||
|
||||
/obj/item/storage/secure/briefcase/ml3m_pack_cmo/New()
|
||||
..()
|
||||
/obj/item/storage/secure/briefcase/ml3m_pack_cmo/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/gun/projectile/cell_loaded/medical/cmo(src)
|
||||
new /obj/item/ammo_magazine/cell_mag/medical(src)
|
||||
new /obj/item/ammo_casing/microbattery/medical/brute(src)
|
||||
|
||||
@@ -48,8 +48,8 @@
|
||||
max_w_class = ITEMSIZE_NORMAL
|
||||
can_hold = list(/obj/item/gun/projectile/cell_loaded/combat,/obj/item/ammo_magazine/cell_mag/combat,/obj/item/ammo_casing/microbattery/combat)
|
||||
|
||||
/obj/item/storage/secure/briefcase/nsfw_pack/New()
|
||||
..()
|
||||
/obj/item/storage/secure/briefcase/nsfw_pack/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/gun/projectile/cell_loaded/combat(src)
|
||||
new /obj/item/ammo_magazine/cell_mag/combat(src)
|
||||
for(var/path in subtypesof(/obj/item/ammo_casing/microbattery/combat))
|
||||
@@ -62,8 +62,8 @@
|
||||
max_w_class = ITEMSIZE_NORMAL
|
||||
can_hold = list(/obj/item/gun/projectile/cell_loaded/combat,/obj/item/ammo_magazine/cell_mag/combat,/obj/item/ammo_casing/microbattery/combat)
|
||||
|
||||
/obj/item/storage/secure/briefcase/nsfw_pack_hos/New()
|
||||
..()
|
||||
/obj/item/storage/secure/briefcase/nsfw_pack_hos/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/gun/projectile/cell_loaded/combat(src)
|
||||
new /obj/item/ammo_magazine/cell_mag/combat(src)
|
||||
new /obj/item/ammo_magazine/cell_mag/combat(src)
|
||||
|
||||
@@ -20,8 +20,8 @@
|
||||
var/force_divisor = 400 // Force equates to speed. Speed/5 equates to a damage multiplier for whoever you hit.
|
||||
// For reference, a fully pressurized oxy tank at 50% gas release firing a health
|
||||
// analyzer with a force_divisor of 10 hit with a damage multiplier of 3000+.
|
||||
/obj/item/gun/launcher/pneumatic/New()
|
||||
..()
|
||||
/obj/item/gun/launcher/pneumatic/Initialize(mapload)
|
||||
. = ..()
|
||||
item_storage = new(src)
|
||||
item_storage.name = "hopper"
|
||||
item_storage.max_w_class = max_w_class
|
||||
|
||||
@@ -397,7 +397,8 @@
|
||||
else if(M.ear_damage >= 5)
|
||||
to_chat(M, span_danger("Your ears start to ring!"))
|
||||
//CHOMPEdit End
|
||||
/obj/item/gun/magnetic/fuelrod/New()
|
||||
|
||||
/obj/item/gun/magnetic/fuelrod/Initialize(mapload)
|
||||
cell = new /obj/item/cell/high
|
||||
capacitor = new /obj/item/stock_parts/capacitor
|
||||
. = ..()
|
||||
|
||||
@@ -28,8 +28,8 @@
|
||||
//Excessively long because it won't accept subtypes for some reason!
|
||||
|
||||
|
||||
/obj/item/gun/energy/modular/New() //Initialize our components.
|
||||
..()
|
||||
/obj/item/gun/energy/modular/Initialize(mapload)
|
||||
. = ..()
|
||||
guncomponents = list()
|
||||
guncomponents += new /obj/item/stock_parts/capacitor
|
||||
guncomponents += new /obj/item/stock_parts/micro_laser
|
||||
|
||||
@@ -33,8 +33,8 @@
|
||||
|
||||
var/random_start_ammo = FALSE //randomize amount of starting ammo
|
||||
|
||||
/obj/item/gun/projectile/New(loc, var/starts_loaded = 1)
|
||||
..()
|
||||
/obj/item/gun/projectile/Initialize(mapload, var/starts_loaded = 1)
|
||||
. = ..()
|
||||
if(starts_loaded)
|
||||
if(ispath(ammo_type) && (load_method & (SINGLE_CASING|SPEEDLOADER)))
|
||||
for(var/i in 1 to max_shells)
|
||||
|
||||
@@ -232,8 +232,8 @@
|
||||
var/use_launcher = 0
|
||||
var/obj/item/gun/launcher/grenade/underslung/launcher
|
||||
|
||||
/obj/item/gun/projectile/automatic/z8/New()
|
||||
..()
|
||||
/obj/item/gun/projectile/automatic/z8/Initialize(mapload)
|
||||
. = ..()
|
||||
launcher = new(src)
|
||||
|
||||
/obj/item/gun/projectile/automatic/z8/attackby(obj/item/I, mob/user)
|
||||
|
||||
@@ -7,7 +7,8 @@
|
||||
|
||||
muzzle_type = null
|
||||
|
||||
/obj/item/projectile/bullet/chemdart/New()
|
||||
/obj/item/projectile/bullet/chemdart/Initialize(mapload)
|
||||
. = ..()
|
||||
reagents = new/datum/reagents(reagent_amount)
|
||||
reagents.my_atom = src
|
||||
|
||||
@@ -69,8 +70,8 @@
|
||||
var/container_type = /obj/item/reagent_containers/glass/beaker
|
||||
var/list/starting_chems = null
|
||||
|
||||
/obj/item/gun/projectile/dartgun/New()
|
||||
..()
|
||||
/obj/item/gun/projectile/dartgun/Initialize(mapload)
|
||||
. = ..()
|
||||
if(starting_chems)
|
||||
for(var/chem in starting_chems)
|
||||
var/obj/B = new container_type(src)
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user