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

some more new to init (#17231)

Browse Source 
* some more new to init

* rigs

* rigs

* intellisense moment

* telcoms and landmarks

* fix that as well

* some more minor things

* re add missing message

* fix trash eating...
This commit is contained in:
Kashargul
2025-03-01 19:39:52 +01:00
committed by GitHub
parent e6afc35d22
commit 4f8e9f7ef8
117 changed files with 570 additions and 643 deletions
Download Patch File Download Diff File Expand all files Collapse all files
archive/maps/RandomZLevels/stationCollision.dm
+5 -4
View File
@@ -45,8 +45,10 @@
*/
/obj/effect/landmark/sc_bible_spawner
name = "Safecode hint spawner"
delete_me = TRUE
/obj/effect/landmark/sc_bible_spawner/New()
/obj/effect/landmark/sc_bible_spawner/Initialize(mapload)
. = ..()
var/obj/item/storage/bible/B = new /obj/item/storage/bible/booze(src.loc)
B.name = "The Holy book of the Geometer"
B.deity_name = "Narsie"
@@ -54,7 +56,6 @@
B.item_state = "melted"
new /obj/item/paper/sc_safehint_paper_bible(B)
new /obj/item/pen(B)
qdel(src)
/*
* Guns - I'm making these specifically so that I dont spawn a pile of fully loaded weapons on the map.
@@ -158,8 +159,8 @@ var/sc_safecode5 = "[rand(0,9)]"
/obj/item/storage/secure/safe/sc_ssafe
name = "Captain's secure safe"
/obj/item/storage/secure/safe/sc_ssafe/New()
..()
/obj/item/storage/secure/safe/sc_ssafe/Initialize(mapload)
. = ..()
l_code = "[sc_safecode1][sc_safecode2][sc_safecode3][sc_safecode4][sc_safecode5]"
l_set = 1
new /obj/item/gun/energy/mindflayer(src)
archive/maps/gateway_archive_vr/stationCollision.dm
+2 -2
View File
@@ -45,9 +45,10 @@
*/
/obj/effect/landmark/sc_bible_spawner
name = "Safecode hint spawner"
delete_me = TRUE
/obj/effect/landmark/sc_bible_spawner/Initialize(mapload)
..()
. = ..()
var/obj/item/storage/bible/B = new /obj/item/storage/bible/booze(src.loc)
B.name = "The Holy book of the Geometer"
B.deity_name = "Narsie"
@@ -55,7 +56,6 @@
B.item_state = "melted"
new /obj/item/paper/sc_safehint_paper_bible(B)
new /obj/item/pen(B)
return INITIALIZE_HINT_QDEL
/*
* Guns - I'm making these specifically so that I dont spawn a pile of fully loaded weapons on the map.
code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm
+2 -2
View File
@@ -36,8 +36,8 @@
/obj/machinery/atmospherics/binary/algae_farm/filled
stored_material = list(MAT_ALGAE = 10000, MAT_GRAPHITE = 0)
/obj/machinery/atmospherics/binary/algae_farm/New()
..()
/obj/machinery/atmospherics/binary/algae_farm/Initialize(mapload)
. = ..()
desc = initial(desc) + " Its outlet port is to the [dir2text(dir)]."
default_apply_parts()
update_icon()
code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
+1 -1
View File
@@ -9,7 +9,7 @@
var/datum/pipe_network/network1
var/datum/pipe_network/network2
/obj/machinery/atmospherics/binary/Initialize()
/obj/machinery/atmospherics/binary/Initialize(mapload)
. = ..()
air1 = new
code/datums/EPv2.dm
-1
View File
@@ -59,7 +59,6 @@ var/global/list/all_exonet_connections = list()
new_address = "[addr_0]:[addr_1]"
string = "[string]0" //If we did get a collision, this should make the next attempt not have one.
sleep(1)
address = new_address
all_exonet_connections |= src
code/defines/obj/weapon.dm
+5 -5
View File
@@ -54,9 +54,9 @@
/obj/item/soap/deluxe
icon_state = "soapdeluxe"
/obj/item/soap/deluxe/New()
/obj/item/soap/deluxe/Initialize(mapload)
. = ..()
desc = "A deluxe Waffle Co. brand bar of soap. Smells of [pick("lavender", "vanilla", "strawberry", "chocolate" ,"space")]."
..()
/obj/item/soap/syndie
desc = "An untrustworthy bar of soap. Smells of fear."
@@ -490,10 +490,10 @@
drop_sound = 'sound/items/drop/component.ogg'
pickup_sound = 'sound/items/pickup/component.ogg'
/obj/item/stock_parts/New()
/obj/item/stock_parts/Initialize(mapload)
. = ..()
src.pixel_x = rand(-5.0, 5)
src.pixel_y = rand(-5.0, 5)
..()
/obj/item/stock_parts/get_rating()
return rating
@@ -518,7 +518,7 @@
var/charge = 0
var/max_charge = 1000
/obj/item/stock_parts/capacitor/New()
/obj/item/stock_parts/capacitor/Initialize(mapload)
. = ..()
max_charge *= rating
code/game/area/ai_monitored.dm
+6 -11
View File
@@ -3,16 +3,13 @@
var/obj/machinery/camera/motioncamera = null
/area/ai_monitored/New()
..()
/area/ai_monitored/Initialize(mapload)
. = ..()
// locate and store the motioncamera
spawn (20) // spawn on a delay to let turfs/objs load
for (var/obj/machinery/camera/M in src)
if(M.isMotion())
motioncamera = M
M.area_motion = src
return
return
for (var/obj/machinery/camera/M in src)
if(M.isMotion())
motioncamera = M
M.area_motion = src
/area/ai_monitored/Entered(atom/movable/O)
..()
@@ -22,5 +19,3 @@
/area/ai_monitored/Exited(atom/movable/O)
if (ismob(O) && motioncamera)
motioncamera.lostTarget(O)
code/game/atoms_movable.dm
+2 -2
View File
@@ -466,10 +466,10 @@
var/atom/master = null
anchored = TRUE
/atom/movable/overlay/New()
/atom/movable/overlay/Initialize(mapload)
. = ..()
for(var/x in src.verbs)
src.verbs -= x
..()
/atom/movable/overlay/attackby(a, b)
if (src.master)
code/game/gamemodes/changeling/powers/bioelectrogenesis.dm
+2 -1
View File
@@ -113,7 +113,8 @@
agony_amount = 80
electrocute_amount = 20
/obj/item/electric_hand/New()
/obj/item/electric_hand/Initialize(mapload)
. = ..()
if(ismob(loc))
visible_message(span_warning("Electrical arcs form around [loc.name]\'s hand!"),
span_warning("We store a charge of electricity in our hand."),
code/game/gamemodes/changeling/powers/electric_lockpick.dm
+2 -1
View File
@@ -32,7 +32,8 @@
icon_state = "electric_hand"
show_examine = FALSE
/obj/item/finger_lockpick/New()
/obj/item/finger_lockpick/Initialize(mapload)
. = ..()
if(ismob(loc))
to_chat(loc, span_notice("We shape our finger to fit inside electronics, and are ready to force them open."))
code/game/gamemodes/cult/construct_spells.dm
+3 -6
View File
@@ -438,13 +438,10 @@
cast_sound = null // Sound file played when this is used.
var/last_castcheck = null // The last time this spell was cast.
/obj/item/spell/construct/New()
//..() //This kills the spell, because super on this calls the default spell's New, which checks for a core. Can't have that.
if(isliving(loc))
owner = loc
/obj/item/spell/construct/Initialize(mapload)
. = ..(mapload, TRUE)
if(!owner)
qdel(src)
update_icon()
return INITIALIZE_HINT_QDEL
/obj/item/spell/construct/adjust_instability(var/amount) //The only drawback to the boons of the geometer is the use of a mortal's blood as fuel. Constructs have already paid that price long ago.
return
code/game/gamemodes/cult/narsie.dm
+8 -6
View File
@@ -16,13 +16,13 @@ var/global/list/narsie_list = list()
consume_range = 3 //How many tiles out do we eat
/obj/singularity/narsie/New()
..()
/obj/singularity/narsie/Initialize(mapload)
. = ..()
narsie_list.Add(src)
/obj/singularity/narsie/Destroy()
narsie_list.Remove(src)
..()
. = ..()
/obj/singularity/narsie/large
name = "Nar-Sie"
@@ -40,8 +40,8 @@ var/global/list/narsie_list = list()
var/announce=1
var/cause_hell = 1
/obj/singularity/narsie/large/New()
..()
/obj/singularity/narsie/large/Initialize(mapload)
. = ..()
if(announce)
to_world(span_world(span_narsie(span_red("[uppertext(name)] HAS RISEN"))))
world << sound('sound/effects/weather/wind/wind_5_1.ogg')
@@ -362,6 +362,8 @@ var/global/list/narsie_list = list()
dir = SOUTH
move_self = 0
flick("narsie_spawn_anim",src)
sleep(11)
addtimer(CALLBACK(src, PROC_REF(after_animation)), 1.1 SECONDS, TIMER_DELETE_ME)
/obj/singularity/narsie/proc/after_animation()
move_self = 1
icon = initial(icon)
code/game/gamemodes/events/holidays/Christmas.dm
-3
View File
@@ -23,9 +23,6 @@
desc = "Directions for use: Requires two people, one to pull each end."
var/cracked = 0
/obj/item/toy/xmas_cracker/New()
..()
/obj/item/toy/xmas_cracker/attack(mob/target, mob/user)
if( !cracked && (issilicon(target) || (ishuman(target) && !target.get_active_hand())) && target.stat == CONSCIOUS)
target.visible_message(span_notice("[user] and [target] pop \an [src]! *pop*"), span_notice("You pull \an [src] with [target]! *pop*"), span_notice("You hear a *pop*."))
code/game/gamemodes/meteor/meteors.dm
+2 -2
View File
@@ -151,8 +151,8 @@
GLOB.meteor_list -= src
return ..()
/obj/effect/meteor/New()
..()
/obj/effect/meteor/Initialize()
. = ..()
SpinAnimation()
/obj/effect/meteor/Bump(atom/A)
code/game/gamemodes/technomancer/catalog.dm
+2 -2
View File
@@ -69,8 +69,8 @@ var/list/all_technomancer_assistance = subtypesof(/datum/technomancer/assistance
// Proc: New()
// Parameters: 0
// Description: Sets up the catalog, as shown below.
/obj/item/technomancer_catalog/New()
..()
/obj/item/technomancer_catalog/Initialize(mapload)
. = ..()
set_up()
// Proc: set_up()
code/game/gamemodes/technomancer/core_obj.dm
+8 -8
View File
@@ -37,8 +37,8 @@
var/max_summons = 10 // Maximum allowed summoned entities. Some cores will have different caps.
var/universal = FALSE // Allows non-technomancers to use the core - VOREStation Add
/obj/item/technomancer_core/New()
..()
/obj/item/technomancer_core/Initialize(mapload)
. = ..()
START_PROCESSING(SSobj, src)
/obj/item/technomancer_core/Destroy()
@@ -142,14 +142,14 @@
var/obj/item/technomancer_core/core = null
var/ability_icon_state = null
/obj/spellbutton/New(loc, var/path, var/new_name, var/new_icon_state)
if(!path || !ispath(path))
message_admins("ERROR: /obj/spellbutton/New() was not given a proper path!")
qdel(src)
/obj/spellbutton/Initialize(mapload, var/path, var/new_name, var/new_icon_state)
. = ..()
src.core = loc
if(!path || !ispath(path) || !istype(core))
message_admins("ERROR: /obj/spellbutton/Initialize() was not given a proper path or not placed into the right location!")
return INITIALIZE_HINT_QDEL
src.name = new_name
src.spellpath = path
src.loc = loc
src.core = loc
src.ability_icon_state = new_icon_state
/obj/spellbutton/Click()
code/game/gamemodes/technomancer/devices/shield_armor.dm
+2 -2
View File
@@ -24,8 +24,8 @@
var/datum/effect/effect/system/spark_spread/spark_system = null
var/block_percentage = 75
/obj/item/clothing/suit/armor/shield/New()
..()
/obj/item/clothing/suit/armor/shield/Initialize(mapload)
. = ..()
spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, src)
code/game/gamemodes/technomancer/spell_objs.dm
+4 -5
View File
@@ -110,16 +110,15 @@
// Proc: New()
// Parameters: 0
// Description: Sets owner to equal its loc, links to the owner's core, then applies overlays if needed.
/obj/item/spell/New()
..()
/obj/item/spell/Initialize(mapload, var/coreless)
. = ..()
if(isliving(loc))
owner = loc
if(owner)
if(owner && !coreless)
core = owner.get_technomancer_core()
if(!core)
to_chat(owner, span_warning("You need a Core to do that."))
qdel(src)
return
return INITIALIZE_HINT_QDEL
// if(istype(/obj/item/technomancer_core, owner.back))
// core = owner.back
update_icon()
code/game/gamemodes/technomancer/spells/aspect_aura.dm
+3 -3
View File
@@ -41,14 +41,14 @@
aspect = ASPECT_CHROMATIC
var/glow_color = "#FFFFFF"
/obj/item/spell/aura/New()
..()
/obj/item/spell/aura/Initialize(mapload)
. = ..()
set_light(7, 4, l_color = glow_color)
START_PROCESSING(SSobj, src)
/obj/item/spell/aura/Destroy()
STOP_PROCESSING(SSobj, src)
..()
. = ..()
/obj/item/spell/aura/process()
return
code/game/gamemodes/technomancer/spells/chroma.dm
+2 -2
View File
@@ -14,8 +14,8 @@
aspect = ASPECT_LIGHT
var/color_to_use = "#FFFFFF"
/obj/item/spell/chroma/New()
..()
/obj/item/spell/chroma/Initialize(mapload, coreless)
. = ..()
set_light(6, 5, l_color = color_to_use)
/obj/effect/temporary_effect/chroma
code/game/gamemodes/technomancer/spells/flame_tongue.dm
+2 -2
View File
@@ -14,8 +14,8 @@
aspect = ASPECT_FIRE
var/obj/item/weldingtool/spell/welder = null
/obj/item/spell/flame_tongue/New()
..()
/obj/item/spell/flame_tongue/Initialize(mapload, coreless)
. = ..()
set_light(3, 2, l_color = "#FF6A00")
visible_message(span_warning("\The [loc]'s hand begins to emit a flame."))
welder = new /obj/item/weldingtool/spell(src)
code/game/gamemodes/technomancer/spells/instability_tap.dm
+3 -3
View File
@@ -14,8 +14,8 @@
cast_methods = CAST_USE
aspect = ASPECT_UNSTABLE
/obj/item/spell/instability_tap/New()
..()
/obj/item/spell/instability_tap/Initialize(mapload, coreless)
. = ..()
set_light(3, 2, l_color = "#FA58F4")
/obj/item/spell/instability_tap/on_use_cast(mob/user)
@@ -27,4 +27,4 @@
core.give_energy(amount)
adjust_instability(50)
playsound(src, 'sound/effects/supermatter.ogg', 75, 1)
qdel(src)
qdel(src)
code/game/gamemodes/technomancer/spells/radiance.dm
+2 -2
View File
@@ -16,8 +16,8 @@
var/power = 250
toggled = 1
/obj/item/spell/radiance/New()
..()
/obj/item/spell/radiance/Initialize(mapload, coreless)
. = ..()
set_light(7, 4, l_color = "#D9D900")
START_PROCESSING(SSobj, src)
log_and_message_admins("has casted [src].")
code/game/gamemodes/technomancer/spells/reflect.dm
+2 -2
View File
@@ -16,8 +16,8 @@
var/damage_to_energy_multiplier = 60.0 //Determines how much energy to charge for blocking, e.g. 20 damage attack = 1200 energy cost
var/datum/effect/effect/system/spark_spread/spark_system = null
/obj/item/spell/reflect/New()
..()
/obj/item/spell/reflect/Initialize(mapload, coreless)
. = ..()
set_light(3, 2, l_color = "#006AFF")
spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, src)
code/game/gamemodes/technomancer/spells/shield.dm
+2 -2
View File
@@ -18,8 +18,8 @@
var/damage_to_energy_multiplier = 30.0 //Determines how much energy to charge for blocking, e.g. 20 damage attack = 600 energy cost
var/datum/effect/effect/system/spark_spread/spark_system = null
/obj/item/spell/shield/New()
..()
/obj/item/spell/shield/Initialize(mapload, coreless)
. = ..()
set_light(3, 2, l_color = "#006AFF")
spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, src)
code/game/machinery/OpTable.dm
+2 -2
View File
@@ -15,8 +15,8 @@
var/strapped = 0.0
var/obj/machinery/computer/operating/computer = null
/obj/machinery/optable/New()
..()
/obj/machinery/optable/Initialize(mapload)
. = ..()
for(var/direction in list(NORTH,EAST,SOUTH,WEST))
computer = locate(/obj/machinery/computer/operating, get_step(src, direction))
if(computer)
code/game/machinery/atmoalter/clamp.dm
+2 -3
View File
@@ -14,8 +14,8 @@
var/datum/pipe_network/network_node1
var/datum/pipe_network/network_node2
/obj/machinery/clamp/New(loc, var/obj/machinery/atmospherics/pipe/simple/to_attach = null)
..()
/obj/machinery/clamp/Initialize(mapload, var/obj/machinery/atmospherics/pipe/simple/to_attach = null)
. = ..()
if(istype(to_attach))
target = to_attach
else
@@ -23,7 +23,6 @@
if(target)
update_networks()
dir = target.dir
return 1
/obj/machinery/clamp/proc/update_networks()
if(!target)
code/game/machinery/computer/RCON_Console.dm
+2 -2
View File
@@ -15,8 +15,8 @@
var/current_tag = null
var/datum/tgui_module/rcon/rcon
/obj/machinery/computer/rcon/New()
..()
/obj/machinery/computer/rcon/Initialize(mapload)
. = ..()
rcon = new(src)
/obj/machinery/computer/rcon/Destroy()
code/game/machinery/computer/crew.dm
+2 -2
View File
@@ -10,9 +10,9 @@
circuit = /obj/item/circuitboard/crew
var/datum/tgui_module/crew_monitor/crew_monitor
/obj/machinery/computer/crew/New()
/obj/machinery/computer/crew/Initialize(mapload)
. = ..()
crew_monitor = new(src)
..()
/obj/machinery/computer/crew/Destroy()
qdel(crew_monitor)
code/game/machinery/doors/windowdoor.dm
+4 -5
View File
@@ -17,13 +17,12 @@
can_atmos_pass = ATMOS_PASS_PROC
air_properties_vary_with_direction = 1
/obj/machinery/door/window/New()
..()
/obj/machinery/door/window/Initialize(mapload)
. = ..()
update_nearby_tiles()
if(LAZYLEN(req_access))
src.icon_state = "[src.icon_state]"
src.base_state = src.icon_state
return
icon_state = "[icon_state]"
base_state = icon_state
/obj/machinery/door/window/update_icon()
if(density)
code/game/machinery/floodlight.dm
+2 -2
View File
@@ -13,9 +13,9 @@
var/open = 0
var/brightness_on = 8 //can't remember what the maxed out value is
/obj/machinery/floodlight/New()
/obj/machinery/floodlight/Initialize(mapload)
. = ..()
cell = new(src)
..()
/obj/machinery/floodlight/update_icon()
cut_overlays()
code/game/machinery/nuclear_bomb.dm
+6 -6
View File
@@ -25,8 +25,8 @@ var/bomb_set
// 3 is sealant open, 4 is unwrenched, 5 is removed from bolts.
use_power = USE_POWER_OFF
/obj/machinery/nuclearbomb/New()
..()
/obj/machinery/nuclearbomb/Initialize(mapload)
. = ..()
r_code = "[rand(10000, 99999.0)]"//Creates a random code upon object spawn.
wires["Red"] = 0
wires["Blue"] = 0
@@ -52,7 +52,7 @@ var/bomb_set
for(var/mob/M in viewers(1, src))
if((M.client && M.machine == src))
attack_hand(M)
return
return ..()
/obj/machinery/nuclearbomb/attackby(obj/item/O as obj, mob/user as mob)
if(O.has_tool_quality(TOOL_SCREWDRIVER))
@@ -412,9 +412,9 @@ var/bomb_set
#undef NUKERANGE
/obj/item/disk/nuclear/New()
..()
nuke_disks |= src
/obj/item/disk/nuclear/Initialize(mapload)
. = ..()
nuke_disks += src
/obj/item/disk/nuclear/Destroy()
if(!nuke_disks.len && blobstart.len > 0)
code/game/machinery/partslathe_vr.dm
+2 -2
View File
@@ -43,8 +43,8 @@
// type -> /datum/category_item/partslathe/
var/static/list/partslathe_recipies
/obj/machinery/partslathe/New()
..()
/obj/machinery/partslathe/Initialize(mapload)
. = ..()
default_apply_parts()
update_icon()
update_recipe_list()
code/game/machinery/petrification.dm
+1 -1
View File
@@ -19,7 +19,7 @@
var/mob/living/carbon/human/target
var/list/remotes = list()
/obj/machinery/petrification/New()
/obj/machinery/petrification/Initialize(mapload)
. = ..()
if(!pixel_x && !pixel_y)
pixel_x = (dir & 3) ? 0 : (dir == 4 ? 26 : -26)
code/game/machinery/pipe/pipelayer.dm
+2 -2
View File
@@ -21,9 +21,9 @@
"heat exchange pipes" = /obj/machinery/atmospherics/pipe/simple/heat_exchanging
)
/obj/machinery/pipelayer/New()
/obj/machinery/pipelayer/Initialize(mapload)
. = ..()
W = new(src)
..()
default_apply_parts()
update_icon()
code/game/machinery/telecomms/presets.dm
+7 -7
View File
@@ -58,10 +58,10 @@
freq_listening = list(AI_FREQ, SCI_FREQ, MED_FREQ, SUP_FREQ, SRV_FREQ, COMM_FREQ, ENG_FREQ, SEC_FREQ, ENT_FREQ)
//Common and other radio frequencies for people to freely use
/obj/machinery/telecomms/receiver/preset_right/New()
/obj/machinery/telecomms/receiver/preset_right/Initialize(mapload)
for(var/i = PUBLIC_LOW_FREQ, i < PUBLIC_HIGH_FREQ, i += 2)
freq_listening |= i
..()
. = ..()
/obj/machinery/telecomms/receiver/preset_cent
id = "CentCom Receiver"
@@ -85,12 +85,12 @@
freq_listening = list(SUP_FREQ, SRV_FREQ)
autolinkers = list("processor2", "supply", "service", "unused")
/obj/machinery/telecomms/bus/preset_two/New()
/obj/machinery/telecomms/bus/preset_two/Initialize(mapload)
for(var/i = PUBLIC_LOW_FREQ, i < PUBLIC_HIGH_FREQ, i += 2)
if(i == PUB_FREQ)
continue
freq_listening |= i
..()
. = ..()
/obj/machinery/telecomms/bus/preset_three
id = "Bus 3"
@@ -176,12 +176,12 @@
freq_listening = list()
autolinkers = list("unused")
/obj/machinery/telecomms/server/presets/unused/New()
/obj/machinery/telecomms/server/presets/unused/Initialize(mapload)
for(var/i = PUBLIC_LOW_FREQ, i < PUBLIC_HIGH_FREQ, i += 2)
if(i == AI_FREQ || i == PUB_FREQ)
continue
freq_listening |= i
..()
. = ..()
/obj/machinery/telecomms/server/presets/command
id = "Command Server"
@@ -218,4 +218,4 @@
id = "CentCom Broadcaster"
network = "tcommsat"
produces_heat = 0
autolinkers = list("broadcasterCent")
autolinkers = list("broadcasterCent")
code/game/machinery/telecomms/telecomunications.dm
+8 -28
View File
@@ -113,9 +113,15 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
return 0
/obj/machinery/telecomms/New()
/obj/machinery/telecomms/Initialize(mapload)
telecomms_list += src
..()
default_apply_parts()
return INITIALIZE_HINT_LATELOAD
/obj/machinery/telecomms/LateInitialize()
. = ..()
//Set the listening_level if there's none.
if(!listening_level)
@@ -123,7 +129,6 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
var/turf/position = get_turf(src)
listening_level = position.z
/obj/machinery/telecomms/Initialize()
if(autolinkers.len)
// Links nearby machines
if(!long_range_link)
@@ -132,7 +137,6 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
else
for(var/obj/machinery/telecomms/T in telecomms_list)
add_link(T)
. = ..()
/obj/machinery/telecomms/Destroy()
telecomms_list -= src
@@ -267,10 +271,6 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
var/list/linked_radios_weakrefs = list()
/obj/machinery/telecomms/receiver/Initialize()
. = ..()
default_apply_parts()
/obj/machinery/telecomms/receiver/proc/link_radio(var/obj/item/radio/R)
if(!istype(R))
return
@@ -350,10 +350,6 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
long_range_link = 1
netspeed = 40
/obj/machinery/telecomms/hub/Initialize()
. = ..()
default_apply_parts()
/obj/machinery/telecomms/hub/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from)
if(is_freq_listening(signal))
if(istype(machine_from, /obj/machinery/telecomms/receiver))
@@ -390,10 +386,6 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
var/broadcasting = 1
var/receiving = 1
/obj/machinery/telecomms/relay/Initialize()
. = ..()
default_apply_parts()
/obj/machinery/telecomms/relay/forceMove(var/newloc)
. = ..(newloc)
listening_level = z
@@ -447,10 +439,6 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
netspeed = 40
var/change_frequency = 0
/obj/machinery/telecomms/bus/Initialize()
. = ..()
default_apply_parts()
/obj/machinery/telecomms/bus/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from)
if(is_freq_listening(signal))
@@ -503,10 +491,6 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
circuit = /obj/item/circuitboard/telecomms/processor
var/process_mode = 1 // 1 = Uncompress Signals, 0 = Compress Signals
/obj/machinery/telecomms/processor/Initialize()
. = ..()
default_apply_parts()
/obj/machinery/telecomms/processor/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from)
if(is_freq_listening(signal))
@@ -558,15 +542,11 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
// would add up to md5("password123comsat")
var/obj/item/radio/headset/server_radio = null
/obj/machinery/telecomms/server/New()
..()
/obj/machinery/telecomms/server/Initialize(mapload)
Compiler = new()
Compiler.Holder = src
server_radio = new()
/obj/machinery/telecomms/server/Initialize()
. = ..()
default_apply_parts()
/obj/machinery/telecomms/server/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from)
code/game/machinery/transformer.dm
+5 -5
View File
@@ -9,9 +9,9 @@
var/transform_dead = 0
var/transform_standing = 0
/obj/machinery/transformer/New()
/obj/machinery/transformer/Initialize(mapload)
. = ..()
// On us
..()
new /obj/machinery/conveyor(loc, WEST, 1)
/obj/machinery/transformer/Bumped(var/atom/movable/AM)
@@ -39,8 +39,8 @@
if(robot)
robot.SetLockDown(0)
/obj/machinery/transformer/conveyor/New()
..()
/obj/machinery/transformer/conveyor/Initialize(mapload)
. = ..()
var/turf/T = loc
if(T)
// Spawn Conveyour Belts
@@ -53,4 +53,4 @@
// West
var/turf/west = locate(T.x - 1, T.y, T.z)
if(istype(west, /turf/simulated/floor))
new /obj/machinery/conveyor(west, WEST, 1)
new /obj/machinery/conveyor(west, WEST, 1)
code/game/objects/effects/chem/coating.dm
+2 -2
View File
@@ -6,8 +6,8 @@
icon = 'icons/effects/effects.dmi'
icon_state = "dirt"
/obj/effect/decal/cleanable/chemcoating/New()
..()
/obj/effect/decal/cleanable/chemcoating/Initialize()
. = ..()
create_reagents(100)
/obj/effect/decal/cleanable/chemcoating/Initialize()
code/game/objects/effects/chem/foam.dm
+2 -2
View File
@@ -142,8 +142,8 @@
can_atmos_pass = ATMOS_PASS_NO
var/metal = 1 // 1 = aluminum, 2 = iron
/obj/structure/foamedmetal/New()
..()
/obj/structure/foamedmetal/Initialize(mapload)
. = ..()
update_nearby_tiles(1)
/obj/structure/foamedmetal/Destroy()
code/game/objects/effects/decals/Cleanable/misc.dm
+2 -2
View File
@@ -24,8 +24,8 @@
/obj/effect/decal/cleanable/greenglow
/obj/effect/decal/cleanable/greenglow/New()
..()
/obj/effect/decal/cleanable/greenglow/Initialize(mapload, _age)
. = ..()
QDEL_IN(src, 2 MINUTES)
/obj/effect/decal/cleanable/dirt
code/game/objects/effects/decals/cleanable.dm
+4 -4
View File
@@ -33,10 +33,10 @@ generic_filth = TRUE means when the decal is saved, it will be switched out for
return
..()
/obj/effect/decal/cleanable/New()
if (random_icon_states && length(src.random_icon_states) > 0)
src.icon_state = pick(src.random_icon_states)
..()
/obj/effect/decal/cleanable/Initialize(mapload, _age)
. = ..()
if (random_icon_states && length(random_icon_states) > 0)
icon_state = pick(random_icon_states)
/obj/effect/decal/cleanable/update_icon()
code/game/objects/effects/landmarks.dm
+78 -97
View File
@@ -8,46 +8,38 @@
invisibility = 100
var/delete_me = 0
/obj/effect/landmark/New()
..()
/obj/effect/landmark/Initialize(mapload)
. = ..()
tag = text("landmark*[]", name)
invisibility = 101
switch(name) //some of these are probably obsolete
if("monkey")
monkeystart += loc
delete_me = 1
return
delete_me = TRUE
if("start")
newplayer_start += loc
delete_me = 1
return
delete_me = TRUE
if("JoinLate") // Bit difference, since we need the spawn point to move.
latejoin += src
simulated = TRUE
// delete_me = 1
return
// delete_me = TRUE
if("JoinLateGateway")
latejoin_gateway += loc
latejoin += src //VOREStation Addition
// delete_me = 1
return
// delete_me = TRUE
if("JoinLateElevator")
latejoin_elevator += loc
delete_me = 1
return
delete_me = TRUE
if("JoinLateCryo")
latejoin_cryo += loc
delete_me = 1
return
delete_me = TRUE
if("JoinLateCyborg")
latejoin_cyborg += loc
delete_me = 1
return
delete_me = TRUE
if("prisonwarp")
prisonwarp += loc
delete_me = 1
return
delete_me = TRUE
if("Holding Facility")
holdingfacility += loc
if("tdome1")
@@ -60,39 +52,27 @@
tdomeobserve += loc
if("prisonsecuritywarp")
prisonsecuritywarp += loc
delete_me = 1
return
delete_me = TRUE
if("blobstart")
blobstart += loc
delete_me = 1
return
delete_me = TRUE
if("xeno_spawn")
xeno_spawn += loc
delete_me = 1
return
delete_me = TRUE
if("endgame_exit")
endgame_safespawns += loc
delete_me = 1
return
delete_me = TRUE
if("bluespacerift")
endgame_exits += loc
delete_me = 1
return
delete_me = TRUE
//VOREStation Add Start
if("vinestart")
vinestart += loc
delete_me = 1
return
delete_me = TRUE
//VORE Station Add End
landmarks_list += src
return 1
/obj/effect/landmark/proc/delete()
delete_me = 1
/obj/effect/landmark/Initialize()
. = ..()
if(delete_me)
return INITIALIZE_HINT_QDEL
@@ -108,16 +88,16 @@
icon_state = "x"
anchored = TRUE
/obj/effect/landmark/start/New()
..()
/obj/effect/landmark/start/Initialize(mapload)
. = ..()
tag = "start*[name]"
invisibility = 101
return 1
/obj/effect/landmark/forbidden_level
delete_me = 1
/obj/effect/landmark/forbidden_level/Initialize()
delete_me = TRUE
/obj/effect/landmark/forbidden_level/Initialize(mapload)
. = ..()
if(using_map)
using_map.secret_levels |= z
@@ -125,8 +105,9 @@
log_error("[type] mapped in but no using_map")
/obj/effect/landmark/hidden_level
delete_me = 1
/obj/effect/landmark/hidden_level/Initialize()
delete_me = TRUE
/obj/effect/landmark/hidden_level/Initialize(mapload)
. = ..()
if(using_map)
using_map.hidden_levels |= z
@@ -140,79 +121,80 @@
icon_state = "x"
anchored = TRUE
/obj/effect/landmark/virtual_reality/New()
..()
/obj/effect/landmark/virtual_reality/Initialize(mapload)
. = ..()
tag = "virtual_reality*[name]"
invisibility = 101
return 1
/obj/effect/landmark/costume
delete_me = TRUE
//Costume spawner landmarks
/obj/effect/landmark/costume/New() //costume spawner, selects a random subclass and disappears
var/list/options = typesof(/obj/effect/landmark/costume)
var/PICK= options[rand(1,options.len)]
new PICK(src.loc)
delete_me = 1
/obj/effect/landmark/costume/Initialize(mapload) //costume spawner, selects a random subclass and disappears
. = ..()
if(type == /obj/effect/landmark/costume)
var/list/options = subtypesof(/obj/effect/landmark/costume)
var/PICK= options[rand(1,options.len)]
new PICK(src.loc)
//SUBCLASSES. Spawn a bunch of items and disappear likewise
/obj/effect/landmark/costume/chicken/New()
/obj/effect/landmark/costume/chicken/Initialize(mapload)
. = ..()
new /obj/item/clothing/suit/chickensuit(src.loc)
new /obj/item/clothing/head/chicken(src.loc)
new /obj/item/reagent_containers/food/snacks/egg(src.loc)
delete_me = 1
/obj/effect/landmark/costume/gladiator/New()
/obj/effect/landmark/costume/gladiator/Initialize(mapload)
. = ..()
new /obj/item/clothing/under/gladiator(src.loc)
new /obj/item/clothing/head/helmet/gladiator(src.loc)
qdel(src)
/obj/effect/landmark/costume/madscientist/New()
/obj/effect/landmark/costume/madscientist/Initialize(mapload)
. = ..()
new /obj/item/clothing/under/suit_jacket/green(src.loc)
new /obj/item/clothing/head/flatcap(src.loc)
new /obj/item/clothing/suit/storage/toggle/labcoat/mad(src.loc)
new /obj/item/clothing/glasses/gglasses(src.loc)
delete_me = 1
/obj/effect/landmark/costume/elpresidente/New()
/obj/effect/landmark/costume/elpresidente/Initialize(mapload)
. = ..()
new /obj/item/clothing/under/suit_jacket/green(src.loc)
new /obj/item/clothing/head/flatcap(src.loc)
new /obj/item/clothing/mask/smokable/cigarette/cigar/havana(src.loc)
new /obj/item/clothing/shoes/boots/jackboots(src.loc)
delete_me = 1
/obj/effect/landmark/costume/nyangirl/New()
/obj/effect/landmark/costume/nyangirl/Initialize(mapload)
. = ..()
new /obj/item/clothing/under/schoolgirl(src.loc)
new /obj/item/clothing/head/kitty(src.loc)
delete_me = 1
/obj/effect/landmark/costume/maid/New()
/obj/effect/landmark/costume/maid/Initialize(mapload)
. = ..()
new /obj/item/clothing/under/skirt(src.loc)
var/CHOICE = pick( /obj/item/clothing/head/beret , /obj/item/clothing/head/rabbitears )
new CHOICE(src.loc)
new /obj/item/clothing/glasses/sunglasses/blindfold(src.loc)
delete_me = 1
/obj/effect/landmark/costume/butler/New()
/obj/effect/landmark/costume/butler/Initialize(mapload)
. = ..()
new /obj/item/clothing/accessory/wcoat(src.loc)
new /obj/item/clothing/under/suit_jacket(src.loc)
new /obj/item/clothing/head/that(src.loc)
delete_me = 1
/obj/effect/landmark/costume/scratch/New()
/obj/effect/landmark/costume/scratch/Initialize(mapload)
. = ..()
new /obj/item/clothing/gloves/white(src.loc)
new /obj/item/clothing/shoes/white(src.loc)
new /obj/item/clothing/under/scratch(src.loc)
if (prob(30))
new /obj/item/clothing/head/cueball(src.loc)
delete_me = 1
/obj/effect/landmark/costume/highlander/New()
/obj/effect/landmark/costume/highlander/Initialize(mapload)
. = ..()
new /obj/item/clothing/under/kilt(src.loc)
new /obj/item/clothing/head/beret(src.loc)
delete_me = 1
/obj/effect/landmark/costume/prig/New()
/obj/effect/landmark/costume/prig/Initialize(mapload)
. = ..()
new /obj/item/clothing/accessory/wcoat(src.loc)
new /obj/item/clothing/glasses/monocle(src.loc)
var/CHOICE= pick( /obj/item/clothing/head/bowler, /obj/item/clothing/head/that)
@@ -221,71 +203,70 @@
new /obj/item/cane(src.loc)
new /obj/item/clothing/under/sl_suit(src.loc)
new /obj/item/clothing/mask/fakemoustache(src.loc)
delete_me = 1
/obj/effect/landmark/costume/plaguedoctor/New()
/obj/effect/landmark/costume/plaguedoctor/Initialize(mapload)
. = ..()
new /obj/item/clothing/suit/bio_suit/plaguedoctorsuit(src.loc)
new /obj/item/clothing/head/plaguedoctorhat(src.loc)
delete_me = 1
/obj/effect/landmark/costume/nightowl/New()
/obj/effect/landmark/costume/nightowl/Initialize(mapload)
. = ..()
new /obj/item/clothing/under/owl(src.loc)
new /obj/item/clothing/mask/gas/owl_mask(src.loc)
delete_me = 1
/obj/effect/landmark/costume/waiter/New()
/obj/effect/landmark/costume/waiter/Initialize(mapload)
. = ..()
new /obj/item/clothing/under/waiter(src.loc)
var/CHOICE= pick( /obj/item/clothing/head/kitty, /obj/item/clothing/head/rabbitears)
new CHOICE(src.loc)
new /obj/item/clothing/suit/storage/apron(src.loc)
delete_me = 1
/obj/effect/landmark/costume/pirate/New()
/obj/effect/landmark/costume/pirate/Initialize(mapload)
. = ..()
new /obj/item/clothing/under/pirate(src.loc)
new /obj/item/clothing/suit/pirate(src.loc)
var/CHOICE = pick( /obj/item/clothing/head/pirate , /obj/item/clothing/head/bandana )
new CHOICE(src.loc)
new /obj/item/clothing/glasses/eyepatch(src.loc)
delete_me = 1
/obj/effect/landmark/costume/commie/New()
/obj/effect/landmark/costume/commie/Initialize(mapload)
. = ..()
new /obj/item/clothing/under/soviet(src.loc)
new /obj/item/clothing/head/ushanka(src.loc)
delete_me = 1
/obj/effect/landmark/costume/imperium_monk/New()
/obj/effect/landmark/costume/imperium_monk/Initialize(mapload)
. = ..()
new /obj/item/clothing/suit/imperium_monk(src.loc)
if (prob(25))
new /obj/item/clothing/mask/gas/cyborg(src.loc)
delete_me = 1
/obj/effect/landmark/costume/holiday_priest/New()
/obj/effect/landmark/costume/holiday_priest/Initialize(mapload)
. = ..()
new /obj/item/clothing/suit/holidaypriest(src.loc)
qdel(src)
/obj/effect/landmark/costume/marisawizard/fake/New()
/obj/effect/landmark/costume/marisawizard/fake/Initialize(mapload)
. = ..()
new /obj/item/clothing/head/wizard/marisa/fake(src.loc)
new/obj/item/clothing/suit/wizrobe/marisa/fake(src.loc)
delete_me = 1
/obj/effect/landmark/costume/cutewitch/New()
/obj/effect/landmark/costume/cutewitch/Initialize(mapload)
. = ..()
new /obj/item/clothing/under/sundress(src.loc)
new /obj/item/clothing/head/witchwig(src.loc)
new /obj/item/staff/broom(src.loc)
delete_me = 1
/obj/effect/landmark/costume/fakewizard/New()
/obj/effect/landmark/costume/fakewizard/Initialize(mapload)
. = ..()
new /obj/item/clothing/suit/wizrobe/fake(src.loc)
new /obj/item/clothing/head/wizard/fake(src.loc)
new /obj/item/staff/(src.loc)
delete_me = 1
/obj/effect/landmark/costume/sexyclown/New()
/obj/effect/landmark/costume/sexyclown/Initialize(mapload)
. = ..()
new /obj/item/clothing/mask/gas/sexyclown(src.loc)
new /obj/item/clothing/under/sexyclown(src.loc)
delete_me = 1
/obj/effect/landmark/costume/sexymime/New()
/obj/effect/landmark/costume/sexymime/Initialize(mapload)
. = ..()
new /obj/item/clothing/mask/gas/sexymime(src.loc)
new /obj/item/clothing/under/sexymime(src.loc)
delete_me = 1
code/game/objects/effects/landmarks_events.dm
+4 -4
View File
@@ -16,8 +16,8 @@ Admin verb is called by code\modules\admin\verbs\event_triggers.dm
var/isLoud = FALSE
var/isNarrate = FALSE
/obj/effect/landmark/event_trigger/New()
..()
/obj/effect/landmark/event_trigger/Initialize()
. = ..()
coordinates = "(X:[loc.x];Y:[loc.y];Z:[loc.z])"
/obj/effect/landmark/event_trigger/proc/set_vars(mob/M)
@@ -89,9 +89,9 @@ Admin verb is called by code\modules\admin\verbs\event_triggers.dm
var/isWarning = FALSE //For personal messages
isNarrate = TRUE
/obj/effect/landmark/event_trigger/auto_narrate/New()
/obj/effect/landmark/event_trigger/auto_narrate/Initialize()
. = ..()
message_range = world.view
..()
/obj/effect/landmark/event_trigger/auto_narrate/set_vars(mob/M)
..()
code/game/objects/effects/overlays.dm
+3 -3
View File
@@ -10,9 +10,9 @@
plane = ABOVE_OBJ_PLANE
var/tmp/atom/BeamSource
/obj/effect/overlay/beam/New()
..()
spawn(10) qdel(src)
/obj/effect/overlay/beam/Initialize(mapload)
. = ..()
QDEL_IN(src, 1 SECOND)
/obj/effect/overlay/palmtree_r
name = "Palm tree"
code/game/objects/effects/temporary_visuals/projectiles/projectile_effects.dm
+3 -3
View File
@@ -31,10 +31,10 @@
M.Turn(angle)
transform = M
/obj/effect/projectile/New(angle_override, p_x, p_y, color_override, scaling = 1)
/obj/effect/projectile/Initialize(mapload, angle_override, p_x, p_y, color_override, scaling = 1)
. = ..()
if(angle_override && p_x && p_y && color_override && scaling)
apply_vars(angle_override, p_x, p_y, color_override, scaling)
return ..()
/obj/effect/projectile/proc/apply_vars(angle_override, p_x = 0, p_y = 0, color_override, scaling = 1, new_loc, increment = 0)
var/mutable_appearance/look = new(src)
@@ -54,7 +54,7 @@
/obj/effect/projectile_lighting
var/owner
/obj/effect/projectile_lighting/New(loc, color, range, intensity, owner_key)
/obj/effect/projectile_lighting/Initialize(mapload, color, range, intensity, owner_key)
. = ..()
set_light(range, intensity, color)
owner = owner_key
code/game/objects/items/devices/communicator/communicator.dm
+1 -1
View File
@@ -267,7 +267,7 @@ var/global/list/obj/item/communicator/all_communicators = list()
// Proc: New()
// Parameters: None
// Description: Gives ghosts an exonet address based on their key and ghost name.
/mob/observer/dead/Initialize()
/mob/observer/dead/Initialize(mapload)
. = ..()
exonet = new(src)
if(client)
code/game/objects/items/devices/radio/radio.dm
+8 -6
View File
@@ -73,7 +73,7 @@ var/global/list/default_medbay_channels = list(
frequency = new_frequency
radio_connection = radio_controller.add_object(src, frequency, RADIO_CHAT)
/obj/item/radio/Initialize()
/obj/item/radio/Initialize(mapload)
. = ..()
if(frequency < RADIO_LOW_FREQ || frequency > RADIO_HIGH_FREQ)
frequency = sanitize_frequency(frequency, RADIO_LOW_FREQ, RADIO_HIGH_FREQ)
@@ -82,6 +82,13 @@ var/global/list/default_medbay_channels = list(
for (var/ch_name in channels)
secure_radio_connections[ch_name] = radio_controller.add_object(src, radiochannels[ch_name], RADIO_CHAT)
wires = new(src)
internal_channels = default_internal_channels.Copy()
listening_objects += src
return INITIALIZE_HINT_LATELOAD
/obj/item/radio/LateInitialize()
. = ..()
if(bluespace_radio)
if(bs_tx_preload_id)
//Try to find a receiver
@@ -118,11 +125,6 @@ var/global/list/default_medbay_channels = list(
if(!found)
testing("A radio [src] at [x],[y],[z] specified bluespace prelink IDs, but the machines with corresponding IDs ([bs_tx_preload_id], [bs_rx_preload_id]) couldn't be found.")
wires = new(src)
internal_channels = default_internal_channels.Copy()
listening_objects += src
return INITIALIZE_HINT_LATELOAD
/obj/item/radio/Destroy()
qdel(wires)
wires = null
code/game/objects/items/poi_items.dm
+6 -5
View File
@@ -28,9 +28,9 @@
desc = "The top of this twisted chunk of metal is faintly stamped with a five pointed star. 'Property of US Army, Pascal B - 1957'."
catalogue_data = list(/datum/category_item/catalogue/information/objects/pascalb)
/obj/item/poi/pascalb/New()
/obj/item/poi/pascalb/Initialize(mapload)
. = ..()
START_PROCESSING(SSobj, src)
return ..()
/obj/item/poi/pascalb/process()
SSradiation.radiate(src, 5)
@@ -75,9 +75,9 @@
desc = "This broken hunk of machinery looks extremely dangerous."
catalogue_data = list(/datum/category_item/catalogue/information/objects/oldreactor)
/obj/item/poi/brokenoldreactor/New()
/obj/item/poi/brokenoldreactor/Initialize(mapload)
. = ..()
START_PROCESSING(SSobj, src)
return ..()
/obj/item/poi/brokenoldreactor/process()
SSradiation.radiate(src, 25)
@@ -136,7 +136,8 @@
var/has_paper = FALSE
/obj/item/poi/broken_drone_circuit/New()
/obj/item/poi/broken_drone_circuit/Initialize(mapload)
. = ..()
drone_name = "[pick(list("ADA","DOS","GNU","MAC","WIN","NJS","SKS","DRD","IOS","CRM","IBM","TEX","LVM","BSD",))]-[rand(1000, 9999)]]"
var/new_canalyzer = "[drone_name] [examine_canalyzer]" //Only way I could think to dynamically insert drone name here
examine_canalyzer = new_canalyzer
code/game/objects/items/robot/robot_items.dm
+4 -6
View File
@@ -81,10 +81,9 @@
icon_state = "healthhud"
icon = 'icons/inventory/eyes/item.dmi'
/obj/item/borg/sight/hud/med/New()
..()
/obj/item/borg/sight/hud/med/Initialize(mapload)
. = ..()
hud = new /obj/item/clothing/glasses/hud/health(src)
return
/obj/item/borg/sight/hud/sec
@@ -92,7 +91,6 @@
icon_state = "securityhud"
icon = 'icons/inventory/eyes/item.dmi'
/obj/item/borg/sight/hud/sec/New()
..()
/obj/item/borg/sight/hud/sec/Initialize(mapload)
. = ..()
hud = new /obj/item/clothing/glasses/hud/security(src)
return
code/game/objects/items/stacks/marker_beacons.dm
+1 -1
View File
@@ -93,7 +93,7 @@ var/list/marker_beacon_colors = list(
var/perma = FALSE
var/mapped_in_color
/obj/structure/marker_beacon/New(newloc, set_color)
/obj/structure/marker_beacon/Initialize(mapload, set_color)
. = ..()
if(set_color)
picked_color = set_color
code/game/objects/items/toys/toys.dm
+4 -3
View File
@@ -36,7 +36,8 @@
icon_state = "waterballoon-e"
drop_sound = 'sound/items/drop/rubber.ogg'
/obj/item/toy/balloon/New()
/obj/item/toy/balloon/Initialize(mapload)
. = ..()
var/datum/reagents/R = new/datum/reagents(10)
reagents = R
R.my_atom = src
@@ -300,8 +301,8 @@
var/toysay = "What the fuck did you do?"
drop_sound = 'sound/items/drop/accessory.ogg'
/obj/item/toy/figure/New()
..()
/obj/item/toy/figure/Initialize(mapload)
. = ..()
desc = "A \"Space Life\" brand [name]"
/obj/item/toy/figure/attack_self(mob/user as mob)
code/game/objects/items/weapons/candle.dm
+2 -2
View File
@@ -10,9 +10,9 @@
var/wax = 2000
var/icon_type = "candle"
/obj/item/flame/candle/New()
/obj/item/flame/candle/Initialize(mapload)
. = ..()
wax -= rand(800, 1000) // Enough for 27-33 minutes. 30 minutes on average.
..()
/obj/item/flame/candle/update_icon()
var/i
code/game/objects/items/weapons/chewables.dm
+2 -2
View File
@@ -171,12 +171,12 @@
var/open_state
var/closed_state
/obj/item/storage/box/fancy/chewables/tobacco/nico/New()
/obj/item/storage/box/fancy/chewables/tobacco/nico/Initialize(mapload)
. = ..()
if(!open_state)
open_state = "[initial(icon_state)]0"
if(!closed_state)
closed_state = "[initial(icon_state)]"
..()
/obj/item/storage/box/fancy/chewables/tobacco/nico/update_icon()
cut_overlays()
code/game/objects/items/weapons/cigs_lighters.dm
+2 -2
View File
@@ -424,8 +424,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
ignitermes = span_notice("USER fiddles with FLAME, and manages to light their NAME with the power of science.")
is_pipe = 1
/obj/item/clothing/mask/smokable/pipe/New()
..()
/obj/item/clothing/mask/smokable/pipe/Initialize()
. = ..()
name = "empty [initial(name)]"
/obj/item/clothing/mask/smokable/pipe/attack_self(mob/user as mob)
code/game/objects/items/weapons/clown_items.dm
+1 -1
View File
@@ -17,7 +17,7 @@
/*
* Soap
*/
/obj/item/soap/Initialize()
/obj/item/soap/Initialize(mapload)
. = ..()
create_reagents(5)
wet()
code/game/objects/items/weapons/cosmetics.dm
+2 -1
View File
@@ -26,7 +26,8 @@
/obj/item/lipstick/random
name = "lipstick"
/obj/item/lipstick/random/New()
/obj/item/lipstick/random/Initialize(mapload)
. = ..()
colour = pick("red","purple","jade","black")
name = "[colour] lipstick"
code/game/objects/items/weapons/ecigs.dm
+35 -27
View File
@@ -18,8 +18,8 @@
var/icon_empty
var/ecig_colors = list(null, COLOR_DARK_GRAY, COLOR_RED_GRAY, COLOR_BLUE_GRAY, COLOR_GREEN_GRAY, COLOR_PURPLE_GRAY)
/obj/item/clothing/mask/smokable/ecig/New()
..()
/obj/item/clothing/mask/smokable/ecig/Initialize(mapload)
. = ..()
ec_cartridge = new cartridge_type(src)
/obj/item/clothing/mask/smokable/ecig/examine(mob/user)
@@ -61,8 +61,9 @@
icon_off = "ecigoff1"
icon_empty = "ecigoff1"
icon_on = "ecigon"
/obj/item/clothing/mask/smokable/ecig/util/New()
..()
/obj/item/clothing/mask/smokable/ecig/util/Initialize(mapload)
. = ..()
color = pick(ecig_colors)
/obj/item/clothing/mask/smokable/ecig/deluxe
@@ -152,9 +153,7 @@
matter = list(MAT_STEEL = 50, MAT_GLASS = 10)
volume = 20
flags = OPENCONTAINER
/obj/item/reagent_containers/ecig_cartridge/New()
create_reagents(volume)
possible_transfer_amounts = null
/obj/item/reagent_containers/ecig_cartridge/examine(mob/user as mob)//to see how much left
. = ..()
@@ -168,32 +167,36 @@
/obj/item/reagent_containers/ecig_cartridge/blanknico
name = "flavorless nicotine cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says you can add whatever flavoring agents you want."
/obj/item/reagent_containers/ecig_cartridge/blanknico/New()
..()
/obj/item/reagent_containers/ecig_cartridge/blanknico/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
/obj/item/reagent_containers/ecig_cartridge/med_nicotine
name = "tobacco flavour cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its tobacco flavored."
/obj/item/reagent_containers/ecig_cartridge/med_nicotine/New()
..()
/obj/item/reagent_containers/ecig_cartridge/med_nicotine/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 15)
/obj/item/reagent_containers/ecig_cartridge/high_nicotine
name = "high nicotine tobacco flavour cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its tobacco flavored, with extra nicotine."
/obj/item/reagent_containers/ecig_cartridge/high_nicotine/New()
..()
/obj/item/reagent_containers/ecig_cartridge/high_nicotine/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_NICOTINE, 10)
reagents.add_reagent(REAGENT_ID_WATER, 10)
/obj/item/reagent_containers/ecig_cartridge/orange
name = "orange flavour cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its orange flavored."
/obj/item/reagent_containers/ecig_cartridge/orange/New()
..()
/obj/item/reagent_containers/ecig_cartridge/orange/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent(REAGENT_ID_ORANGEJUICE, 5)
@@ -201,8 +204,9 @@
/obj/item/reagent_containers/ecig_cartridge/mint
name = "mint flavour cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its mint flavored."
/obj/item/reagent_containers/ecig_cartridge/mint/New()
..()
/obj/item/reagent_containers/ecig_cartridge/mint/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent(REAGENT_ID_MENTHOL, 5)
@@ -210,8 +214,8 @@
/obj/item/reagent_containers/ecig_cartridge/watermelon
name = "watermelon flavour cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its watermelon flavored."
/obj/item/reagent_containers/ecig_cartridge/watermelon/New()
..()
/obj/item/reagent_containers/ecig_cartridge/watermelon/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent(REAGENT_ID_WATERMELONJUICE, 5)
@@ -219,8 +223,9 @@
/obj/item/reagent_containers/ecig_cartridge/grape
name = "grape flavour cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its grape flavored."
/obj/item/reagent_containers/ecig_cartridge/grape/New()
..()
/obj/item/reagent_containers/ecig_cartridge/grape/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent(REAGENT_ID_GRAPEJUICE, 5)
@@ -228,8 +233,9 @@
/obj/item/reagent_containers/ecig_cartridge/lemonlime
name = "lemon-lime flavour cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its lemon-lime flavored."
/obj/item/reagent_containers/ecig_cartridge/lemonlime/New()
..()
/obj/item/reagent_containers/ecig_cartridge/lemonlime/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent(REAGENT_ID_LEMONLIME, 5)
@@ -237,8 +243,9 @@
/obj/item/reagent_containers/ecig_cartridge/coffee
name = "coffee flavour cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its coffee flavored."
/obj/item/reagent_containers/ecig_cartridge/coffee/New()
..()
/obj/item/reagent_containers/ecig_cartridge/coffee/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent(REAGENT_ID_COFFEE, 5)
@@ -246,8 +253,9 @@
/obj/item/reagent_containers/ecig_cartridge/cannabis
name = "herb flavour cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label seems to be suspiciously scuffed off..."
/obj/item/reagent_containers/ecig_cartridge/cannabis/New()
..()
/obj/item/reagent_containers/ecig_cartridge/cannabis/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent("cannabis", 5)
code/game/objects/items/weapons/explosives.dm
+2 -2
View File
@@ -18,10 +18,10 @@
var/blast_light = 2
var/blast_flash = 3
/obj/item/plastique/New()
/obj/item/plastique/Initialize(mapload)
. = ..()
wires = new(src)
image_overlay = image('icons/obj/assemblies.dmi', "plastic-explosive2")
..()
/obj/item/plastique/Destroy()
qdel(wires)
code/game/objects/items/weapons/grenades/flashbang.dm
+6 -10
View File
@@ -135,8 +135,8 @@
can_repeat = FALSE
banglet = TRUE
/obj/item/grenade/flashbang/clusterbang/segment/New()//Segments should never exist except part of the clusterbang, since these immediately 'do their thing' and asplode
..()
/obj/item/grenade/flashbang/clusterbang/segment/Initialize(mapload) //Segments should never exist except part of the clusterbang, since these immediately 'do their thing' and asplode
. = ..()
icon_state = "clusterbang_segment_active"
@@ -144,15 +144,13 @@
var/temploc = src.loc//Saves the current location to know where to step away from
walk_away(src,temploc,stepdist)//I must go, my people need me
var/dettime = rand(15,60)
spawn(dettime)
detonate()
addtimer(CALLBACK(src, PROC_REF(detonate)), rand(15, 60), TIMER_DELETE_ME)
/obj/item/grenade/flashbang/cluster
banglet = TRUE
/obj/item/grenade/flashbang/cluster/New()//Same concept as the segments, so that all of the parts don't become reliant on the clusterbang
..()
/obj/item/grenade/flashbang/cluster/Initialize(mapload)//Same concept as the segments, so that all of the parts don't become reliant on the clusterbang
. = ..()
icon_state = "flashbang_active"
@@ -160,6 +158,4 @@
var/temploc = src.loc
walk_away(src,temploc,stepdist)
var/dettime = rand(15,60)
spawn(dettime)
detonate()
addtimer(CALLBACK(src, PROC_REF(detonate)), rand(15, 60), TIMER_DELETE_ME)
code/game/objects/items/weapons/id cards/cards.dm
+2 -2
View File
@@ -27,7 +27,7 @@
drop_sound = 'sound/items/drop/card.ogg'
pickup_sound = 'sound/items/pickup/card.ogg'
/obj/item/card/New()
/obj/item/card/Initialize(mapload)
. = ..()
reset_icon()
@@ -299,4 +299,4 @@
UnregisterSignal(src, COMSIG_OBSERVER_MOVED)
R = null
last_robot_loc = null
..()
. = ..()
code/game/objects/items/weapons/implants/implant_vr.dm
+5 -7
View File
@@ -128,11 +128,10 @@
'Ignore' - keywords in the speech won't have any effect.
'Implant-toggle' - toggles implant."}
/obj/item/implanter/sizecontrol/New()
/obj/item/implanter/sizecontrol/Initialize(mapload)
. = ..()
src.imp = new /obj/item/implant/sizecontrol( src )
..()
update()
return
//////////////////////////////
@@ -153,11 +152,10 @@ Due to the small chemical capacity of the implant, the life of the implant is re
safeties to prevent lethal or actively harmful commands from being input to lessen the severity of the crime if they are caught. This one has a golden stamp \
with the shape of a star on it, the letters 'KE' in black text on it."
/obj/item/implanter/compliance/New()
src.imp = new /obj/item/implant/compliance( src )
..()
/obj/item/implanter/compliance/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/compliance(src)
update()
return
/obj/item/implanter/compliance/attack_self(mob/user)
if(istype(imp,/obj/item/implant/compliance))
code/game/objects/items/weapons/implants/implantcase.dm
+90 -114
View File
@@ -12,51 +12,51 @@
var/obj/item/implant/imp = null
/obj/item/implantcase/proc/update()
if (src.imp)
src.icon_state = text("implantcase-[]", src.imp.implant_color)
if (imp)
icon_state = text("implantcase-[]", imp.implant_color)
else
src.icon_state = "implantcase-0"
icon_state = "implantcase-0"
return
/obj/item/implantcase/attackby(obj/item/I as obj, mob/user as mob)
..()
if (istype(I, /obj/item/pen))
var/t = tgui_input_text(user, "What would you like the label to be?", text("[]", src.name), null, MAX_NAME_LEN)
var/t = tgui_input_text(user, "What would you like the label to be?", text("[]", name), null, MAX_NAME_LEN)
if (user.get_active_hand() != I)
return
if((!in_range(src, user) && src.loc != user))
if((!in_range(src, user) && loc != user))
return
t = sanitizeSafe(t, MAX_NAME_LEN)
if(t)
src.name = text("Glass Case - '[]'", t)
name = text("Glass Case - '[]'", t)
else
src.name = "Glass Case"
name = "Glass Case"
else if(istype(I, /obj/item/reagent_containers/syringe))
if(!src.imp) return
if(!src.imp.allow_reagents) return
if(src.imp.reagents.total_volume >= src.imp.reagents.maximum_volume)
if(!imp) return
if(!imp.allow_reagents) return
if(imp.reagents.total_volume >= imp.reagents.maximum_volume)
to_chat(user, span_warning("\The [src] is full."))
else
spawn(5)
I.reagents.trans_to_obj(src.imp, 5)
I.reagents.trans_to_obj(imp, 5)
to_chat(user, span_notice("You inject 5 units of the solution. The syringe now contains [I.reagents.total_volume] units."))
else if (istype(I, /obj/item/implanter))
var/obj/item/implanter/M = I
if (M.imp)
if ((src.imp || M.imp.implanted))
if ((imp || M.imp.implanted))
return
M.imp.loc = src
src.imp = M.imp
imp = M.imp
M.imp = null
src.update()
update()
M.update()
else
if (src.imp)
if (imp)
if (M.imp)
return
src.imp.loc = M
M.imp = src.imp
src.imp = null
imp.loc = M
M.imp = imp
imp = null
update()
M.update()
return
@@ -67,10 +67,9 @@
desc = "A case containing a tracking implant."
icon_state = "implantcase-b"
/obj/item/implantcase/tracking/New()
src.imp = new /obj/item/implant/tracking( src )
..()
return
/obj/item/implantcase/tracking/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/tracking(src)
/obj/item/implantcase/explosive
@@ -78,10 +77,9 @@
desc = "A case containing an explosive implant."
icon_state = "implantcase-r"
/obj/item/implantcase/explosive/New()
src.imp = new /obj/item/implant/explosive( src )
..()
return
/obj/item/implantcase/explosive/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/explosive(src)
/obj/item/implantcase/chem
@@ -89,10 +87,9 @@
desc = "A case containing a chemical implant."
icon_state = "implantcase-b"
/obj/item/implantcase/chem/New()
src.imp = new /obj/item/implant/chem( src )
..()
return
/obj/item/implantcase/chem/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/chem(src)
/obj/item/implantcase/loyalty
@@ -100,10 +97,9 @@
desc = "A case containing a loyalty implant."
icon_state = "implantcase-r"
/obj/item/implantcase/loyalty/New()
src.imp = new /obj/item/implant/loyalty( src )
..()
return
/obj/item/implantcase/loyalty/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/loyalty(src)
/obj/item/implantcase/death_alarm
@@ -111,10 +107,9 @@
desc = "A case containing a death alarm implant."
icon_state = "implantcase-b"
/obj/item/implantcase/death_alarm/New()
src.imp = new /obj/item/implant/death_alarm( src )
..()
return
/obj/item/implantcase/death_alarm/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/death_alarm(src)
/obj/item/implantcase/freedom
@@ -122,10 +117,9 @@
desc = "A case containing a freedom implant."
icon_state = "implantcase-r"
/obj/item/implantcase/freedom/New()
src.imp = new /obj/item/implant/freedom( src )
..()
return
/obj/item/implantcase/freedom/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/freedom(src)
/obj/item/implantcase/adrenalin
@@ -133,10 +127,9 @@
desc = "A case containing an adrenalin implant."
icon_state = "implantcase-b"
/obj/item/implantcase/adrenalin/New()
src.imp = new /obj/item/implant/adrenalin( src )
..()
return
/obj/item/implantcase/adrenalin/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/adrenalin(src)
/obj/item/implantcase/dexplosive
@@ -144,10 +137,9 @@
desc = "A case containing an explosive."
icon_state = "implantcase-r"
/obj/item/implantcase/dexplosive/New()
src.imp = new /obj/item/implant/dexplosive( src )
..()
return
/obj/item/implantcase/dexplosive/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/dexplosive(src)
/obj/item/implantcase/health
@@ -155,157 +147,141 @@
desc = "A case containing a health tracking implant."
icon_state = "implantcase-b"
/obj/item/implantcase/health/New()
src.imp = new /obj/item/implant/health( src )
..()
return
/obj/item/implantcase/health/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/health(src)
/obj/item/implantcase/language
name = "glass case - 'GalCom'"
desc = "A case containing a GalCom language implant."
icon_state = "implantcase-b"
/obj/item/implantcase/language/New()
src.imp = new /obj/item/implant/language( src )
..()
return
/obj/item/implantcase/language/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/language(src)
/obj/item/implantcase/language/eal
name = "glass case - 'EAL'"
desc = "A case containing an Encoded Audio Language implant."
icon_state = "implantcase-b"
/obj/item/implantcase/language/eal/New()
src.imp = new /obj/item/implant/language/eal( src )
..()
return
/obj/item/implantcase/language/eal/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/language/eal(src)
/obj/item/implantcase/shades
name = "glass case - 'Integrated Shades'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/implantcase/shades/New()
src.imp = new /obj/item/implant/organ( src )
..()
return
/obj/item/implantcase/shades/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/organ(src)
/obj/item/implantcase/taser
name = "glass case - 'Taser'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/implantcase/taser/New()
src.imp = new /obj/item/implant/organ/limbaugment( src )
..()
return
/obj/item/implantcase/taser/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/organ/limbaugment(src)
/obj/item/implantcase/laser
name = "glass case - 'Laser'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/implantcase/laser/New()
src.imp = new /obj/item/implant/organ/limbaugment/laser( src )
..()
return
/obj/item/implantcase/laser/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/organ/limbaugment/laser(src)
/obj/item/implantcase/dart
name = "glass case - 'Dart'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/implantcase/dart/New()
src.imp = new /obj/item/implant/organ/limbaugment/dart( src )
..()
return
/obj/item/implantcase/dart/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/organ/limbaugment/dart(src)
/obj/item/implantcase/toolkit
name = "glass case - 'Toolkit'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/implantcase/toolkit/New()
src.imp = new /obj/item/implant/organ/limbaugment/upperarm( src )
..()
return
/obj/item/implantcase/toolkit/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/organ/limbaugment/upperarm(src)
/obj/item/implantcase/medkit
name = "glass case - 'Toolkit'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/implantcase/medkit/New()
src.imp = new /obj/item/implant/organ/limbaugment/upperarm/medkit( src )
..()
return
/obj/item/implantcase/medkit/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/organ/limbaugment/upperarm/medkit(src)
/obj/item/implantcase/surge
name = "glass case - 'Muscle Overclocker'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/implantcase/surge/New()
src.imp = new /obj/item/implant/organ/limbaugment/upperarm/surge( src )
..()
return
/obj/item/implantcase/surge/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/organ/limbaugment/upperarm/surge(src)
/obj/item/implantcase/analyzer
name = "glass case - 'Scanner'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/implantcase/analyzer/New()
src.imp = new /obj/item/implant/organ/limbaugment/wrist( src )
..()
return
/obj/item/implantcase/analyzer/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/organ/limbaugment/wrist(src)
/obj/item/implantcase/sword
name = "glass case - 'Scanner'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/implantcase/sword/New()
src.imp = new /obj/item/implant/organ/limbaugment/wrist/sword( src )
..()
return
/obj/item/implantcase/sword/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/organ/limbaugment/wrist/sword(src)
/obj/item/implantcase/sprinter
name = "glass case - 'Sprinter'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/implantcase/sprinter/New()
src.imp = new /obj/item/implant/organ/pelvic( src )
..()
return
/obj/item/implantcase/sprinter/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/organ/pelvic(src)
/obj/item/implantcase/armblade
name = "glass case - 'Armblade'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/implantcase/armblade/New()
src.imp = new /obj/item/implant/organ/limbaugment/upperarm/blade( src )
..()
return
/obj/item/implantcase/armblade/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/organ/limbaugment/upperarm/blade(src)
/obj/item/implantcase/handblade
name = "glass case - 'Handblade'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/implantcase/handblade/New()
src.imp = new /obj/item/implant/organ/limbaugment/wrist/blade( src )
..()
return
/obj/item/implantcase/handblade/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/organ/limbaugment/wrist/blade(src)
/obj/item/implantcase/restrainingbolt
name = "glass case - 'Restraining Bolt'"
desc = "A case containing a restraining bolt."
icon_state = "implantcase-b"
/obj/item/implantcase/restrainingbolt/New()
src.imp = new /obj/item/implant/restrainingbolt( src )
..()
return
/obj/item/implantcase/restrainingbolt/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/restrainingbolt(src)
code/game/objects/items/weapons/implants/implantcase_vr.dm
+3 -4
View File
@@ -3,7 +3,6 @@
desc = "A case containing a language implant."
icon_state = "implantcase-r"
/obj/item/implantcase/vrlanguage/New()
src.imp = new /obj/item/implant/vrlanguage( src )
..()
return
/obj/item/implantcase/vrlanguage/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/vrlanguage(src)
code/game/objects/items/weapons/implants/implanter.dm
+15 -20
View File
@@ -77,39 +77,35 @@
/obj/item/implanter/loyalty
name = "implanter-loyalty"
/obj/item/implanter/loyalty/New()
src.imp = new /obj/item/implant/loyalty( src )
..()
/obj/item/implanter/loyalty/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/loyalty(src)
update()
return
/obj/item/implanter/explosive
name = "implanter (E)"
/obj/item/implanter/explosive/New()
src.imp = new /obj/item/implant/explosive( src )
..()
/obj/item/implanter/explosive/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/explosive(src)
update()
return
/obj/item/implanter/adrenalin
name = "implanter-adrenalin"
/obj/item/implanter/adrenalin/New()
src.imp = new /obj/item/implant/adrenalin(src)
..()
/obj/item/implanter/adrenalin/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/adrenalin(src)
update()
return
/obj/item/implanter/compressed
name = "implanter (C)"
icon_state = "cimplanter1"
/obj/item/implanter/compressed/New()
imp = new /obj/item/implant/compressed( src )
..()
/obj/item/implanter/compressed/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/compressed(src)
update()
return
/obj/item/implanter/compressed/update()
if (imp)
@@ -158,8 +154,7 @@
/obj/item/implanter/restrainingbolt
name = "implanter (bolt)"
/obj/item/implanter/restrainingbolt/New()
src.imp = new /obj/item/implant/restrainingbolt( src )
..()
/obj/item/implanter/restrainingbolt/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/restrainingbolt(src)
update()
return
code/game/objects/items/weapons/implants/implantfreedom.dm
+4 -5
View File
@@ -8,11 +8,10 @@
var/uses = 1.0
/obj/item/implant/freedom/New()
src.activation_emote = pick("blink", "blink_r", "eyebrow", "chuckle", "twitch", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
src.uses = rand(1, 5)
..()
return
/obj/item/implant/freedom/Initialize(mapload)
. = ..()
activation_emote = pick("blink", "blink_r", "eyebrow", "chuckle", "twitch", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
uses = rand(1, 5)
/obj/item/implant/freedom/trigger(emote, mob/living/carbon/source as mob)
code/game/objects/items/weapons/implants/implantreagent_vr.dm
+4 -5
View File
@@ -17,18 +17,17 @@
var/verb_name = "Transfer From Reagent Implant"
var/verb_desc = "Remove reagents from an internal reagent into a container"
/obj/item/implant/reagent_generator/New()
..()
/obj/item/implant/reagent_generator/Initialize(mapload)
. = ..()
create_reagents(usable_volume)
/obj/item/implanter/reagent_generator
var/implant_type = /obj/item/implant/reagent_generator
/obj/item/implanter/reagent_generator/New()
..()
/obj/item/implanter/reagent_generator/Initialize(mapload)
. = ..()
imp = new implant_type(src)
update()
return
/obj/item/implant/reagent_generator/post_implant(mob/living/carbon/source)
START_PROCESSING(SSobj, src)
code/game/objects/items/weapons/inducer_vr.dm
+2 -2
View File
@@ -257,8 +257,8 @@
var/mob/living/carbon/human/hume
/obj/item/cell/standin/New(newloc, var/mob/living/carbon/human/H)
..()
/obj/item/cell/standin/Initialize(mapload, var/mob/living/carbon/human/H)
. = ..()
hume = H
charge = H.nutrition
maxcharge = initial(H.nutrition)
code/game/objects/items/weapons/material/material_weapons.dm
+3 -4
View File
@@ -27,14 +27,13 @@
var/datum/material/material
var/drops_debris = 1
/obj/item/material/New(var/newloc, var/material_key)
..(newloc)
/obj/item/material/Initialize(mapload, var/material_key)
. = ..()
if(!material_key)
material_key = default_material
set_material(material_key)
if(!material)
qdel(src)
return
return INITIALIZE_HINT_QDEL
matter = material.get_matter()
if(matter.len)
code/game/objects/items/weapons/material/shards.dm
+4 -4
View File
@@ -143,8 +143,8 @@
return
// Preset types - left here for the code that uses them
/obj/item/material/shard/shrapnel/New(loc)
..(loc, MAT_STEEL)
/obj/item/material/shard/shrapnel/Initialize(mapload)
. = ..(mapload, MAT_STEEL)
/obj/item/material/shard/phoron/New(loc)
..(loc, MAT_PGLASS)
/obj/item/material/shard/phoron/Initialize(mapload)
. = ..(mapload, MAT_PGLASS)
code/game/objects/items/weapons/material/thrown.dm
+4 -4
View File
@@ -9,10 +9,10 @@
sharp = TRUE
edge = TRUE
/obj/item/material/star/New()
..()
src.pixel_x = rand(-12, 12)
src.pixel_y = rand(-12, 12)
/obj/item/material/star/Initialize(mapload)
. = ..()
pixel_x = rand(-12, 12)
pixel_y = rand(-12, 12)
/obj/item/material/star/throw_impact(atom/hit_atom)
..()
code/game/objects/items/weapons/material/twohanded.dm
+2 -2
View File
@@ -56,8 +56,8 @@
throwforce = round(force*thrown_force_divisor)
//to_world("[src] has unwielded force [force_unwielded], wielded force [force_wielded] and throwforce [throwforce] when made from default material [material.name]")
/obj/item/material/twohanded/New()
..()
/obj/item/material/twohanded/Initialize(mapload)
. = ..()
update_icon()
//Allow a small chance of parrying melee attacks when wielded - maybe generalize this to other weapons someday
code/game/objects/items/weapons/material/whetstone.dm
+1 -1
View File
@@ -43,7 +43,7 @@
. = ..()
. += "There [uses == 1 ? "is" : "are"] [uses] [material] [uses == 1 ? src.material.sheet_singular_name : src.material.sheet_plural_name] left for use."
/obj/item/material/sharpeningkit/New()
/obj/item/material/sharpeningkit/Initialize(mapload)
. = ..()
setrepair()
code/game/objects/items/weapons/melee/misc.dm
+4 -4
View File
@@ -37,8 +37,8 @@
w_class = ITEMSIZE_NORMAL
var/open = FALSE
/obj/item/melee/umbrella/New()
..()
/obj/item/melee/umbrella/Initialize(mapload)
. = ..()
update_icon()
/obj/item/melee/umbrella/attack_self()
@@ -56,9 +56,9 @@
H.update_inv_r_hand()
// Randomizes color
/obj/item/melee/umbrella/random/New()
/obj/item/melee/umbrella/random/Initialize(mapload)
. = ..()
color = get_random_colour()
..()
/obj/item/melee/cursedblade
name = "crystal blade"
code/game/objects/items/weapons/melee/shock_maul.dm
+4 -6
View File
@@ -71,10 +71,9 @@
update_icon()
..()
/obj/item/melee/shock_maul/New()
..()
/obj/item/melee/shock_maul/Initialize(mapload)
. = ..()
update_held_icon()
return
/obj/item/melee/shock_maul/get_cell()
return bcell
@@ -111,11 +110,10 @@
usr.put_in_l_hand(src)
src.add_fingerprint(usr)
/obj/item/melee/shock_maul/loaded/New() //this one starts with a cell pre-installed.
..()
/obj/item/melee/shock_maul/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/shock_maul/proc/deductcharge()
if(status == 1) //Only deducts charge when it's on
code/game/objects/items/weapons/mop.dm
+4 -4
View File
@@ -18,9 +18,9 @@ GLOBAL_LIST_BOILERPLATE(all_mops, /obj/item/mop)
var/mopping = 0
var/mopcount = 0
/obj/item/mop/New()
/obj/item/mop/Initialize(mapload)
. = ..()
create_reagents(30)
..()
/obj/item/mop/afterattack(atom/A, mob/user, proximity)
if(!proximity) return
@@ -59,9 +59,9 @@ GLOBAL_LIST_BOILERPLATE(all_mops, /obj/item/mop)
flags = NOCONDUCT
attack_verb = list("mopped", "bashed", "bludgeoned", "whacked")
/obj/item/mop/advanced/New()
/obj/item/mop/advanced/Initialize(mapload)
. = ..()
create_reagents(30)
..()
/obj/item/mop/advanced/afterattack(atom/A, mob/user, proximity)
if(!proximity) return
code/game/objects/items/weapons/mop_deploy.dm
+2 -1
View File
@@ -15,7 +15,8 @@
var/mopcount = 0
/obj/item/mop_deploy/New()
/obj/item/mop_deploy/Initialize(mapload)
. = ..()
create_reagents(5)
START_PROCESSING(SSobj, src)
code/game/objects/items/weapons/policetape.dm
+2 -2
View File
@@ -53,8 +53,8 @@ var/list/tape_roll_applications = list()
icon_state = "[icon_base]_dir_[crumpled]"
dir = tape_dir
/obj/item/tape/New()
..()
/obj/item/tape/Initialize(mapload)
. = ..()
if(!hazard_overlays)
hazard_overlays = list()
hazard_overlays["[NORTH]"] = new/image('icons/effects/warning_stripes.dmi', icon_state = "N")
code/game/objects/items/weapons/storage/bible.dm
+2 -1
View File
@@ -91,7 +91,8 @@ GLOBAL_LIST_INIT(bibleitemstates, list(
desc = "To be applied to the head repeatedly."
icon_state ="bible"
/obj/item/storage/bible/booze/New()
/obj/item/storage/bible/booze/Initialize(mapload)
. = ..()
starts_with = list(
/obj/item/reagent_containers/food/drinks/bottle/small/beer,
/obj/item/reagent_containers/food/drinks/bottle/small/beer,
code/game/objects/items/weapons/storage/fancy.dm
+6 -6
View File
@@ -61,12 +61,12 @@
)
starts_with = list(/obj/item/reagent_containers/food/snacks/egg = 12)
/obj/item/storage/fancy/egg_box/New()
/obj/item/storage/fancy/egg_box/Initialize(mapload)
. = ..()
if(!open_state)
open_state = "[initial(icon_state)]0"
if(!closed_state)
closed_state = "[initial(icon_state)]"
..()
/obj/item/storage/fancy/egg_box/update_icon()
cut_overlays()
@@ -263,12 +263,12 @@
C.brand = brand
C.desc += " This one is \a [brand]."
/obj/item/storage/fancy/cigarettes/New()
/obj/item/storage/fancy/cigarettes/Initialize()
. = ..()
if(!open_state)
open_state = "[initial(icon_state)]_open"
if(!closed_state)
closed_state = "[initial(icon_state)]"
..()
/obj/item/storage/fancy/cigarettes/update_icon()
cut_overlays()
@@ -410,12 +410,12 @@
reagents.trans_to_obj(C, (reagents.total_volume/contents.len))
return ..()
/obj/item/storage/fancy/cigar/New()
/obj/item/storage/fancy/cigar/Initialize()
. = ..()
if(!open_state)
open_state = "[initial(icon_state)]0"
if(!closed_state)
closed_state = "[initial(icon_state)]"
..()
/obj/item/storage/fancy/cigar/update_icon()
cut_overlays()
code/game/objects/items/weapons/storage/internal.dm
+5 -4
View File
@@ -4,12 +4,13 @@
preserve_item = 1
var/obj/item/master_item
/obj/item/storage/internal/New(obj/item/MI)
master_item = MI
loc = master_item
/obj/item/storage/internal/Initialize(mapload)
. = ..()
master_item = loc
if(!istype(master_item))
return INITIALIZE_HINT_QDEL
name = master_item.name
verbs -= /obj/item/verb/verb_pickup //make sure this is never picked up.
..()
/obj/item/storage/internal/Destroy()
master_item = null
code/game/objects/items/weapons/storage/storage.dm
+5 -4
View File
@@ -812,12 +812,12 @@
else
icon_state = closed_state
/obj/item/storage/trinketbox/New()
/obj/item/storage/trinketbox/Initialize(mapload)
. = ..()
if(!open_state)
open_state = "[initial(icon_state)]_open"
if(!closed_state)
closed_state = "[initial(icon_state)]"
..()
/obj/item/storage/trinketbox/attack_self()
open = !open
@@ -852,14 +852,15 @@
alpha = 200
var/datum/weakref/held_item
/atom/movable/storage_slot/New(newloc, obj/item/held_item)
/atom/movable/storage_slot/Initialize(mapload, obj/item/held_item)
. = ..()
ASSERT(held_item)
name += held_item.name
src.held_item = WEAKREF(held_item)
/atom/movable/storage_slot/Destroy()
held_item = null
..()
. = ..()
/// Has to be this way. The fact that the overlays will be constantly mutated by other storage means we can't wait.
/atom/movable/storage_slot/add_overlay(list/somethings)
code/game/objects/items/weapons/storage/wallets.dm
+5 -5
View File
@@ -87,8 +87,8 @@
else
return ..()
/obj/item/storage/wallet/random/New()
..()
/obj/item/storage/wallet/random/Initialize(mapload)
. = ..()
var/amount = rand(50, 100) + rand(50, 100) // Triangular distribution from 100 to 200
var/obj/item/spacecash/SC = null
SC = new(src)
@@ -105,9 +105,9 @@
desc = "You can recolor it! Fancy! The future is NOW!"
icon_state = "wallet-white"
/obj/item/storage/wallet/poly/New()
..()
verbs |= /obj/item/storage/wallet/poly/proc/change_color
/obj/item/storage/wallet/poly/Initialize(mapload)
. = ..()
verbs += /obj/item/storage/wallet/poly/proc/change_color
color = get_random_colour()
update_icon()
code/game/objects/items/weapons/tanks/jetpack.dm
+2 -2
View File
@@ -19,8 +19,8 @@
var/volume_rate = 500 //Needed for borg jetpack transfer
actions_types = list(/datum/action/item_action/toggle_jetpack)
/obj/item/tank/jetpack/New()
..()
/obj/item/tank/jetpack/Initialize()
. = ..()
ion_trail = new /datum/effect/effect/system/ion_trail_follow()
ion_trail.set_up(src)
code/game/objects/items/weapons/tanks/tank_types_vr.dm
+2 -2
View File
@@ -8,8 +8,8 @@
gauge_cap = 3
volume = 10
/obj/item/tank/emergency/phoron/double/New()
..()
/obj/item/tank/emergency/phoron/double/Initialize()
. = ..()
air_contents.adjust_gas(GAS_PHORON, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
//New icons
code/game/objects/items/weapons/tape.dm
+1 -4
View File
@@ -119,13 +119,10 @@
plane = MOB_PLANE
anchored = FALSE
drop_sound = null
flags = NOBLUDGEON
var/obj/item/stuck = null
/obj/item/ducttape/New()
..()
flags |= NOBLUDGEON
/obj/item/ducttape/examine(mob/user)
SHOULD_CALL_PARENT(FALSE)
return stuck.examine(user)
code/game/objects/items/weapons/tools/combitool.dm
+2 -2
View File
@@ -31,8 +31,8 @@
for(var/obj/item/tool in tools)
. += "[icon2html(tool,)] - [tool.name][tools[current_tool]==tool?" (selected)":""]")
/obj/item/combitool/New()
..()
/obj/item/combitool/Initialize(mapload)
. = ..()
for(var/type in spawn_tools)
tools |= new type(src)
code/game/objects/items/weapons/tools/crowbar.dm
+2 -2
View File
@@ -105,7 +105,7 @@
item_state = "crowbar_red"
random_color = FALSE
/obj/item/tool/prybar/New()
/obj/item/tool/prybar/Initialize(mapload)
. = ..()
if(random_color)
icon_state = "prybar[pick("","_green","_aubergine","_blue")]"
. = ..()
code/game/objects/items/weapons/tools/screwdriver.dm
+3 -3
View File
@@ -26,7 +26,8 @@
tool_qualities = list(TOOL_SCREWDRIVER)
var/random_color = TRUE
/obj/item/tool/screwdriver/New()
/obj/item/tool/screwdriver/Initialize(mapload)
. = ..()
if(random_color)
switch(pick("red","blue","purple","brown","green","cyan","yellow"))
if ("red")
@@ -52,8 +53,7 @@
item_state = "screwdriver_yellow"
if (prob(75))
src.pixel_y = rand(0, 16)
..()
pixel_y = rand(0, 16)
/obj/item/tool/screwdriver/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
if(!istype(M) || user.a_intent == I_HELP)
code/game/objects/items/weapons/tools/wirecutters.dm
+3 -3
View File
@@ -28,7 +28,8 @@
tool_qualities = list(TOOL_WIRECUTTER)
var/random_color = TRUE
/obj/item/tool/wirecutters/New()
/obj/item/tool/wirecutters/Initialize(mapload)
. = ..()
if(random_color)
switch(pick("red","blue","yellow"))
if ("red")
@@ -42,8 +43,7 @@
item_state = "cutters_yellow"
if (prob(75))
src.pixel_y = rand(0, 16)
..()
pixel_y = rand(0, 16)
/obj/item/tool/wirecutters/attack(mob/living/carbon/C as mob, mob/user as mob)
if(istype(C) && user.a_intent == I_HELP && (C.handcuffed) && (istype(C.handcuffed, /obj/item/handcuffs/cable)))
code/game/objects/items/weapons/towels.dm
+2 -2
View File
@@ -29,6 +29,6 @@
else if(user.fire_stacks < 0)
user.fire_stacks = (min(0, user.fire_stacks + 1.5))
/obj/item/towel/random/New()
..()
/obj/item/towel/random/Initialize(mapload)
. = ..()
color = get_random_colour()
code/game/objects/micro_structures.dm
+1 -4
View File
@@ -20,12 +20,9 @@ var/global/list/micro_tunnels = list()
/mob/living/simple_mob/slime
)
/obj/structure/micro_tunnel/New()
. = ..()
micro_tunnels.Add(src)
/obj/structure/micro_tunnel/Initialize()
. = ..()
micro_tunnels.Add(src)
if(name == initial(name))
var/area/our_area = get_area(src)
name = "[our_area.name] [name]"
code/game/objects/structures/barsign.dm
+2 -2
View File
@@ -27,8 +27,8 @@
else
. += "It says '[icon_state]'"
/obj/structure/sign/double/barsign/New()
..()
/obj/structure/sign/double/barsign/Initialize(mapload)
. = ..()
icon_state = pick(get_valid_states())
/obj/structure/sign/double/barsign/attackby(obj/item/I, mob/user)
code/modules/clothing/spacesuits/rig/modules/modules.dm
+23 -15
View File
@@ -109,8 +109,8 @@
return
..()
/obj/item/rig_module/New()
..()
/obj/item/rig_module/Initialize(mapload)
. = ..()
if(suit_overlay_inactive)
suit_overlay = suit_overlay_inactive
@@ -239,9 +239,11 @@
var/module_mode = ""
var/obj/item/rig_module/module
/stat_rig_module/New(var/obj/item/rig_module/module)
..()
src.module = module
/stat_rig_module/Initialize(mapload)
. = ..()
module = loc
if(!istype(module))
return INITIALIZE_HINT_QDEL
/stat_rig_module/Destroy()
module = null
@@ -275,8 +277,10 @@
/stat_rig_module/DblClick()
return Click()
/stat_rig_module/activate/New(var/obj/item/rig_module/module)
..()
/stat_rig_module/activate/Initialize(mapload)
. = ..()
if(!istype(module))
return INITIALIZE_HINT_QDEL
name = module.activate_string
if(module.active_power_cost)
name += " ([module.active_power_cost*10]A)"
@@ -285,8 +289,10 @@
/stat_rig_module/activate/CanUse()
return module.toggleable && !module.active
/stat_rig_module/deactivate/New(var/obj/item/rig_module/module)
..()
/stat_rig_module/deactivate/Initialize(mapload)
. = ..()
if(!istype(module))
return INITIALIZE_HINT_QDEL
name = module.deactivate_string
// Show cost despite being 0, if it means changing from an active cost.
if(module.active_power_cost || module.passive_power_cost)
@@ -297,8 +303,10 @@
/stat_rig_module/deactivate/CanUse()
return module.toggleable && module.active
/stat_rig_module/engage/New(var/obj/item/rig_module/module)
..()
/stat_rig_module/engage/Initialize(mapload)
. = ..()
if(!istype(module))
return INITIALIZE_HINT_QDEL
name = module.engage_string
if(module.use_power_cost)
name += " ([module.use_power_cost*10]E)"
@@ -307,8 +315,8 @@
/stat_rig_module/engage/CanUse()
return module.usable
/stat_rig_module/select/New()
..()
/stat_rig_module/select/Initialize(mapload)
. = ..()
name = "Select"
module_mode = "select"
@@ -318,8 +326,8 @@
return 1
return 0
/stat_rig_module/charge/New()
..()
/stat_rig_module/charge/Initialize(mapload)
. = ..()
name = "Change Charge"
module_mode = "select_charge_type"
code/modules/clothing/spacesuits/rig/modules/specific/datajack.dm
+2 -2
View File
@@ -14,8 +14,8 @@
interface_desc = "An induction-powered high-throughput datalink suitable for hacking encrypted networks."
var/list/stored_research
/obj/item/rig_module/datajack/New()
..()
/obj/item/rig_module/datajack/Initialize(mapload)
. = ..()
stored_research = list()
/obj/item/rig_module/datajack/engage(atom/target)
code/modules/clothing/spacesuits/rig/modules/specific/device.dm
+4 -4
View File
@@ -9,8 +9,8 @@
var/device_type
var/obj/item/device
/obj/item/rig_module/device/New()
..()
/obj/item/rig_module/device/Initialize(mapload)
. = ..()
if(device_type) device = new device_type(src)
/obj/item/rig_module/device/engage(atom/target)
@@ -156,8 +156,8 @@
var/iastamp
var/deniedstamp
/obj/item/rig_module/device/stamp/New()
..()
/obj/item/rig_module/device/stamp/Initialize(mapload)
. = ..()
iastamp = new /obj/item/stamp/internalaffairs(src)
deniedstamp = new /obj/item/stamp/denied(src)
device = iastamp
code/modules/clothing/spacesuits/rig/modules/specific/jetpack.dm
+3 -3
View File
@@ -51,8 +51,8 @@
jets.toggle()
return 1
/obj/item/rig_module/maneuvering_jets/New()
..()
/obj/item/rig_module/maneuvering_jets/Initialize(mapload)
. = ..()
jets = new(src)
/obj/item/rig_module/maneuvering_jets/installed()
@@ -63,4 +63,4 @@
/obj/item/rig_module/maneuvering_jets/removed()
..()
jets.holder = null
jets.ion_trail.set_up(jets)
jets.ion_trail.set_up(jets)
code/modules/clothing/spacesuits/rig/modules/specific/mounted_gun.dm
+2 -2
View File
@@ -15,8 +15,8 @@
var/gun_type = /obj/item/gun/energy/lasercannon/mounted
var/obj/item/gun/gun
/obj/item/rig_module/mounted/New()
..()
/obj/item/rig_module/mounted/Initialize(mapload)
. = ..()
gun = new gun_type(src)
/obj/item/rig_module/mounted/engage(atom/target)
code/modules/clothing/spacesuits/rig/modules/specific/self_destruct.dm
+4 -4
View File
@@ -14,10 +14,10 @@
interface_name = "dead man's switch"
interface_desc = "An integrated self-destruct module. When the wearer dies, they vanish in smoke. Do not press this button."
/obj/item/rig_module/self_destruct/New()
..()
src.smoke = new /datum/effect/effect/system/smoke_spread/bad()
src.smoke.attach(src)
/obj/item/rig_module/self_destruct/Initialize(mapload)
. = ..()
smoke = new /datum/effect/effect/system/smoke_spread/bad()
smoke.attach(src)
/obj/item/rig_module/self_destruct/Destroy()
qdel(smoke)
code/modules/clothing/spacesuits/rig/modules/specific/vision.dm
+2 -2
View File
@@ -220,8 +220,8 @@
if((. = ..()) && holder.wearer)
holder.wearer.recalculate_vis()
/obj/item/rig_module/vision/New()
..()
/obj/item/rig_module/vision/Initialize(mapload)
. = ..()
if(!vision_modes)
return

Some files were not shown because too many files have changed in this diff Show More