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

/atom New() => Initialize() [MDB IGNORE]

Browse Source
This commit is contained in:
MistakeNot4892
2021-11-14 03:09:51 -05:00
committed by VirgoBot
parent 47c8115916
commit 3f9af78f3a
587 changed files with 12315 additions and 2669 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/antag_spawners.dm
+2 -2
View File
@@ -5,8 +5,8 @@
var/searching = FALSE
var/datum/effect/effect/system/spark_spread/sparks
/obj/item/weapon/antag_spawner/New()
..()
/obj/item/weapon/antag_spawner/Initialize()
. = ..()
sparks = new /datum/effect/effect/system/spark_spread()
sparks.set_up(5, 0, src)
sparks.attach(loc)
code/game/objects/items/devices/ai_detector.dm
+2 -2
View File
@@ -13,12 +13,12 @@
var/detect_state = PROXIMITY_NONE
origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2, TECH_ILLEGAL = 2)
/obj/item/device/multitool/ai_detector/New()
/obj/item/device/multitool/ai_detector/Initialize()
// 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)
..()
return ..()
/obj/item/device/multitool/ai_detector/Destroy()
STOP_PROCESSING(SSobj, src)
code/game/objects/items/devices/communicator/communicator.dm
+4 -8
View File
@@ -248,12 +248,8 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
var/datum/exonet_protocol/exonet = null
var/list/exonet_messages = list()
// Proc: New()
// Parameters: None
// Description: Gives ghosts an exonet address based on their key and ghost name.
/mob/observer/dead/Initialize()
. = ..()
exonet = new(src)
/mob/observer/dead/proc/init_exonet()
set waitfor = FALSE
if(client)
exonet.make_address("communicator-[src.client]-[src.client.prefs.real_name]")
else
@@ -334,8 +330,8 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
/obj/machinery/camera/communicator
network = list(NETWORK_COMMUNICATORS)
/obj/machinery/camera/communicator/New()
..()
/obj/machinery/camera/communicator/Initialize()
. = ..()
client_huds |= global_hud.whitense
client_huds |= global_hud.darkMask
code/game/objects/items/devices/defib.dm
+4 -4
View File
@@ -23,8 +23,8 @@
/obj/item/device/defib_kit/get_cell()
return bcell
/obj/item/device/defib_kit/New() //starts without a cell for rnd
..()
/obj/item/device/defib_kit/Initialize() //starts without a cell for rnd
. = ..()
if(ispath(paddles))
paddles = new paddles(src, src)
else
@@ -585,9 +585,9 @@
/obj/item/weapon/shockpaddles/linked
var/obj/item/device/defib_kit/base_unit
/obj/item/weapon/shockpaddles/linked/New(newloc, obj/item/device/defib_kit/defib)
/obj/item/weapon/shockpaddles/linked/Initialize(var/ml, obj/item/device/defib_kit/defib)
base_unit = defib
..(newloc)
. = ..()
/obj/item/weapon/shockpaddles/linked/Destroy()
if(base_unit)
code/game/objects/items/devices/flashlight.dm
+10 -4
View File
@@ -357,9 +357,9 @@
pickup_sound = 'sound/items/pickup/gloves.ogg'
light_system = MOVABLE_LIGHT
/obj/item/device/flashlight/flare/New()
/obj/item/device/flashlight/flare/Initialize()
fuel = rand(800, 1000) // Sorry for changing this so much but I keep under-estimating how long X number of ticks last in seconds.
..()
. = ..()
/obj/item/device/flashlight/flare/process()
var/turf/pos = get_turf(src)
@@ -420,9 +420,9 @@
var/fuel = 0
power_use = 0
/obj/item/device/flashlight/glowstick/New()
/obj/item/device/flashlight/glowstick/Initialize()
fuel = rand(1600, 2000)
..()
. = ..()
/obj/item/device/flashlight/glowstick/process()
fuel = max(fuel - 1, 0)
@@ -504,9 +504,15 @@
on = 1 //Bio-luminesence has one setting, on.
power_use = 0
<<<<<<< HEAD
/obj/item/device/flashlight/slime/New()
..()
set_light(light_range, light_power, light_color)
=======
/obj/item/device/flashlight/slime/Initialize()
. = ..()
set_light(brightness_on, flashlight_power, flashlight_colour)
>>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
/obj/item/device/flashlight/slime/update_brightness()
return
code/game/objects/items/devices/hacktool.dm
+2 -2
View File
@@ -7,8 +7,8 @@
var/list/supported_types
var/datum/tgui_state/default/must_hack/hack_state
/obj/item/device/multitool/hacktool/New()
..()
/obj/item/device/multitool/hacktool/Initialize()
. = ..()
known_targets = list()
max_known_targets = 5 + rand(1,3)
supported_types = list(/obj/machinery/door/airlock)
code/game/objects/items/devices/laserpointer.dm
+4 -4
View File
@@ -29,14 +29,14 @@
/obj/item/device/laser_pointer/purple
pointer_icon_state = "purple_laser"
/obj/item/device/laser_pointer/New()
..()
/obj/item/device/laser_pointer/Initialize()
. = ..()
diode = new(src)
if(!pointer_icon_state)
pointer_icon_state = pick("red_laser","green_laser","blue_laser","purple_laser")
/obj/item/device/laser_pointer/upgraded/New()
..()
/obj/item/device/laser_pointer/upgraded/Initialize()
. = ..()
diode = new /obj/item/weapon/stock_parts/micro_laser/ultra
code/game/objects/items/devices/lightreplacer.dm
+2 -2
View File
@@ -59,9 +59,9 @@
// when we get this many shards, we get a free bulb.
var/shards_required = 4
/obj/item/device/lightreplacer/New()
/obj/item/device/lightreplacer/Initialize()
failmsg = "The [name]'s refill light blinks red."
..()
. = ..()
/obj/item/device/lightreplacer/examine(mob/user)
. = ..()
code/game/objects/items/devices/paicard.dm
+6
View File
@@ -22,9 +22,15 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard)
if(istype(rig))
rig.forced_move(direction, user)
<<<<<<< HEAD
/obj/item/device/paicard/New()
..()
add_overlay("pai-off")
=======
/obj/item/device/paicard/Initialize()
. = ..()
overlays += "pai-off"
>>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
/obj/item/device/paicard/Destroy()
//Will stop people throwing friend pAIs into the singularity so they can respawn
code/game/objects/items/devices/pipe_painter.dm
+2 -2
View File
@@ -6,8 +6,8 @@
var/list/modes
var/mode
/obj/item/device/pipe_painter/New()
..()
/obj/item/device/pipe_painter/Initialize()
. = ..()
modes = new()
for(var/C in pipe_colors)
modes += "[C]"
code/game/objects/items/devices/radio/headset.dm
+5 -8
View File
@@ -20,8 +20,8 @@
drop_sound = 'sound/items/drop/component.ogg'
pickup_sound = 'sound/items/pickup/component.ogg'
/obj/item/device/radio/headset/New()
..()
/obj/item/device/radio/headset/Initialize()
. = ..()
internal_channels.Cut()
if(ks1type)
keyslot1 = new ks1type(src)
@@ -428,14 +428,11 @@
if(keyslot2.syndie)
src.syndie = 1
if(!radio_controller)
src.name = "broken radio headset"
return
for (var/ch_name in channels)
if(!radio_controller)
sleep(30) // Waiting for the radio_controller to be created.
if(!radio_controller)
src.name = "broken radio headset"
return
secure_radio_connections[ch_name] = radio_controller.add_object(src, radiochannels[ch_name], RADIO_CHAT)
if(setDescription)
code/game/objects/items/devices/radio/intercom.dm
+12 -12
View File
@@ -75,23 +75,23 @@
channels = radiochannels.Copy()
return ..()
/obj/item/device/radio/intercom/New()
..()
/obj/item/device/radio/intercom/Initialize()
. = ..()
circuit = new circuit(src)
/obj/item/device/radio/intercom/department/medbay/New()
..()
/obj/item/device/radio/intercom/department/medbay/Initialize()
. = ..()
internal_channels = default_medbay_channels.Copy()
/obj/item/device/radio/intercom/department/security/New()
..()
/obj/item/device/radio/intercom/department/security/Initialize()
. = ..()
internal_channels = list(
num2text(PUB_FREQ) = list(),
num2text(SEC_I_FREQ) = list(access_security)
)
/obj/item/device/radio/intercom/entertainment/New()
..()
/obj/item/device/radio/intercom/entertainment/Initialize()
. = ..()
internal_channels = list(
num2text(PUB_FREQ) = list(),
num2text(ENT_FREQ) = list()
@@ -104,8 +104,8 @@
subspace_transmission = 1
syndie = 1
/obj/item/device/radio/intercom/syndicate/New()
..()
/obj/item/device/radio/intercom/syndicate/Initialize()
. = ..()
internal_channels[num2text(SYND_FREQ)] = list(access_syndicate)
/obj/item/device/radio/intercom/raider
@@ -115,8 +115,8 @@
subspace_transmission = 1
syndie = 1
/obj/item/device/radio/intercom/raider/New()
..()
/obj/item/device/radio/intercom/raider/Initialize()
. = ..()
internal_channels[num2text(RAID_FREQ)] = list(access_syndicate)
/obj/item/device/radio/intercom/attack_ai(mob/user as mob)
code/game/objects/items/devices/radio/jammer.dm
+2 -1
View File
@@ -27,7 +27,8 @@ var/global/list/active_radio_jammers = list()
origin_tech = list(TECH_ILLEGAL = 7, TECH_BLUESPACE = 5) //Such technology! Subspace jamming!
/obj/item/device/radio_jammer/New()
/obj/item/device/radio_jammer/Initialize()
. = ..()
power_source = new(src)
update_icon() // So it starts with the full overlay.
code/game/objects/items/devices/radio/radio.dm
+29 -9
View File
@@ -1,6 +1,7 @@
// Access check is of the type requires one. These have been carefully selected to avoid allowing the janitor to see channels he shouldn't
//VOREStation Edit Start - Updating this for Virgo
var/global/list/default_internal_channels = list(
<<<<<<< HEAD
num2text(PUB_FREQ) = list(),
num2text(AI_FREQ) = list(access_synth),
num2text(ENT_FREQ) = list(),
@@ -21,6 +22,27 @@ var/global/list/default_medbay_channels = list(
num2text(PUB_FREQ) = list(),
num2text(MED_FREQ) = list(),
num2text(MED_I_FREQ) = list()
=======
num2text(PUB_FREQ) = list(),
num2text(AI_FREQ) = list(access_synth),
num2text(ENT_FREQ) = list(),
num2text(ERT_FREQ) = list(access_cent_specops),
num2text(COMM_FREQ) = list(access_heads),
num2text(ENG_FREQ) = list(access_engine_equip, access_atmospherics),
num2text(MED_FREQ) = list(access_medical_equip),
num2text(MED_I_FREQ) = list(access_medical_equip),
num2text(SEC_FREQ) = list(access_security),
num2text(SEC_I_FREQ) = list(access_security),
num2text(SCI_FREQ) = list(access_tox,access_robotics,access_xenobiology),
num2text(SUP_FREQ) = list(access_cargo),
num2text(SRV_FREQ) = list(access_janitor, access_hydroponics)
)
var/global/list/default_medbay_channels = list(
num2text(PUB_FREQ) = list(),
num2text(MED_FREQ) = list(access_medical_equip),
num2text(MED_I_FREQ) = list(access_medical_equip)
>>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
)
//VOREStation Edit End
@@ -73,12 +95,6 @@ var/global/list/default_medbay_channels = list(
frequency = new_frequency
radio_connection = radio_controller.add_object(src, frequency, RADIO_CHAT)
/obj/item/device/radio/New()
..()
wires = new(src)
internal_channels = default_internal_channels.Copy()
listening_objects += src
/obj/item/device/radio/Destroy()
qdel(wires)
wires = null
@@ -89,9 +105,13 @@ var/global/list/default_medbay_channels = list(
radio_controller.remove_object(src, radiochannels[ch_name])
return ..()
/obj/item/device/radio/Initialize()
. = ..()
wires = new(src)
internal_channels = default_internal_channels.Copy()
listening_objects += src
if(frequency < RADIO_LOW_FREQ || frequency > RADIO_HIGH_FREQ)
frequency = sanitize_frequency(frequency, RADIO_LOW_FREQ, RADIO_HIGH_FREQ)
set_frequency(frequency)
@@ -753,6 +773,6 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer)
/obj/item/device/radio/phone/medbay
frequency = MED_I_FREQ
/obj/item/device/radio/phone/medbay/New()
..()
/obj/item/device/radio/phone/medbay/Initialize()
. = ..()
internal_channels = default_medbay_channels.Copy()
code/game/objects/items/devices/scanners.dm
+4 -4
View File
@@ -27,10 +27,10 @@ HALOGEN COUNTER - Radcount on mobs
var/advscan = 0
var/showadvscan = 1
/obj/item/device/healthanalyzer/New()
/obj/item/device/healthanalyzer/Initialize()
if(advscan >= 1)
verbs += /obj/item/device/healthanalyzer/proc/toggle_adv
..()
. = ..()
/obj/item/device/healthanalyzer/do_surgery(mob/living/M, mob/living/user)
if(user.a_intent != I_HELP) //in case it is ever used as a surgery tool
@@ -378,8 +378,8 @@ HALOGEN COUNTER - Radcount on mobs
var/details = 0
var/recent_fail = 0
/obj/item/device/mass_spectrometer/New()
..()
/obj/item/device/mass_spectrometer/Initialize()
. = ..()
var/datum/reagents/R = new/datum/reagents(5)
reagents = R
R.my_atom = src
code/game/objects/items/devices/spy_bug.dm
+8 -7
View File
@@ -17,8 +17,8 @@
var/obj/machinery/camera/bug/camera
var/camtype = /obj/machinery/camera/bug
/obj/item/device/camerabug/New()
..()
/obj/item/device/camerabug/Initialize()
. = ..()
// radio = new(src)
camera = new camtype(src)
@@ -158,8 +158,9 @@
var/obj/machinery/camera/bug/selected_camera
var/list/obj/machinery/camera/bug/cameras = new()
/*
/obj/item/device/bug_monitor/New()
/obj/item/device/bug_monitor/Initialize()
radio = new(src)
. = ..()
*/
/obj/item/device/bug_monitor/attack_self(mob/user)
if(operating)
@@ -242,8 +243,8 @@
/obj/machinery/camera/bug
network = list(NETWORK_SECURITY)
/obj/machinery/camera/bug/New()
..()
/obj/machinery/camera/bug/Initialize()
. = ..()
name = "Camera #[rand(1000,9999)]"
c_tag = name
@@ -251,8 +252,8 @@
// These cheap toys are accessible from the mercenary camera console as well - only the antag ones though!
network = list(NETWORK_MERCENARY)
/obj/machinery/camera/bug/spy/New()
..()
/obj/machinery/camera/bug/spy/Initialize()
. = ..()
name = "DV-136ZB #[rand(1000,9999)]"
c_tag = name
code/game/objects/items/devices/taperecorder.dm
+4 -3
View File
@@ -18,8 +18,8 @@
throw_speed = 4
throw_range = 20
/obj/item/device/taperecorder/New()
..()
/obj/item/device/taperecorder/Initialize()
. = ..()
if(ispath(mytape))
mytape = new mytape(src)
update_icon()
@@ -431,5 +431,6 @@
//Random colour tapes
/obj/item/device/tape/random/New()
/obj/item/device/tape/random/Initialize()
. = ..()
icon_state = "tape_[pick("white", "blue", "red", "yellow", "purple")]"
code/game/objects/items/devices/tvcamera.dm
+1 -4
View File
@@ -11,10 +11,6 @@
var/weakref/showing
var/showing_name
/obj/item/device/tvcamera/New()
..()
listening_objects += src
/obj/item/device/tvcamera/Destroy()
listening_objects -= src
qdel(camera)
@@ -30,6 +26,7 @@
/obj/item/device/tvcamera/Initialize()
. = ..()
listening_objects += src
camera = new(src)
camera.c_tag = channel
camera.status = FALSE
code/game/objects/items/devices/uplink.dm
+6 -6
View File
@@ -212,8 +212,8 @@
//
// Includes normal radio uplink, multitool uplink,
// implant uplink (not the implant tool) and a preset headset uplink.
/obj/item/device/radio/uplink/New()
..()
/obj/item/device/radio/uplink/Initialize()
. = ..()
hidden_uplink = new(src)
icon_state = "radio"
@@ -221,8 +221,8 @@
if(hidden_uplink)
hidden_uplink.trigger(user)
/obj/item/device/multitool/uplink/New()
..()
/obj/item/device/multitool/uplink/Initialize()
. = ..()
hidden_uplink = new(src)
/obj/item/device/multitool/uplink/attack_self(mob/user as mob)
@@ -232,6 +232,6 @@
/obj/item/device/radio/headset/uplink
traitor_frequency = 1445
/obj/item/device/radio/headset/uplink/New()
..()
/obj/item/device/radio/headset/uplink/Initialize()
. = ..()
hidden_uplink = new(src)
code/game/objects/items/devices/violin.dm
+41
View File
@@ -0,0 +1,41 @@
//copy pasta of the space piano, don't hurt me -Pete
/obj/item/device/instrument
name = "generic instrument"
var/datum/song/handheld/song
var/instrumentId = "generic"
var/instrumentExt = "mid"
icon = 'icons/obj/musician.dmi'
force = 10
/obj/item/device/instrument/Initialize()
. = ..()
song = new(instrumentId, src)
song.instrumentExt = instrumentExt
/obj/item/device/instrument/Destroy()
qdel(song)
song = null
..()
/obj/item/device/instrument/attack_self(mob/user as mob)
if(!user.IsAdvancedToolUser())
to_chat(user, "<span class='warning'>You don't have the dexterity to do this!</span>")
return 1
interact(user)
/obj/item/device/instrument/interact(mob/user as mob)
if(!user)
return
if(user.incapacitated() || user.lying)
return
user.set_machine(src)
song.interact(user)
/obj/item/device/instrument/violin
name = "space violin"
desc = "A wooden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\""
icon_state = "violin"
attack_verb = list("smashed")
instrumentId = "violin"
code/game/objects/items/glassjar.dm
+2 -2
View File
@@ -17,8 +17,8 @@
drop_sound = 'sound/items/drop/glass.ogg'
pickup_sound = 'sound/items/pickup/glass.ogg'
/obj/item/glass_jar/New()
..()
/obj/item/glass_jar/Initialize()
. = ..()
update_icon()
/obj/item/glass_jar/afterattack(var/atom/A, var/mob/user, var/proximity)
code/game/objects/items/paintkit.dm
+1
View File
@@ -198,6 +198,7 @@
return ..()
/obj/item/device/kit/suit/rig/debug/Initialize()
. = ..()
set_info("debug suit", "This is a test", "debug", CUSTOM_ITEM_OBJ, CUSTOM_ITEM_MOB)
/obj/item/device/kit/paint
code/game/objects/items/poi_items.dm
+2 -2
View File
@@ -28,7 +28,7 @@
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()
START_PROCESSING(SSobj, src)
return ..()
@@ -75,7 +75,7 @@
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()
START_PROCESSING(SSobj, src)
return ..()
code/game/objects/items/robot/robot_items.dm
+4 -4
View File
@@ -67,8 +67,8 @@
icon_state = "healthhud"
icon = 'icons/inventory/eyes/item.dmi'
/obj/item/borg/sight/hud/med/New()
..()
/obj/item/borg/sight/hud/med/Initialize()
. = ..()
hud = new /obj/item/clothing/glasses/hud/health(src)
return
@@ -78,7 +78,7 @@
icon_state = "securityhud"
icon = 'icons/inventory/eyes/item.dmi'
/obj/item/borg/sight/hud/sec/New()
..()
/obj/item/borg/sight/hud/sec/Initialize()
. = ..()
hud = new /obj/item/clothing/glasses/hud/security(src)
return
code/game/objects/items/robot/robot_parts.dm
+3 -6
View File
@@ -12,9 +12,6 @@
/obj/item/robot_parts/set_dir()
return
/obj/item/robot_parts/New(var/newloc, var/model)
..(newloc)
/obj/item/robot_parts/l_arm
name = "cyborg left arm"
desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
@@ -71,8 +68,8 @@
var/obj/item/robot_parts/head/head = null
var/created_name = ""
/obj/item/robot_parts/robot_suit/New()
..()
/obj/item/robot_parts/robot_suit/Initialize()
. = ..()
src.updateicon()
/obj/item/robot_parts/robot_suit/proc/updateicon()
@@ -192,7 +189,7 @@
to_chat(user, "<span class='warning'>This [W] does not seem to fit.</span>")
return
var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(loc), unfinished = 1)
var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(loc), TRUE)
if(!O) return
user.drop_item()
code/game/objects/items/stacks/marker_beacons.dm
+1 -1
View File
@@ -89,7 +89,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(var/ml, set_color)
. = ..()
if(set_color)
picked_color = set_color
code/game/objects/items/toys/toys.dm
+4 -3
View File
@@ -38,7 +38,8 @@
icon_state = "waterballoon-e"
drop_sound = 'sound/items/drop/rubber.ogg'
/obj/item/toy/balloon/New()
/obj/item/toy/balloon/Initialize()
. = ..()
var/datum/reagents/R = new/datum/reagents(10)
reagents = R
R.my_atom = src
@@ -424,8 +425,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()
. = ..()
desc = "A \"Space Life\" brand [name]"
/obj/item/toy/figure/attack_self(mob/user as mob)
code/game/objects/items/trash.dm
+3 -6
View File
@@ -11,15 +11,12 @@
matter = list(MAT_STEEL = 30)
var/age = 0
/obj/item/trash/New(var/newloc, var/_age)
..(newloc)
/obj/item/trash/Initialize(var/ml, var/_age)
. = ..()
if(!isnull(_age))
age = _age
/obj/item/trash/Initialize(mapload)
if(!mapload || !config.persistence_ignore_mapload)
if(!ml || !config.persistence_ignore_mapload)
SSpersistence.track_value(src, /datum/persistent/filth/trash)
. = ..()
/obj/item/trash/Destroy()
SSpersistence.forget_value(src, /datum/persistent/filth/trash)
code/game/objects/items/weapons/candle.dm
+2 -2
View File
@@ -10,9 +10,9 @@
var/wax = 2000
var/icon_type = "candle"
/obj/item/weapon/flame/candle/New()
/obj/item/weapon/flame/candle/Initialize()
wax -= rand(800, 1000) // Enough for 27-33 minutes. 30 minutes on average.
..()
. = ..()
/obj/item/weapon/flame/candle/update_icon()
var/i
code/game/objects/items/weapons/cigs_lighters.dm
+4 -4
View File
@@ -414,8 +414,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
ignitermes = "<span class='notice'>USER fiddles with FLAME, and manages to light their NAME with the power of science.</span>"
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)
@@ -573,8 +573,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
activation_sound = 'sound/items/zippo_on.ogg'
deactivation_sound = 'sound/items/zippo_off.ogg'
/obj/item/weapon/flame/lighter/random
/obj/item/weapon/flame/lighter/random/New()
/obj/item/weapon/flame/lighter/random/Initialize()
. = ..()
icon_state = "lighter-[pick("r","c","y","g")]"
item_state = icon_state
base_state = icon_state
code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm
+6 -6
View File
@@ -10,8 +10,8 @@
var/locked = 1
var/emagged = 0
/obj/item/weapon/circuitboard/security/New()
..()
/obj/item/weapon/circuitboard/security/Initialize()
. = ..()
/obj/item/weapon/circuitboard/security/tv
name = T_BOARD("security camera monitor - television")
@@ -22,8 +22,8 @@
build_path = /obj/machinery/computer/security/engineering
req_access = list()
/obj/item/weapon/circuitboard/security/engineering/New()
..()
/obj/item/weapon/circuitboard/security/engineering/Initialize()
. = ..()
network = engineering_networks
/obj/item/weapon/circuitboard/security/mining
@@ -38,8 +38,8 @@
board_type = new /datum/frame/frame_types/display
matter = list(MAT_STEEL = 50, MAT_GLASS = 50)
/obj/item/weapon/circuitboard/security/telescreen/entertainment/New()
..()
/obj/item/weapon/circuitboard/security/telescreen/entertainment/Initialize()
. = ..()
network = NETWORK_THUNDER
/obj/item/weapon/circuitboard/security/construct(var/obj/machinery/computer/security/C)
code/game/objects/items/weapons/cosmetics.dm
+2 -1
View File
@@ -26,7 +26,8 @@
/obj/item/weapon/lipstick/random
name = "lipstick"
/obj/item/weapon/lipstick/random/New()
/obj/item/weapon/lipstick/random/Initialize()
. = ..()
colour = pick("red","purple","jade","black")
name = "[colour] lipstick"
code/game/objects/items/weapons/dna_injector.dm
+90 -89
View File
@@ -19,7 +19,8 @@
var/datatype=0
var/value=0
/obj/item/weapon/dnainjector/New()
/obj/item/weapon/dnainjector/Initialize()
. = ..()
if(datatype && block)
buf=new
buf.dna=new
@@ -142,9 +143,9 @@
datatype = DNA2_BUF_SE
value = 0xFFF
/obj/item/weapon/dnainjector/hulkmut/New()
/obj/item/weapon/dnainjector/hulkmut/Initialize()
block = HULKBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/antihulk
name = "\improper DNA injector (Anti-Hulk)"
@@ -152,9 +153,9 @@
datatype = DNA2_BUF_SE
value = 0x001
/obj/item/weapon/dnainjector/antihulk/New()
/obj/item/weapon/dnainjector/antihulk/Initialize()
block = HULKBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/xraymut
name = "\improper DNA injector (Xray)"
@@ -162,9 +163,9 @@
datatype = DNA2_BUF_SE
value = 0xFFF
/obj/item/weapon/dnainjector/xraymut/New()
/obj/item/weapon/dnainjector/xraymut/Initialize()
block = XRAYBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/antixray
name = "\improper DNA injector (Anti-Xray)"
@@ -172,9 +173,9 @@
datatype = DNA2_BUF_SE
value = 0x001
/obj/item/weapon/dnainjector/antixray/New()
/obj/item/weapon/dnainjector/antixray/Initialize()
block = XRAYBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/firemut
name = "\improper DNA injector (Fire)"
@@ -182,9 +183,9 @@
datatype = DNA2_BUF_SE
value = 0xFFF
/obj/item/weapon/dnainjector/firemut/New()
/obj/item/weapon/dnainjector/firemut/Initialize()
block = FIREBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/antifire
name = "\improper DNA injector (Anti-Fire)"
@@ -192,9 +193,9 @@
datatype = DNA2_BUF_SE
value = 0x001
/obj/item/weapon/dnainjector/antifire/New()
/obj/item/weapon/dnainjector/antifire/Initialize()
block = FIREBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/telemut
name = "\improper DNA injector (Tele.)"
@@ -202,9 +203,9 @@
datatype = DNA2_BUF_SE
value = 0xFFF
/obj/item/weapon/dnainjector/telemut/New()
/obj/item/weapon/dnainjector/telemut/Initialize()
block = TELEBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/antitele
name = "\improper DNA injector (Anti-Tele.)"
@@ -212,9 +213,9 @@
datatype = DNA2_BUF_SE
value = 0x001
/obj/item/weapon/dnainjector/antitele/New()
/obj/item/weapon/dnainjector/antitele/Initialize()
block = TELEBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/nobreath
name = "\improper DNA injector (No Breath)"
@@ -222,9 +223,9 @@
datatype = DNA2_BUF_SE
value = 0xFFF
/obj/item/weapon/dnainjector/nobreath/New()
/obj/item/weapon/dnainjector/nobreath/Initialize()
block = NOBREATHBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/antinobreath
name = "\improper DNA injector (Anti-No Breath)"
@@ -232,9 +233,9 @@
datatype = DNA2_BUF_SE
value = 0x001
/obj/item/weapon/dnainjector/antinobreath/New()
/obj/item/weapon/dnainjector/antinobreath/Initialize()
block = NOBREATHBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/remoteview
name = "\improper DNA injector (Remote View)"
@@ -242,9 +243,9 @@
datatype = DNA2_BUF_SE
value = 0xFFF
/obj/item/weapon/dnainjector/remoteview/New()
/obj/item/weapon/dnainjector/remoteview/Initialize()
block = REMOTEVIEWBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/antiremoteview
name = "\improper DNA injector (Anti-Remote View)"
@@ -252,9 +253,9 @@
datatype = DNA2_BUF_SE
value = 0x001
/obj/item/weapon/dnainjector/antiremoteview/New()
/obj/item/weapon/dnainjector/antiremoteview/Initialize()
block = REMOTEVIEWBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/regenerate
name = "\improper DNA injector (Regeneration)"
@@ -262,9 +263,9 @@
datatype = DNA2_BUF_SE
value = 0xFFF
/obj/item/weapon/dnainjector/regenerate/New()
/obj/item/weapon/dnainjector/regenerate/Initialize()
block = REGENERATEBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/antiregenerate
name = "\improper DNA injector (Anti-Regeneration)"
@@ -272,9 +273,9 @@
datatype = DNA2_BUF_SE
value = 0x001
/obj/item/weapon/dnainjector/antiregenerate/New()
/obj/item/weapon/dnainjector/antiregenerate/Initialize()
block = REGENERATEBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/runfast
name = "\improper DNA injector (Increase Run)"
@@ -282,9 +283,9 @@
datatype = DNA2_BUF_SE
value = 0xFFF
/obj/item/weapon/dnainjector/runfast/New()
/obj/item/weapon/dnainjector/runfast/Initialize()
block = INCREASERUNBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/antirunfast
name = "\improper DNA injector (Anti-Increase Run)"
@@ -292,9 +293,9 @@
datatype = DNA2_BUF_SE
value = 0x001
/obj/item/weapon/dnainjector/antirunfast/New()
/obj/item/weapon/dnainjector/antirunfast/Initialize()
block = INCREASERUNBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/morph
name = "\improper DNA injector (Morph)"
@@ -302,9 +303,9 @@
datatype = DNA2_BUF_SE
value = 0xFFF
/obj/item/weapon/dnainjector/morph/New()
/obj/item/weapon/dnainjector/morph/Initialize()
block = MORPHBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/antimorph
name = "\improper DNA injector (Anti-Morph)"
@@ -312,9 +313,9 @@
datatype = DNA2_BUF_SE
value = 0x001
/obj/item/weapon/dnainjector/antimorph/New()
/obj/item/weapon/dnainjector/antimorph/Initialize()
block = MORPHBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/noprints
name = "\improper DNA injector (No Prints)"
@@ -322,9 +323,9 @@
datatype = DNA2_BUF_SE
value = 0xFFF
/obj/item/weapon/dnainjector/noprints/New()
/obj/item/weapon/dnainjector/noprints/Initialize()
block = NOPRINTSBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/antinoprints
name = "\improper DNA injector (Anti-No Prints)"
@@ -332,9 +333,9 @@
datatype = DNA2_BUF_SE
value = 0x001
/obj/item/weapon/dnainjector/antinoprints/New()
/obj/item/weapon/dnainjector/antinoprints/Initialize()
block = NOPRINTSBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/insulation
name = "\improper DNA injector (Shock Immunity)"
@@ -342,9 +343,9 @@
datatype = DNA2_BUF_SE
value = 0xFFF
/obj/item/weapon/dnainjector/insulation/New()
/obj/item/weapon/dnainjector/insulation/Initialize()
block = SHOCKIMMUNITYBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/antiinsulation
name = "\improper DNA injector (Anti-Shock Immunity)"
@@ -352,9 +353,9 @@
datatype = DNA2_BUF_SE
value = 0x001
/obj/item/weapon/dnainjector/antiinsulation/New()
/obj/item/weapon/dnainjector/antiinsulation/Initialize()
block = SHOCKIMMUNITYBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/midgit
name = "\improper DNA injector (Small Size)"
@@ -362,9 +363,9 @@
datatype = DNA2_BUF_SE
value = 0xFFF
/obj/item/weapon/dnainjector/midgit/New()
/obj/item/weapon/dnainjector/midgit/Initialize()
block = SMALLSIZEBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/antimidgit
name = "\improper DNA injector (Anti-Small Size)"
@@ -372,9 +373,9 @@
datatype = DNA2_BUF_SE
value = 0x001
/obj/item/weapon/dnainjector/antimidgit/New()
/obj/item/weapon/dnainjector/antimidgit/Initialize()
block = SMALLSIZEBLOCK
..()
. = ..()
/////////////////////////////////////
/obj/item/weapon/dnainjector/antiglasses
@@ -383,9 +384,9 @@
datatype = DNA2_BUF_SE
value = 0x001
/obj/item/weapon/dnainjector/antiglasses/New()
/obj/item/weapon/dnainjector/antiglasses/Initialize()
block = GLASSESBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/glassesmut
name = "\improper DNA injector (Glasses)"
@@ -393,9 +394,9 @@
datatype = DNA2_BUF_SE
value = 0xFFF
/obj/item/weapon/dnainjector/glassesmut/New()
/obj/item/weapon/dnainjector/glassesmut/Initialize()
block = GLASSESBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/epimut
name = "\improper DNA injector (Epi.)"
@@ -403,9 +404,9 @@
datatype = DNA2_BUF_SE
value = 0xFFF
/obj/item/weapon/dnainjector/epimut/New()
/obj/item/weapon/dnainjector/epimut/Initialize()
block = HEADACHEBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/antiepi
name = "\improper DNA injector (Anti-Epi.)"
@@ -413,9 +414,9 @@
datatype = DNA2_BUF_SE
value = 0x001
/obj/item/weapon/dnainjector/antiepi/New()
/obj/item/weapon/dnainjector/antiepi/Initialize()
block = HEADACHEBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/anticough
name = "\improper DNA injector (Anti-Cough)"
@@ -423,9 +424,9 @@
datatype = DNA2_BUF_SE
value = 0x001
/obj/item/weapon/dnainjector/anticough/New()
/obj/item/weapon/dnainjector/anticough/Initialize()
block = COUGHBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/coughmut
name = "\improper DNA injector (Cough)"
@@ -433,9 +434,9 @@
datatype = DNA2_BUF_SE
value = 0xFFF
/obj/item/weapon/dnainjector/coughmut/New()
/obj/item/weapon/dnainjector/coughmut/Initialize()
block = COUGHBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/clumsymut
name = "\improper DNA injector (Clumsy)"
@@ -443,9 +444,9 @@
datatype = DNA2_BUF_SE
value = 0xFFF
/obj/item/weapon/dnainjector/clumsymut/New()
/obj/item/weapon/dnainjector/clumsymut/Initialize()
block = CLUMSYBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/anticlumsy
name = "\improper DNA injector (Anti-Clumy)"
@@ -453,9 +454,9 @@
datatype = DNA2_BUF_SE
value = 0x001
/obj/item/weapon/dnainjector/anticlumsy/New()
/obj/item/weapon/dnainjector/anticlumsy/Initialize()
block = CLUMSYBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/antitour
name = "\improper DNA injector (Anti-Tour.)"
@@ -463,9 +464,9 @@
datatype = DNA2_BUF_SE
value = 0x001
/obj/item/weapon/dnainjector/antitour/New()
/obj/item/weapon/dnainjector/antitour/Initialize()
block = TWITCHBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/tourmut
name = "\improper DNA injector (Tour.)"
@@ -473,9 +474,9 @@
datatype = DNA2_BUF_SE
value = 0xFFF
/obj/item/weapon/dnainjector/tourmut/New()
/obj/item/weapon/dnainjector/tourmut/Initialize()
block = TWITCHBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/stuttmut
name = "\improper DNA injector (Stutt.)"
@@ -483,9 +484,9 @@
datatype = DNA2_BUF_SE
value = 0xFFF
/obj/item/weapon/dnainjector/stuttmut/New()
/obj/item/weapon/dnainjector/stuttmut/Initialize()
block = NERVOUSBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/antistutt
name = "\improper DNA injector (Anti-Stutt.)"
@@ -493,9 +494,9 @@
datatype = DNA2_BUF_SE
value = 0x001
/obj/item/weapon/dnainjector/antistutt/New()
/obj/item/weapon/dnainjector/antistutt/Initialize()
block = NERVOUSBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/blindmut
name = "\improper DNA injector (Blind)"
@@ -503,9 +504,9 @@
datatype = DNA2_BUF_SE
value = 0xFFF
/obj/item/weapon/dnainjector/blindmut/New()
/obj/item/weapon/dnainjector/blindmut/Initialize()
block = BLINDBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/antiblind
name = "\improper DNA injector (Anti-Blind)"
@@ -513,9 +514,9 @@
datatype = DNA2_BUF_SE
value = 0x001
/obj/item/weapon/dnainjector/antiblind/New()
/obj/item/weapon/dnainjector/antiblind/Initialize()
block = BLINDBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/deafmut
name = "\improper DNA injector (Deaf)"
@@ -523,9 +524,9 @@
datatype = DNA2_BUF_SE
value = 0xFFF
/obj/item/weapon/dnainjector/deafmut/New()
/obj/item/weapon/dnainjector/deafmut/Initialize()
block = DEAFBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/antideaf
name = "\improper DNA injector (Anti-Deaf)"
@@ -533,9 +534,9 @@
datatype = DNA2_BUF_SE
value = 0x001
/obj/item/weapon/dnainjector/antideaf/New()
/obj/item/weapon/dnainjector/antideaf/Initialize()
block = DEAFBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/hallucination
name = "\improper DNA injector (Halluctination)"
@@ -543,9 +544,9 @@
datatype = DNA2_BUF_SE
value = 0xFFF
/obj/item/weapon/dnainjector/hallucination/New()
/obj/item/weapon/dnainjector/hallucination/Initialize()
block = HALLUCINATIONBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/antihallucination
name = "\improper DNA injector (Anti-Hallucination)"
@@ -553,9 +554,9 @@
datatype = DNA2_BUF_SE
value = 0x001
/obj/item/weapon/dnainjector/antihallucination/New()
/obj/item/weapon/dnainjector/antihallucination/Initialize()
block = HALLUCINATIONBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/h2m
name = "\improper DNA injector (Human > Monkey)"
@@ -563,9 +564,9 @@
datatype = DNA2_BUF_SE
value = 0xFFF
/obj/item/weapon/dnainjector/h2m/New()
/obj/item/weapon/dnainjector/h2m/Initialize()
block = MONKEYBLOCK
..()
. = ..()
/obj/item/weapon/dnainjector/m2h
name = "\improper DNA injector (Monkey > Human)"
@@ -573,6 +574,6 @@
datatype = DNA2_BUF_SE
value = 0x001
/obj/item/weapon/dnainjector/m2h/New()
/obj/item/weapon/dnainjector/m2h/Initialize()
block = MONKEYBLOCK
..()
. = ..()
code/game/objects/items/weapons/ecigs.dm
+26 -25
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()
. = ..()
ec_cartridge = new cartridge_type(src)
/obj/item/clothing/mask/smokable/ecig/examine(mob/user)
@@ -61,8 +61,8 @@
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()
. = ..()
color = pick(ecig_colors)
/obj/item/clothing/mask/smokable/ecig/deluxe
@@ -153,7 +153,8 @@
volume = 20
flags = OPENCONTAINER
/obj/item/weapon/reagent_containers/ecig_cartridge/New()
/obj/item/weapon/reagent_containers/ecig_cartridge/Initialize()
. = ..()
create_reagents(volume)
/obj/item/weapon/reagent_containers/ecig_cartridge/examine(mob/user as mob)//to see how much left
@@ -168,32 +169,32 @@
/obj/item/weapon/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/weapon/reagent_containers/ecig_cartridge/blanknico/New()
..()
/obj/item/weapon/reagent_containers/ecig_cartridge/blanknico/Initialize()
. = ..()
reagents.add_reagent("nicotine", 5)
reagents.add_reagent("water", 10)
/obj/item/weapon/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/weapon/reagent_containers/ecig_cartridge/med_nicotine/New()
..()
/obj/item/weapon/reagent_containers/ecig_cartridge/med_nicotine/Initialize()
. = ..()
reagents.add_reagent("nicotine", 5)
reagents.add_reagent("water", 15)
/obj/item/weapon/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/weapon/reagent_containers/ecig_cartridge/high_nicotine/New()
..()
/obj/item/weapon/reagent_containers/ecig_cartridge/high_nicotine/Initialize()
. = ..()
reagents.add_reagent("nicotine", 10)
reagents.add_reagent("water", 10)
/obj/item/weapon/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/weapon/reagent_containers/ecig_cartridge/orange/New()
..()
/obj/item/weapon/reagent_containers/ecig_cartridge/orange/Initialize()
. = ..()
reagents.add_reagent("nicotine", 5)
reagents.add_reagent("water", 10)
reagents.add_reagent("orangejuice", 5)
@@ -201,8 +202,8 @@
/obj/item/weapon/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/weapon/reagent_containers/ecig_cartridge/mint/New()
..()
/obj/item/weapon/reagent_containers/ecig_cartridge/mint/Initialize()
. = ..()
reagents.add_reagent("nicotine", 5)
reagents.add_reagent("water", 10)
reagents.add_reagent("menthol", 5)
@@ -210,8 +211,8 @@
/obj/item/weapon/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/weapon/reagent_containers/ecig_cartridge/watermelon/New()
..()
/obj/item/weapon/reagent_containers/ecig_cartridge/watermelon/Initialize()
. = ..()
reagents.add_reagent("nicotine", 5)
reagents.add_reagent("water", 10)
reagents.add_reagent("watermelonjuice", 5)
@@ -219,8 +220,8 @@
/obj/item/weapon/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/weapon/reagent_containers/ecig_cartridge/grape/New()
..()
/obj/item/weapon/reagent_containers/ecig_cartridge/grape/Initialize()
. = ..()
reagents.add_reagent("nicotine", 5)
reagents.add_reagent("water", 10)
reagents.add_reagent("grapejuice", 5)
@@ -228,8 +229,8 @@
/obj/item/weapon/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/weapon/reagent_containers/ecig_cartridge/lemonlime/New()
..()
/obj/item/weapon/reagent_containers/ecig_cartridge/lemonlime/Initialize()
. = ..()
reagents.add_reagent("nicotine", 5)
reagents.add_reagent("water", 10)
reagents.add_reagent("lemon_lime", 5)
@@ -237,8 +238,8 @@
/obj/item/weapon/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/weapon/reagent_containers/ecig_cartridge/coffee/New()
..()
/obj/item/weapon/reagent_containers/ecig_cartridge/coffee/Initialize()
. = ..()
reagents.add_reagent("nicotine", 5)
reagents.add_reagent("water", 10)
reagents.add_reagent("coffee", 5)
@@ -246,8 +247,8 @@
/obj/item/weapon/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/weapon/reagent_containers/ecig_cartridge/cannabis/New()
..()
/obj/item/weapon/reagent_containers/ecig_cartridge/cannabis/Initialize()
. = ..()
reagents.add_reagent("nicotine", 5)
reagents.add_reagent("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/weapon/plastique/New()
/obj/item/weapon/plastique/Initialize()
wires = new(src)
image_overlay = image('icons/obj/assemblies.dmi', "plastic-explosive2")
..()
. = ..()
/obj/item/weapon/plastique/Destroy()
qdel(wires)
code/game/objects/items/weapons/flamethrower.dm
+2 -3
View File
@@ -193,12 +193,11 @@
//location.hotspot_expose(1000,500,1)
return
/obj/item/weapon/flamethrower/full/New(var/loc)
..()
/obj/item/weapon/flamethrower/full/Initialize(var/ml)
. = ..(ml)
weldtool = new /obj/item/weapon/weldingtool(src)
weldtool.status = 0
igniter = new /obj/item/device/assembly/igniter(src)
igniter.secured = 0
status = 1
update_icon()
return
code/game/objects/items/weapons/game_kit.dm
+2 -1
View File
@@ -3,9 +3,10 @@ CONTAINS:
THAT STUPID GAME KIT
*/
/obj/item/weapon/game_kit/New()
/obj/item/weapon/game_kit/Initialize()
src.board_stat = "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"
src.selected = "CR"
. = ..()
/obj/item/weapon/game_kit/attack_paw(mob/user as mob)
return src.attack_hand(user)
code/game/objects/items/weapons/gift_wrappaper.dm
+2 -2
View File
@@ -16,8 +16,8 @@
drop_sound = 'sound/items/drop/cardboardbox.ogg'
pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
/obj/item/weapon/a_gift/New()
..()
/obj/item/weapon/a_gift/Initialize()
. = ..()
pixel_x = rand(-10,10)
pixel_y = rand(-10,10)
if(w_class > 0 && w_class < ITEMSIZE_LARGE)
code/game/objects/items/weapons/grenades/flashbang.dm
+8 -18
View File
@@ -22,8 +22,8 @@
damage *= B.overmind.blob_type.burn_multiplier
B.adjust_integrity(-damage)
new/obj/effect/effect/sparks(src.loc)
new/obj/effect/effect/smoke/illumination(src.loc, 5, range=30, power=30, color="#FFFFFF")
new /obj/effect/effect/sparks(src.loc)
new /obj/effect/effect/smoke/illumination(src.loc, 5, 30, 30, "#FFFFFF")
qdel(src)
@@ -135,31 +135,21 @@
can_repeat = FALSE
banglet = TRUE
/obj/item/weapon/grenade/flashbang/clusterbang/segment/New()//Segments should never exist except part of the clusterbang, since these immediately 'do their thing' and asplode
..()
/obj/item/weapon/grenade/flashbang/clusterbang/segment/Initialize() //Segments should never exist except part of the clusterbang, since these immediately 'do their thing' and asplode
. = ..()
icon_state = "clusterbang_segment_active"
var/stepdist = rand(1,4)//How far to step
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/detonate), rand(15, 60))
/obj/item/weapon/grenade/flashbang/cluster
banglet = TRUE
/obj/item/weapon/grenade/flashbang/cluster/New()//Same concept as the segments, so that all of the parts don't become reliant on the clusterbang
..()
/obj/item/weapon/grenade/flashbang/cluster/Initialize() //Same concept as the segments, so that all of the parts don't become reliant on the clusterbang
. = ..()
icon_state = "flashbang_active"
var/stepdist = rand(1,3)
var/temploc = src.loc
walk_away(src,temploc,stepdist)
var/dettime = rand(15,60)
spawn(dettime)
detonate()
addtimer(CALLBACK(src, .proc/detonate), rand(15, 60))
code/game/objects/items/weapons/grenades/smokebomb.dm
+2 -2
View File
@@ -10,8 +10,8 @@
var/smoke_color
var/smoke_strength = 8
/obj/item/weapon/grenade/smokebomb/New()
..()
/obj/item/weapon/grenade/smokebomb/Initialize()
. = ..()
src.smoke = new /datum/effect/effect/system/smoke_spread/bad()
src.smoke.attach(src)
code/game/objects/items/weapons/id cards/cards.dm
+1 -1
View File
@@ -27,7 +27,7 @@
drop_sound = 'sound/items/drop/card.ogg'
pickup_sound = 'sound/items/pickup/card.ogg'
/obj/item/weapon/card/New()
/obj/item/weapon/card/Initialize()
. = ..()
reset_icon()
code/game/objects/items/weapons/implants/implant.dm
+4 -4
View File
@@ -110,9 +110,9 @@ GLOBAL_LIST_BOILERPLATE(all_tracking_implants, /obj/item/weapon/implant/tracking
/obj/item/weapon/implant/tracking/weak //This is for the loadout
degrade_time = 2.5 MINUTES
/obj/item/weapon/implant/tracking/New()
/obj/item/weapon/implant/tracking/Initialize()
id = rand(1, 1000)
..()
. = ..()
/obj/item/weapon/implant/tracking/post_implant(var/mob/source)
START_PROCESSING(SSobj, src)
@@ -375,8 +375,8 @@ Can only be loaded while still in its original case.<BR>
the implant may become unstable and either pre-maturely inject the subject or simply break."}
return dat
/obj/item/weapon/implant/chem/New()
..()
/obj/item/weapon/implant/chem/Initialize()
. = ..()
var/datum/reagents/R = new/datum/reagents(50)
reagents = R
R.my_atom = src
code/game/objects/items/weapons/implants/implantcase.dm
+48 -80
View File
@@ -67,245 +67,213 @@
desc = "A case containing a tracking implant."
icon_state = "implantcase-b"
/obj/item/weapon/implantcase/tracking/New()
/obj/item/weapon/implantcase/tracking/Initialize()
src.imp = new /obj/item/weapon/implant/tracking( src )
..()
return
. = ..()
/obj/item/weapon/implantcase/explosive
name = "glass case - 'explosive'"
desc = "A case containing an explosive implant."
icon_state = "implantcase-r"
/obj/item/weapon/implantcase/explosive/New()
/obj/item/weapon/implantcase/explosive/Initialize()
src.imp = new /obj/item/weapon/implant/explosive( src )
..()
return
. = ..()
/obj/item/weapon/implantcase/chem
name = "glass case - 'chem'"
desc = "A case containing a chemical implant."
icon_state = "implantcase-b"
/obj/item/weapon/implantcase/chem/New()
/obj/item/weapon/implantcase/chem/Initialize()
src.imp = new /obj/item/weapon/implant/chem( src )
..()
return
. = ..()
/obj/item/weapon/implantcase/loyalty
name = "glass case - 'loyalty'"
desc = "A case containing a loyalty implant."
icon_state = "implantcase-r"
/obj/item/weapon/implantcase/loyalty/New()
/obj/item/weapon/implantcase/loyalty/Initialize()
src.imp = new /obj/item/weapon/implant/loyalty( src )
..()
return
. = ..()
/obj/item/weapon/implantcase/death_alarm
name = "glass case - 'death alarm'"
desc = "A case containing a death alarm implant."
icon_state = "implantcase-b"
/obj/item/weapon/implantcase/death_alarm/New()
/obj/item/weapon/implantcase/death_alarm/Initialize()
src.imp = new /obj/item/weapon/implant/death_alarm( src )
..()
return
. = ..()
/obj/item/weapon/implantcase/freedom
name = "glass case - 'freedom'"
desc = "A case containing a freedom implant."
icon_state = "implantcase-r"
/obj/item/weapon/implantcase/freedom/New()
/obj/item/weapon/implantcase/freedom/Initialize()
src.imp = new /obj/item/weapon/implant/freedom( src )
..()
return
. = ..()
/obj/item/weapon/implantcase/adrenalin
name = "glass case - 'adrenalin'"
desc = "A case containing an adrenalin implant."
icon_state = "implantcase-b"
/obj/item/weapon/implantcase/adrenalin/New()
/obj/item/weapon/implantcase/adrenalin/Initialize()
src.imp = new /obj/item/weapon/implant/adrenalin( src )
..()
return
. = ..()
/obj/item/weapon/implantcase/dexplosive
name = "glass case - 'explosive'"
desc = "A case containing an explosive."
icon_state = "implantcase-r"
/obj/item/weapon/implantcase/dexplosive/New()
/obj/item/weapon/implantcase/dexplosive/Initialize()
src.imp = new /obj/item/weapon/implant/dexplosive( src )
..()
return
. = ..()
/obj/item/weapon/implantcase/health
name = "glass case - 'health'"
desc = "A case containing a health tracking implant."
icon_state = "implantcase-b"
/obj/item/weapon/implantcase/health/New()
/obj/item/weapon/implantcase/health/Initialize()
src.imp = new /obj/item/weapon/implant/health( src )
..()
return
. = ..()
/obj/item/weapon/implantcase/language
name = "glass case - 'GalCom'"
desc = "A case containing a GalCom language implant."
icon_state = "implantcase-b"
/obj/item/weapon/implantcase/language/New()
/obj/item/weapon/implantcase/language/Initialize()
src.imp = new /obj/item/weapon/implant/language( src )
..()
return
. = ..()
/obj/item/weapon/implantcase/language/eal
name = "glass case - 'EAL'"
desc = "A case containing an Encoded Audio Language implant."
icon_state = "implantcase-b"
/obj/item/weapon/implantcase/language/eal/New()
/obj/item/weapon/implantcase/language/eal/Initialize()
src.imp = new /obj/item/weapon/implant/language/eal( src )
..()
return
. = ..()
/obj/item/weapon/implantcase/shades
name = "glass case - 'Integrated Shades'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/weapon/implantcase/shades/New()
/obj/item/weapon/implantcase/shades/Initialize()
src.imp = new /obj/item/weapon/implant/organ( src )
..()
return
. = ..()
/obj/item/weapon/implantcase/taser
name = "glass case - 'Taser'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/weapon/implantcase/taser/New()
/obj/item/weapon/implantcase/taser/Initialize()
src.imp = new /obj/item/weapon/implant/organ/limbaugment( src )
..()
return
. = ..()
/obj/item/weapon/implantcase/laser
name = "glass case - 'Laser'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/weapon/implantcase/laser/New()
/obj/item/weapon/implantcase/laser/Initialize()
src.imp = new /obj/item/weapon/implant/organ/limbaugment/laser( src )
..()
return
. = ..()
/obj/item/weapon/implantcase/dart
name = "glass case - 'Dart'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/weapon/implantcase/dart/New()
/obj/item/weapon/implantcase/dart/Initialize()
src.imp = new /obj/item/weapon/implant/organ/limbaugment/dart( src )
..()
return
. = ..()
/obj/item/weapon/implantcase/toolkit
name = "glass case - 'Toolkit'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/weapon/implantcase/toolkit/New()
/obj/item/weapon/implantcase/toolkit/Initialize()
src.imp = new /obj/item/weapon/implant/organ/limbaugment/upperarm( src )
..()
return
. = ..()
/obj/item/weapon/implantcase/medkit
name = "glass case - 'Toolkit'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/weapon/implantcase/medkit/New()
/obj/item/weapon/implantcase/medkit/Initialize()
src.imp = new /obj/item/weapon/implant/organ/limbaugment/upperarm/medkit( src )
..()
return
. = ..()
/obj/item/weapon/implantcase/surge
name = "glass case - 'Muscle Overclocker'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/weapon/implantcase/surge/New()
/obj/item/weapon/implantcase/surge/Initialize()
src.imp = new /obj/item/weapon/implant/organ/limbaugment/upperarm/surge( src )
..()
return
. = ..()
/obj/item/weapon/implantcase/analyzer
name = "glass case - 'Scanner'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/weapon/implantcase/analyzer/New()
/obj/item/weapon/implantcase/analyzer/Initialize()
src.imp = new /obj/item/weapon/implant/organ/limbaugment/wrist( src )
..()
return
. = ..()
/obj/item/weapon/implantcase/sword
name = "glass case - 'Scanner'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/weapon/implantcase/sword/New()
/obj/item/weapon/implantcase/sword/Initialize()
src.imp = new /obj/item/weapon/implant/organ/limbaugment/wrist/sword( src )
..()
return
. = ..()
/obj/item/weapon/implantcase/sprinter
name = "glass case - 'Sprinter'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/weapon/implantcase/sprinter/New()
/obj/item/weapon/implantcase/sprinter/Initialize()
src.imp = new /obj/item/weapon/implant/organ/pelvic( src )
..()
return
. = ..()
/obj/item/weapon/implantcase/armblade
name = "glass case - 'Armblade'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/weapon/implantcase/armblade/New()
/obj/item/weapon/implantcase/armblade/Initialize()
src.imp = new /obj/item/weapon/implant/organ/limbaugment/upperarm/blade( src )
..()
return
. = ..()
/obj/item/weapon/implantcase/handblade
name = "glass case - 'Handblade'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/weapon/implantcase/handblade/New()
/obj/item/weapon/implantcase/handblade/Initialize()
src.imp = new /obj/item/weapon/implant/organ/limbaugment/wrist/blade( src )
..()
return
. = ..()
/obj/item/weapon/implantcase/restrainingbolt
name = "glass case - 'Restraining Bolt'"
desc = "A case containing a restraining bolt."
icon_state = "implantcase-b"
/obj/item/weapon/implantcase/restrainingbolt/New()
/obj/item/weapon/implantcase/restrainingbolt/Initialize()
src.imp = new /obj/item/weapon/implant/restrainingbolt( src )
..()
return
. = ..()
code/game/objects/items/weapons/implants/implantchair.dm
+2 -2
View File
@@ -19,8 +19,8 @@
var/mob/living/carbon/occupant = null
var/injecting = 0
/obj/machinery/implantchair/New()
..()
/obj/machinery/implantchair/Initialize()
. = ..()
add_implants()
code/game/objects/items/weapons/implants/implantcircuits.dm
+2 -2
View File
@@ -8,8 +8,8 @@
/obj/item/weapon/implant/integrated_circuit/islegal()
return TRUE
/obj/item/weapon/implant/integrated_circuit/New()
..()
/obj/item/weapon/implant/integrated_circuit/Initialize()
. = ..()
IC = new(src)
IC.implant = src
code/game/objects/items/weapons/implants/implanter.dm
+10 -19
View File
@@ -29,15 +29,12 @@
imp = null
update()
return
/obj/item/weapon/implanter/proc/update()
if (src.imp)
src.icon_state = "implanter1"
else
src.icon_state = "implanter0"
src.icon_state += "_[active]"
return
/obj/item/weapon/implanter/attack(mob/M as mob, mob/user as mob)
if (!istype(M, /mob/living/carbon))
@@ -73,39 +70,35 @@
/obj/item/weapon/implanter/loyalty
name = "implanter-loyalty"
/obj/item/weapon/implanter/loyalty/New()
/obj/item/weapon/implanter/loyalty/Initialize()
src.imp = new /obj/item/weapon/implant/loyalty( src )
..()
. = ..()
update()
return
/obj/item/weapon/implanter/explosive
name = "implanter (E)"
/obj/item/weapon/implanter/explosive/New()
/obj/item/weapon/implanter/explosive/Initialize()
src.imp = new /obj/item/weapon/implant/explosive( src )
..()
. = ..()
update()
return
/obj/item/weapon/implanter/adrenalin
name = "implanter-adrenalin"
/obj/item/weapon/implanter/adrenalin/New()
/obj/item/weapon/implanter/adrenalin/Initialize()
src.imp = new /obj/item/weapon/implant/adrenalin(src)
..()
. = ..()
update()
return
/obj/item/weapon/implanter/compressed
name = "implanter (C)"
icon_state = "cimplanter1"
/obj/item/weapon/implanter/compressed/New()
/obj/item/weapon/implanter/compressed/Initialize()
imp = new /obj/item/weapon/implant/compressed( src )
..()
. = ..()
update()
return
/obj/item/weapon/implanter/compressed/update()
if (imp)
@@ -116,7 +109,6 @@
icon_state = "cimplanter2"
else
icon_state = "cimplanter0"
return
/obj/item/weapon/implanter/compressed/attack(mob/M as mob, mob/user as mob)
var/obj/item/weapon/implant/compressed/c = imp
@@ -154,8 +146,7 @@
/obj/item/weapon/implanter/restrainingbolt
name = "implanter (bolt)"
/obj/item/weapon/implanter/restrainingbolt/New()
/obj/item/weapon/implanter/restrainingbolt/Initialize()
src.imp = new /obj/item/weapon/implant/restrainingbolt( src )
..()
. = ..()
update()
return
code/game/objects/items/weapons/implants/implantfreedom.dm
+2 -4
View File
@@ -8,12 +8,10 @@
var/uses = 1.0
/obj/item/weapon/implant/freedom/New()
/obj/item/weapon/implant/freedom/Initialize()
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/weapon/implant/freedom/trigger(emote, mob/living/carbon/source as mob)
if (src.uses < 1)
code/game/objects/items/weapons/implants/implantuplink.dm
+2 -4
View File
@@ -3,13 +3,12 @@
desc = "Summon things."
var/activation_emote = "chuckle"
/obj/item/weapon/implant/uplink/New()
/obj/item/weapon/implant/uplink/Initialize()
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/weapon/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/weapon/implant/uplink/trigger(emote, mob/source as mob)
if(hidden_uplink && usr == source) // Let's not have another people activate our uplink
hidden_uplink.check_trigger(source, emote, activation_emote)
return
code/game/objects/items/weapons/manuals.dm
+16 -16
View File
@@ -13,8 +13,8 @@
author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
title = "Station Repairs and Construction"
/obj/item/weapon/book/manual/engineering_construction/New()
..()
/obj/item/weapon/book/manual/engineering_construction/Initialize()
. = ..()
dat = {"
<html><head>
@@ -35,8 +35,8 @@
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/weapon/book/manual/engineering_particle_accelerator/New()
..()
/obj/item/weapon/book/manual/engineering_particle_accelerator/Initialize()
. = ..()
dat = {"<html>
<head>
<style>
@@ -83,8 +83,8 @@
author = "Central Engineering Division"
title = "Supermatter Engine Operating Manual"
/obj/item/weapon/book/manual/supermatter_engine/New()
..()
/obj/item/weapon/book/manual/supermatter_engine/Initialize()
. = ..()
dat = {"<html>
<head>
<style>
@@ -237,8 +237,8 @@
author = "Cindy Crawfish"
title = "R-UST Operating Manual"
/obj/item/weapon/book/manual/rust_engine/New()
..()
/obj/item/weapon/book/manual/rust_engine/Initialize()
. = ..()
dat = {"<html>
<head>
<style>
@@ -278,8 +278,8 @@
author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
title = "Hacking"
/obj/item/weapon/book/manual/engineering_hacking/New()
..()
/obj/item/weapon/book/manual/engineering_hacking/Initialize()
. = ..()
dat = {"
<html><head>
@@ -842,8 +842,8 @@
author = "The Company"
title = "Corporate Regulations"
/obj/item/weapon/book/manual/security_space_law/New()
..()
/obj/item/weapon/book/manual/security_space_law/Initialize()
. = ..()
dat = {"
<html><head>
@@ -867,8 +867,8 @@
author = "Medical Department"
title = "Medical Diagnostics Manual"
/obj/item/weapon/book/manual/medical_diagnostics_manual/New()
..()
/obj/item/weapon/book/manual/medical_diagnostics_manual/Initialize()
. = ..()
dat = {"<html>
<head>
<style>
@@ -915,8 +915,8 @@
author = "Engineering Encyclopedia"
title = "Engineering Textbook"
/obj/item/weapon/book/manual/engineering_guide/New()
..()
/obj/item/weapon/book/manual/engineering_guide/Initialize()
. = ..()
dat = {"
<html><head>
code/game/objects/items/weapons/material/ashtray.dm
+9 -11
View File
@@ -10,15 +10,13 @@ var/global/list/ashtray_cache = list()
var/image/base_image
var/max_butts = 10
/obj/item/weapon/material/ashtray/New(var/newloc, var/material_name)
..(newloc, material_name)
/obj/item/weapon/material/ashtray/Initialize(var/ml, var/material_name)
. = ..(ml, material_name)
if(!material)
qdel(src)
return
return INITIALIZE_HINT_QDEL
max_butts = round(material.hardness/5) //This is arbitrary but whatever.
randpixel_xy()
update_icon()
return
/obj/item/weapon/material/ashtray/update_icon()
color = null
@@ -92,11 +90,11 @@ var/global/list/ashtray_cache = list()
update_icon()
return ..()
/obj/item/weapon/material/ashtray/plastic/New(var/newloc)
..(newloc, "plastic")
/obj/item/weapon/material/ashtray/plastic/Initialize(var/ml)
. = ..(ml, MAT_PLASTIC)
/obj/item/weapon/material/ashtray/bronze/New(var/newloc)
..(newloc, "bronze")
/obj/item/weapon/material/ashtray/bronze/Initialize(var/ml)
. = ..(ml, MAT_BRONZE)
/obj/item/weapon/material/ashtray/glass/New(var/newloc)
..(newloc, "glass")
/obj/item/weapon/material/ashtray/glass/Initialize(var/ml)
. = ..(ml, MAT_GLASS)
code/game/objects/items/weapons/material/bats.dm
+10 -10
View File
@@ -13,17 +13,17 @@
slot_flags = SLOT_BACK
//Predefined materials go here.
/obj/item/weapon/material/twohanded/baseballbat/metal/New(var/newloc)
..(newloc,"steel")
/obj/item/weapon/material/twohanded/baseballbat/metal/Initialize(var/ml)
..(ml, MAT_STEEL)
/obj/item/weapon/material/twohanded/baseballbat/uranium/New(var/newloc)
..(newloc,"uranium")
/obj/item/weapon/material/twohanded/baseballbat/uranium/Initialize(var/ml)
..(ml, MAT_URANIUM)
/obj/item/weapon/material/twohanded/baseballbat/gold/New(var/newloc)
..(newloc,"gold")
/obj/item/weapon/material/twohanded/baseballbat/gold/Initialize(var/ml)
..(ml, MAT_GOLD)
/obj/item/weapon/material/twohanded/baseballbat/platinum/New(var/newloc)
..(newloc,"platinum")
/obj/item/weapon/material/twohanded/baseballbat/platinum/Initialize(var/ml)
..(ml, MAT_PLATINUM)
/obj/item/weapon/material/twohanded/baseballbat/diamond/New(var/newloc)
..(newloc,"diamond")
/obj/item/weapon/material/twohanded/baseballbat/diamond/Initialize(var/ml)
..(ml, MAT_DIAMOND)
code/game/objects/items/weapons/material/chainsaw.dm
+2 -2
View File
@@ -12,13 +12,13 @@
var/active_force = 55
var/inactive_force = 10
/obj/item/weapon/chainsaw/New()
/obj/item/weapon/chainsaw/Initialize()
var/datum/reagents/R = new/datum/reagents(max_fuel)
reagents = R
R.my_atom = src
R.add_reagent("fuel", max_fuel)
START_PROCESSING(SSobj, src)
..()
. = ..()
/obj/item/weapon/chainsaw/Destroy()
STOP_PROCESSING(SSobj, src)
code/game/objects/items/weapons/material/foam.dm
+8 -8
View File
@@ -1,5 +1,5 @@
/obj/item/weapon/material/twohanded/baseballbat/foam/New(var/newloc)
..(newloc,"foam")
/obj/item/weapon/material/twohanded/baseballbat/foam/Initialize(var/ml)
. = ..(ml, "foam")
/obj/item/weapon/material/sword/foam
attack_verb = list("bonked","whacked")
@@ -12,8 +12,8 @@
force_divisor = 0
unbreakable = 1
/obj/item/weapon/material/sword/foam/New(var/newloc)
..(newloc,"foam")
/obj/item/weapon/material/sword/foam/Initialize(var/ml)
. = ..(ml, "foam")
/obj/item/weapon/material/twohanded/spear/foam
attack_verb = list("bonked","whacked")
@@ -24,8 +24,8 @@
icon_state = "spear_mask0"
unbreakable = 1
/obj/item/weapon/material/twohanded/spear/foam/New(var/newloc)
..(newloc,"foam")
/obj/item/weapon/material/twohanded/spear/foam/Initialize(var/ml)
. = ..(ml, "foam")
/obj/item/weapon/material/twohanded/fireaxe/foam
attack_verb = list("bonked","whacked")
@@ -36,8 +36,8 @@
icon_state = "fireaxe_mask0"
unbreakable = 1
/obj/item/weapon/material/twohanded/fireaxe/foam/New(var/newloc)
..(newloc,"foam")
/obj/item/weapon/material/twohanded/fireaxe/foam/Initialize(var/ml)
. = ..(ml,"foam")
/obj/item/weapon/material/twohanded/fireaxe/foam/afterattack()
return
code/game/objects/items/weapons/material/material_armor.dm
+2 -2
View File
@@ -35,8 +35,8 @@ Protectiveness | Armor %
var/material_slowdown_modifier = 0
var/material_slowdown_multiplier = 0.5
/obj/item/clothing/New(var/newloc, var/material_key)
..(newloc)
/obj/item/clothing/Initialize(var/ml, var/material_key)
. = ..(ml)
if(!material_key)
material_key = default_material
if(material_key) // May still be null if a material was not specified as a default.
code/game/objects/items/weapons/material/material_weapons.dm
+2 -2
View File
@@ -27,8 +27,8 @@
var/datum/material/material
var/drops_debris = 1
/obj/item/weapon/material/New(var/newloc, var/material_key)
..(newloc)
/obj/item/weapon/material/Initialize(var/ml, var/material_key)
. = ..(ml)
if(!material_key)
material_key = default_material
set_material(material_key)
code/game/objects/items/weapons/material/shards.dm
+4 -4
View File
@@ -142,8 +142,8 @@
return
// Preset types - left here for the code that uses them
/obj/item/weapon/material/shard/shrapnel/New(loc)
..(loc, "steel")
/obj/item/weapon/material/shard/shrapnel/Initialize(var/ml)
. = ..(ml, MAT_STEEL)
/obj/item/weapon/material/shard/phoron/New(loc)
..(loc, "borosilicate glass")
/obj/item/weapon/material/shard/phoron/Initialize(var/ml)
. = ..(ml, "borosilicate glass")
code/game/objects/items/weapons/material/thrown.dm
+2 -2
View File
@@ -9,8 +9,8 @@
sharp = TRUE
edge = TRUE
/obj/item/weapon/material/star/New()
..()
/obj/item/weapon/material/star/Initialize()
. = ..()
src.pixel_x = rand(-12, 12)
src.pixel_y = rand(-12, 12)
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/weapon/material/twohanded/New()
..()
/obj/item/weapon/material/twohanded/Initialize()
. = ..()
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/twohanded.dm.orig
+224
View File
@@ -0,0 +1,224 @@
/* Two-handed Weapons
* Contains:
* Twohanded
* Fireaxe
* Double-Bladed Energy Swords
*/
/*##################################################################
##################### TWO HANDED WEAPONS BE HERE~ -Agouri :3 ########
####################################################################*/
//Rewrote TwoHanded weapons stuff and put it all here. Just copypasta fireaxe to make new ones ~Carn
//This rewrite means we don't have two variables for EVERY item which are used only by a few weapons.
//It also tidies stuff up elsewhere.
/*
* Twohanded
*/
/obj/item/weapon/material/twohanded
w_class = 4
var/wielded = 0
var/force_wielded = 0
var/force_unwielded
var/wieldsound = null
var/unwieldsound = null
var/base_icon
var/base_name
var/unwielded_force_divisor = 0.25
/obj/item/weapon/material/twohanded/proc/unwield()
wielded = 0
force = force_unwielded
name = "[base_name]"
update_icon()
/obj/item/weapon/material/twohanded/proc/wield()
wielded = 1
force = force_wielded
name = "[base_name] (Wielded)"
update_icon()
/obj/item/weapon/material/twohanded/update_force()
base_name = name
if(sharp || edge)
force_wielded = material.get_edge_damage()
else
force_wielded = material.get_blunt_damage()
force_wielded = round(force_wielded*force_divisor)
force_unwielded = round(force_wielded*unwielded_force_divisor)
force = force_unwielded
throwforce = round(force*thrown_force_divisor)
//world << "[src] has unwielded force [force_unwielded], wielded force [force_wielded] and throwforce [throwforce] when made from default material [material.name]"
/obj/item/weapon/material/twohanded/Initialize()
. = ..()
update_icon()
/obj/item/weapon/material/twohanded/mob_can_equip(M as mob, slot)
//Cannot equip wielded items.
if(wielded)
M << "<span class='warning'>Unwield the [base_name] first!</span>"
return 0
return ..()
/obj/item/weapon/material/twohanded/dropped(mob/user as mob)
//handles unwielding a twohanded weapon when dropped as well as clearing up the offhand
if(user)
var/obj/item/weapon/material/twohanded/O = user.get_inactive_hand()
if(istype(O))
O.unwield()
return unwield()
/obj/item/weapon/material/twohanded/update_icon()
icon_state = "[base_icon][wielded]"
item_state = icon_state
/obj/item/weapon/material/twohanded/pickup(mob/user)
unwield()
/obj/item/weapon/material/twohanded/attack_self(mob/user as mob)
..()
if(istype(user, /mob/living/carbon/human))
var/mob/living/carbon/human/H = user
if(H.species.is_small)
user << "<span class='warning'>It's too heavy for you to wield fully.</span>"
return
else
return
if(wielded) //Trying to unwield it
unwield()
user << "<span class='notice'>You are now carrying the [name] with one hand.</span>"
if (src.unwieldsound)
playsound(src.loc, unwieldsound, 50, 1)
var/obj/item/weapon/material/twohanded/offhand/O = user.get_inactive_hand()
if(O && istype(O))
O.unwield()
else //Trying to wield it
if(user.get_inactive_hand())
user << "<span class='warning'>You need your other hand to be empty</span>"
return
wield()
user << "<span class='notice'>You grab the [base_name] with both hands.</span>"
if (src.wieldsound)
playsound(src.loc, wieldsound, 50, 1)
var/obj/item/weapon/material/twohanded/offhand/O = new(user) ////Let's reserve his other hand~
O.name = "[base_name] - offhand"
O.desc = "Your second grip on the [base_name]."
user.put_in_inactive_hand(O)
if(istype(user,/mob/living/carbon/human))
var/mob/living/carbon/human/H = user
H.update_inv_l_hand()
H.update_inv_r_hand()
return
///////////OFFHAND///////////////
/obj/item/weapon/material/twohanded/offhand
w_class = 5
icon_state = "offhand"
name = "offhand"
default_material = "placeholder"
/obj/item/weapon/material/twohanded/offhand/unwield()
qdel(src)
/obj/item/weapon/material/twohanded/offhand/wield()
qdel(src)
/obj/item/weapon/material/twohanded/offhand/update_icon()
return
/*
* Fireaxe
*/
/obj/item/weapon/material/twohanded/fireaxe // DEM AXES MAN, marker -Agouri
icon_state = "fireaxe0"
base_icon = "fireaxe"
name = "fire axe"
desc = "Truly, the weapon of a madman. Who would think to fight fire with an axe?"
unwielded_force_divisor = 0.25
force_divisor = 0.7 // 10/42 with hardness 60 (steel) and 0.25 unwielded divisor
sharp = 1
edge = 1
slot_flags = SLOT_BACK
attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
applies_material_colour = 0
/obj/item/weapon/material/twohanded/fireaxe/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity)
if(!proximity) return
..()
if(A && wielded)
if(istype(A,/obj/structure/window))
var/obj/structure/window/W = A
W.shatter()
/*
/*
* Double-Bladed Energy Swords - Cheridan
*/
// Not sure what to do with this one, it won't work nicely with the material system,
// but I don't want to copypaste all the twohanded procs..
/obj/item/weapon/material/twohanded/dualsaber
icon_state = "dualsaber0"
base_icon = "dualsaber"
name = "double-bladed energy sword"
desc = "Handle with care."
force = 3
throwforce = 5.0
throw_speed = 1
throw_range = 5
w_class = 2.0
force_wielded = 30
wieldsound = 'sound/weapons/saberon.ogg'
unwieldsound = 'sound/weapons/saberoff.ogg'
flags = NOSHIELD
origin_tech = "magnets=3;syndicate=4"
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
sharp = 1
edge = 1
applies_material_colour = 0
/obj/item/weapon/material/twohanded/dualsaber/attack(target as mob, mob/living/user as mob)
..()
if((CLUMSY in user.mutations) && (wielded) &&prob(40))
user << "\red You twirl around a bit before losing your balance and impaling yourself on the [src]."
user.take_organ_damage(20,25)
return
if((wielded) && prob(50))
spawn(0)
for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2))
user.set_dir(i)
sleep(1)
/obj/item/weapon/material/twohanded/dualsaber/IsShield()
if(wielded)
return 1
else
return 0
*/
//spears, bay edition
/obj/item/weapon/material/twohanded/spear
icon_state = "spearglass0"
base_icon = "spearglass"
name = "spear"
desc = "A haphazardly-constructed yet still deadly weapon of ancient design."
slot_flags = SLOT_BACK
force_wielded = 0.75 // 22 when wielded with hardness 15 (glass)
unwielded_force_divisor = 0.65 // 14 when unwielded based on above
thrown_force_divisor = 1.5 // 20 when thrown with weight 15 (glass)
throw_speed = 3
edge = 1
sharp = 1
flags = NOSHIELD
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
default_material = "glass"
code/game/objects/items/weapons/melee/energy.dm
+16 -10
View File
@@ -23,23 +23,28 @@
slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi',
)
/obj/item/weapon/melee/energy/sword/green/New()
/obj/item/weapon/melee/energy/sword/green/Initialize()
. = ..()
colorable = FALSE
lcolor = "#008000"
/obj/item/weapon/melee/energy/sword/red/New()
/obj/item/weapon/melee/energy/sword/red/Initialize()
. = ..()
colorable = FALSE
lcolor = "#FF0000"
/obj/item/weapon/melee/energy/sword/blue/New()
/obj/item/weapon/melee/energy/sword/blue/Initialize()
. = ..()
colorable = FALSE
lcolor = "#0000FF"
/obj/item/weapon/melee/energy/sword/purple/New()
/obj/item/weapon/melee/energy/sword/purple/Initialize()
. = ..()
colorable = FALSE
lcolor = "#800080"
/obj/item/weapon/melee/energy/sword/white/New()
/obj/item/weapon/melee/energy/sword/white/Initialize()
. = ..()
colorable = FALSE
lcolor = "#FFFFFF"
@@ -241,8 +246,8 @@
use_cell = TRUE
hitcost = 120
/obj/item/weapon/melee/energy/axe/charge/loaded/New()
..()
/obj/item/weapon/melee/energy/axe/charge/loaded/Initialize()
. = ..()
bcell = new/obj/item/weapon/cell/device/weapon(src)
/*
@@ -401,8 +406,8 @@
hitcost = 75
/obj/item/weapon/melee/energy/sword/charge/loaded/New()
..()
/obj/item/weapon/melee/energy/sword/charge/loaded/Initialize()
. = ..()
bcell = new/obj/item/weapon/cell/device/weapon(src)
//Energy Blade (ninja uses this)
@@ -429,7 +434,8 @@
projectile_parry_chance = 60
lcolor = "#00FF00"
/obj/item/weapon/melee/energy/blade/New()
/obj/item/weapon/melee/energy/blade/Initialize()
. = ..()
spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, src)
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/weapon/melee/umbrella/New()
..()
/obj/item/weapon/melee/umbrella/Initialize()
. = ..()
update_icon()
/obj/item/weapon/melee/umbrella/attack_self()
@@ -56,9 +56,9 @@
H.update_inv_r_hand()
// Randomizes color
/obj/item/weapon/melee/umbrella/random/New()
/obj/item/weapon/melee/umbrella/random/Initialize()
color = "#"+get_random_colour()
..()
. = ..()
/obj/item/weapon/melee/cursedblade
name = "crystal blade"
code/game/objects/items/weapons/mop.dm
+2 -2
View File
@@ -15,9 +15,9 @@ GLOBAL_LIST_BOILERPLATE(all_mops, /obj/item/weapon/mop)
var/mopping = 0
var/mopcount = 0
/obj/item/weapon/mop/New()
/obj/item/weapon/mop/Initialize()
create_reagents(30)
..()
. = ..()
/obj/item/weapon/mop/afterattack(atom/A, mob/user, proximity)
if(!proximity) return
code/game/objects/items/weapons/mop_deploy.dm
+2 -1
View File
@@ -15,9 +15,10 @@
var/mopcount = 0
/obj/item/weapon/mop_deploy/New()
/obj/item/weapon/mop_deploy/Initialize()
create_reagents(5)
START_PROCESSING(SSobj, src)
. = ..()
/turf/proc/clean_deploy(atom/source)
if(source.reagents.has_reagent("water", 1))
code/game/objects/items/weapons/paint.dm
+2 -2
View File
@@ -26,10 +26,10 @@ var/global/list/cached_icons = list()
else
return ..()
/obj/item/weapon/reagent_containers/glass/paint/New()
/obj/item/weapon/reagent_containers/glass/paint/Initialize()
if(paint_type && length(paint_type) > 0)
name = paint_type + " " + name
..()
. = ..()
reagents.add_reagent("water", volume*3/5)
reagents.add_reagent("plasticide", volume/5)
if(paint_type == "white") //why don't white crayons exist
code/game/objects/items/weapons/policetape.dm
+2 -2
View File
@@ -52,8 +52,8 @@ var/list/tape_roll_applications = list()
icon_state = "[icon_base]_dir_[crumpled]"
dir = tape_dir
/obj/item/tape/New()
..()
/obj/item/tape/Initialize()
. = ..()
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
View File
@@ -85,8 +85,6 @@ GLOBAL_LIST_INIT(bibleitemstates, list(
name = "bible"
desc = "To be applied to the head repeatedly."
icon_state ="bible"
/obj/item/weapon/storage/bible/booze/New()
starts_with = list(
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,
code/game/objects/items/weapons/storage/boxes.dm
-2
View File
@@ -162,8 +162,6 @@
starts_with = list(/obj/item/ammo_casing/a12g/beanbag = 8)
drop_sound = 'sound/items/drop/ammobox.ogg'
pickup_sound = 'sound/items/pickup/ammobox.ogg'
/obj/item/weapon/storage/box/beanbags/large/New()
starts_with = list(/obj/item/ammo_casing/a12g/beanbag = 16)
/obj/item/weapon/storage/box/shotgunammo
code/game/objects/items/weapons/storage/internal.dm
+5 -3
View File
@@ -4,12 +4,14 @@
preserve_item = 1
var/obj/item/master_item
/obj/item/weapon/storage/internal/New(obj/item/MI)
master_item = MI
/obj/item/weapon/storage/internal/Initialize()
. = ..()
master_item = loc
if(!istype(master_item))
return INITIALIZE_HINT_QDEL
loc = master_item
name = master_item.name
verbs -= /obj/item/verb/verb_pickup //make sure this is never picked up.
..()
/obj/item/weapon/storage/internal/Destroy()
master_item = null
code/game/objects/items/weapons/storage/storage.dm
+2 -2
View File
@@ -812,12 +812,12 @@
else
icon_state = closed_state
/obj/item/weapon/storage/trinketbox/New()
/obj/item/weapon/storage/trinketbox/Initialize()
if(!open_state)
open_state = "[initial(icon_state)]_open"
if(!closed_state)
closed_state = "[initial(icon_state)]"
..()
. = ..()
/obj/item/weapon/storage/trinketbox/attack_self()
open = !open
code/game/objects/items/weapons/storage/wallets.dm
+4 -4
View File
@@ -86,8 +86,8 @@
else
return ..()
/obj/item/weapon/storage/wallet/random/New()
..()
/obj/item/weapon/storage/wallet/random/Initialize()
. = ..()
var/amount = rand(50, 100) + rand(50, 100) // Triangular distribution from 100 to 200
var/obj/item/weapon/spacecash/SC = null
SC = new(src)
@@ -104,8 +104,8 @@
desc = "You can recolor it! Fancy! The future is NOW!"
icon_state = "wallet-white"
/obj/item/weapon/storage/wallet/poly/New()
..()
/obj/item/weapon/storage/wallet/poly/Initialize()
. = ..()
verbs |= /obj/item/weapon/storage/wallet/poly/proc/change_color
color = "#"+get_random_colour()
update_icon()
code/game/objects/items/weapons/stunbaton.dm
+5 -12
View File
@@ -23,8 +23,8 @@
var/hitcost = 240
var/use_external_power = FALSE //only used to determine if it's a cyborg baton
/obj/item/weapon/melee/baton/New()
..()
/obj/item/weapon/melee/baton/Initialize()
. = ..()
update_icon()
return
@@ -63,20 +63,13 @@
usr.put_in_l_hand(src)
src.add_fingerprint(usr)
/obj/item/weapon/melee/baton/loaded/New() //this one starts with a cell pre-installed.
..()
/obj/item/weapon/melee/baton/loaded/Initialize() //this one starts with a cell pre-installed.
. = ..()
bcell = new/obj/item/weapon/cell/device/weapon(src)
update_icon()
return
/obj/item/weapon/melee/baton/proc/deductcharge(var/chrgdeductamt)
if(status == 1) //Only deducts charge when it's on
if(bcell)
if(bcell.checked_use(chrgdeductamt))
return 1
else
return 0
return null
return (status == 1 && bcell?.checked_use(chrgdeductamt))
/obj/item/weapon/melee/baton/proc/powercheck(var/chrgdeductamt)
if(bcell)
code/game/objects/items/weapons/syndie.dm
+2 -1
View File
@@ -37,7 +37,8 @@
light_impact = 7
flash_range = 7
/obj/item/weapon/syndie/c4explosive/New()
/obj/item/weapon/syndie/c4explosive/Initialize()
. = ..()
var/K = rand(1,2000)
K = md5(num2text(K)+name)
K = copytext(K,1,7)
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
action_button_name = "Toggle Jetpack"
/obj/item/weapon/tank/jetpack/New()
..()
/obj/item/weapon/tank/jetpack/Initialize()
. = ..()
ion_trail = new /datum/effect/effect/system/ion_trail_follow()
ion_trail.set_up(src)
code/game/objects/items/weapons/tanks/tanks.dm
+12 -12
View File
@@ -563,29 +563,29 @@ var/list/global/tank_gauge_cache = list()
add_overlay("bomb_assembly")
/obj/item/weapon/tank/phoron/onetankbomb/New()
..()
/obj/item/weapon/tank/phoron/onetankbomb/Initialize()
. = ..()
src.onetankbomb()
/obj/item/weapon/tank/oxygen/onetankbomb/New()
..()
/obj/item/weapon/tank/oxygen/onetankbomb/Initialize()
. = ..()
src.onetankbomb()
/obj/item/weapon/tank/phoron/onetankbomb/full/New()
..()
/obj/item/weapon/tank/phoron/onetankbomb/full/Initialize()
. = ..()
src.onetankbomb(2)
/obj/item/weapon/tank/oxygen/onetankbomb/full/New()
..()
/obj/item/weapon/tank/oxygen/onetankbomb/full/Initialize()
. = ..()
src.onetankbomb(2)
/obj/item/weapon/tank/phoron/onetankbomb/small/New()
..()
/obj/item/weapon/tank/phoron/onetankbomb/small/Initialize()
. = ..()
src.onetankbomb(0)
/obj/item/weapon/tank/oxygen/onetankbomb/small/New()
..()
/obj/item/weapon/tank/oxygen/onetankbomb/small/Initialize()
. = ..()
src.onetankbomb(0)
/////////////////////////////////
code/game/objects/items/weapons/tape.dm
+2 -2
View File
@@ -122,8 +122,8 @@
var/obj/item/weapon/stuck = null
/obj/item/weapon/ducttape/New()
..()
/obj/item/weapon/ducttape/Initialize()
. = ..()
flags |= NOBLUDGEON
/obj/item/weapon/ducttape/examine(mob/user)
code/game/objects/items/weapons/tools/combitool.dm
+2 -2
View File
@@ -31,8 +31,8 @@
for(var/obj/item/tool in tools)
. += "[bicon(tool)] - [tool.name][tools[current_tool]==tool?" (selected)":""]")
/obj/item/weapon/combitool/New()
..()
/obj/item/weapon/combitool/Initialize()
. = ..()
for(var/type in spawn_tools)
tools |= new type(src)
code/game/objects/items/weapons/tools/crowbar.dm
+2 -2
View File
@@ -83,8 +83,8 @@
toolspeed = 0.25
var/obj/item/weapon/tool/wirecutters/power/counterpart = null
/obj/item/weapon/tool/crowbar/power/New(newloc, no_counterpart = TRUE)
..(newloc)
/obj/item/weapon/tool/crowbar/power/Initialize(var/ml, no_counterpart = TRUE)
. = ..()
if(!counterpart && no_counterpart)
counterpart = new(src, FALSE)
counterpart.counterpart = src
code/game/objects/items/weapons/tools/screwdriver.dm
+4 -4
View File
@@ -24,7 +24,7 @@
tool_qualities = list(TOOL_SCREWDRIVER)
var/random_color = TRUE
/obj/item/weapon/tool/screwdriver/New()
/obj/item/weapon/tool/screwdriver/Initialize()
if(random_color)
switch(pick("red","blue","purple","brown","green","cyan","yellow"))
if ("red")
@@ -51,7 +51,7 @@
if (prob(75))
src.pixel_y = rand(0, 16)
..()
. = ..()
/obj/item/weapon/tool/screwdriver/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
if(!istype(M) || user.a_intent == "help")
@@ -124,8 +124,8 @@
random_color = FALSE
var/obj/item/weapon/tool/wrench/power/counterpart = null
/obj/item/weapon/tool/screwdriver/power/New(newloc, no_counterpart = TRUE)
..(newloc)
/obj/item/weapon/tool/screwdriver/power/Initialize(var/ml, no_counterpart = TRUE)
. = ..()
if(!counterpart && no_counterpart)
counterpart = new(src, FALSE)
counterpart.counterpart = src
code/game/objects/items/weapons/tools/weldingtool.dm
+8 -9
View File
@@ -487,13 +487,12 @@
always_process = TRUE
var/obj/item/weapon/weldpack/mounted_pack = null
/obj/item/weapon/weldingtool/tubefed/New(location)
..()
if(istype(location, /obj/item/weapon/weldpack))
var/obj/item/weapon/weldpack/holder = location
mounted_pack = holder
/obj/item/weapon/weldingtool/tubefed/Initialize(var/ml)
. = ..()
if(istype(loc, /obj/item/weapon/weldpack))
mounted_pack = loc
else
qdel(src)
return INITIALIZE_HINT_QDEL
/obj/item/weapon/weldingtool/tubefed/Destroy()
mounted_pack.nozzle = null
@@ -550,11 +549,11 @@
acti_sound = 'sound/effects/sparks4.ogg'
deac_sound = 'sound/effects/sparks4.ogg'
/obj/item/weapon/weldingtool/electric/unloaded/New()
/obj/item/weapon/weldingtool/electric/unloaded
cell_type = null
/obj/item/weapon/weldingtool/electric/New()
..()
/obj/item/weapon/weldingtool/electric/Initialize()
. = ..()
if(cell_type == null)
update_icon()
else if(cell_type)
code/game/objects/items/weapons/tools/wirecutters.dm
+10 -2
View File
@@ -26,6 +26,7 @@
tool_qualities = list(TOOL_WIRECUTTER)
var/random_color = TRUE
<<<<<<< HEAD
/obj/item/weapon/tool/wirecutters/New()
if(random_color)
switch(pick("red","blue","yellow"))
@@ -42,6 +43,13 @@
if (prob(75))
src.pixel_y = rand(0, 16)
..()
=======
/obj/item/weapon/tool/wirecutters/Initialize()
if(random_color && prob(50))
icon_state = "cutters-y"
item_state = "cutters_yellow"
. = ..()
>>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
/obj/item/weapon/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/weapon/handcuffs/cable)))
@@ -109,8 +117,8 @@
random_color = FALSE
var/obj/item/weapon/tool/crowbar/power/counterpart = null
/obj/item/weapon/tool/wirecutters/power/New(newloc, no_counterpart = TRUE)
..(newloc)
/obj/item/weapon/tool/wirecutters/power/Initialize(var/ml, no_counterpart = TRUE)
. = ..(ml)
if(!counterpart && no_counterpart)
counterpart = new(src, FALSE)
counterpart.counterpart = src
code/game/objects/items/weapons/tools/wrench.dm
+2 -2
View File
@@ -88,8 +88,8 @@
toolspeed = 0.25
var/obj/item/weapon/tool/screwdriver/power/counterpart = null
/obj/item/weapon/tool/wrench/power/New(newloc, no_counterpart = TRUE)
..(newloc)
/obj/item/weapon/tool/wrench/power/Initialize(var/ml, no_counterpart = TRUE)
. = ..()
if(!counterpart && no_counterpart)
counterpart = new(src, FALSE)
counterpart.counterpart = src
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/weapon/towel/random/New()
..()
/obj/item/weapon/towel/random/Initialize()
. = ..()
color = "#"+get_random_colour()
code/game/objects/items/weapons/weaponry.dm
+2 -2
View File
@@ -100,8 +100,8 @@
var/escape_time = 8 SECONDS
/obj/effect/energy_net/New()
..()
/obj/effect/energy_net/Initialize()
. = ..()
START_PROCESSING(SSobj, src)
/obj/effect/energy_net/Destroy()