shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update files

Browse Source
This commit is contained in:
SandPoot
2022-04-06 18:41:31 -03:00
parent 4c3fa08cdf
commit 586a035132
881 changed files with 1599 additions and 1599 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/arachnid_web.dm
+1 -1
View File
@@ -49,7 +49,7 @@
density = FALSE
max_integrity = 60
/obj/structure/arachnid/cocoon/Initialize()
/obj/structure/arachnid/cocoon/Initialize(mapload)
icon_state = pick("cocoon1","cocoon2","cocoon3")
. = ..()
code/game/objects/effects/bump_teleporter.dm
+1 -1
View File
@@ -11,7 +11,7 @@
var/static/list/AllTeleporters
/obj/effect/bump_teleporter/Initialize()
/obj/effect/bump_teleporter/Initialize(mapload)
. = ..()
LAZYADD(AllTeleporters, src)
code/game/objects/effects/contraband.dm
+1 -1
View File
@@ -61,7 +61,7 @@
var/poster_item_icon_state = "rolled_poster"
var/poster_item_type = /obj/item/poster
/obj/structure/sign/poster/Initialize()
/obj/structure/sign/poster/Initialize(mapload)
. = ..()
if(random_basetype)
randomise(random_basetype)
code/game/objects/effects/countdown.dm
+1 -1
View File
@@ -14,7 +14,7 @@
var/displayed_text
var/atom/attached_to
/obj/effect/countdown/Initialize()
/obj/effect/countdown/Initialize(mapload)
. = ..()
attach(loc)
code/game/objects/effects/decals/cleanable/aliens.dm
+1 -1
View File
@@ -72,6 +72,6 @@
icon_state = "tracks"
random_icon_states = null
/obj/effect/decal/cleanable/blood/xtracks/Initialize()
/obj/effect/decal/cleanable/blood/xtracks/Initialize(mapload)
add_blood_DNA(list("UNKNOWN DNA" = "X*"))
. = ..()
code/game/objects/effects/decals/cleanable/humans.dm
+1 -1
View File
@@ -109,7 +109,7 @@
if(!fixed_color)
add_atom_colour(blood_DNA_to_color(), FIXED_COLOUR_PRIORITY)
/obj/effect/cleanable/trail_holder/Initialize()
/obj/effect/cleanable/trail_holder/Initialize(mapload)
. = ..()
update_icon()
code/game/objects/effects/decals/cleanable/misc.dm
+5 -5
View File
@@ -15,7 +15,7 @@
persistent = TRUE
persistence_allow_stacking = TRUE
/obj/effect/decal/cleanable/ash/Initialize()
/obj/effect/decal/cleanable/ash/Initialize(mapload)
. = ..()
reagents.add_reagent(/datum/reagent/ash, 30)
pixel_x = rand(-5, 5)
@@ -30,7 +30,7 @@
icon_state = "big_ash"
beauty = -100
/obj/effect/decal/cleanable/ash/large/Initialize()
/obj/effect/decal/cleanable/ash/large/Initialize(mapload)
. = ..()
reagents.add_reagent(/datum/reagent/ash, 30) //double the amount of ash.
@@ -43,7 +43,7 @@
mergeable_decal = TRUE
persistent = TRUE
/obj/effect/decal/cleanable/glass/Initialize()
/obj/effect/decal/cleanable/glass/Initialize(mapload)
. = ..()
setDir(pick(GLOB.cardinals))
@@ -89,7 +89,7 @@
if(data["alpha"])
alpha = text2num(data["alpha"])
/obj/effect/decal/cleanable/dirt/Initialize()
/obj/effect/decal/cleanable/dirt/Initialize(mapload)
. = ..()
var/turf/T = get_turf(src)
if(T.tiled_dirt)
@@ -265,7 +265,7 @@
qdel(src)
return power // no block
/obj/effect/decal/cleanable/shreds/Initialize()
/obj/effect/decal/cleanable/shreds/Initialize(mapload)
pixel_x = rand(-10, 10)
pixel_y = rand(-10, 10)
. = ..()
code/game/objects/effects/decals/cleanable/robots.dm
+2 -2
View File
@@ -55,7 +55,7 @@
beauty = -100
persistent = TRUE
/obj/effect/decal/cleanable/oil/Initialize()
/obj/effect/decal/cleanable/oil/Initialize(mapload)
. = ..()
reagents.add_reagent(/datum/reagent/oil, 30)
reagents.add_reagent(/datum/reagent/liquidgibs/oil, 5)
@@ -68,6 +68,6 @@
/obj/effect/decal/cleanable/oil/slippery
persistent = FALSE
/obj/effect/decal/cleanable/oil/slippery/Initialize()
/obj/effect/decal/cleanable/oil/slippery/Initialize(mapload)
. = ..()
AddComponent(/datum/component/slippery, 80, (NO_SLIP_WHEN_WALKING | SLIDE))
code/game/objects/effects/decals/decal.dm
+2 -2
View File
@@ -5,7 +5,7 @@
resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
var/turf_loc_check = TRUE
/obj/effect/decal/Initialize()
/obj/effect/decal/Initialize(mapload)
. = ..()
if(turf_loc_check && (!isturf(loc) || NeverShouldHaveComeHere(loc)))
return INITIALIZE_HINT_QDEL
@@ -37,7 +37,7 @@
layer = TURF_DECAL_LAYER
plane = ABOVE_WALL_PLANE
/obj/effect/turf_decal/Initialize()
/obj/effect/turf_decal/Initialize(mapload)
..()
return INITIALIZE_HINT_QDEL
code/game/objects/effects/effect_system/effect_system.dm
+1 -1
View File
@@ -12,7 +12,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
pass_flags = PASSTABLE | PASSGRILLE
anchored = TRUE
/obj/effect/particle_effect/Initialize()
/obj/effect/particle_effect/Initialize(mapload)
. = ..()
GLOB.cameranet.updateVisibility(src)
code/game/objects/effects/effect_system/effects_explosion.dm
+2 -2
View File
@@ -4,7 +4,7 @@
opacity = 1
anchored = TRUE
/obj/effect/particle_effect/expl_particles/Initialize()
/obj/effect/particle_effect/expl_particles/Initialize(mapload)
. = ..()
QDEL_IN(src, 15)
@@ -29,7 +29,7 @@
pixel_x = -32
pixel_y = -32
/obj/effect/explosion/Initialize()
/obj/effect/explosion/Initialize(mapload)
. = ..()
QDEL_IN(src, 10)
code/game/objects/effects/effect_system/effects_foam.dm
+3 -3
View File
@@ -90,7 +90,7 @@
/obj/effect/particle_effect/foam/long_life
lifetime = 150
/obj/effect/particle_effect/foam/Initialize()
/obj/effect/particle_effect/foam/Initialize(mapload)
. = ..()
MakeSlippery()
create_reagents(1000, NONE, NO_REAGENTS_VALUE) //limited by the size of the reagent holder anyway.
@@ -271,7 +271,7 @@
attack_hand_speed = CLICK_CD_MELEE
attack_hand_is_action = TRUE
/obj/structure/foamedmetal/Initialize()
/obj/structure/foamedmetal/Initialize(mapload)
. = ..()
air_update_turf(1)
@@ -307,7 +307,7 @@
alpha = 120
max_integrity = 10
/obj/structure/foamedmetal/resin/Initialize()
/obj/structure/foamedmetal/resin/Initialize(mapload)
. = ..()
neutralize_air()
addtimer(CALLBACK(src, .proc/neutralize_air), 5) // yeah this sucks, maybe when auxmos is out
code/game/objects/effects/effect_system/effects_smoke.dm
+1 -1
View File
@@ -30,7 +30,7 @@
set_opacity(0) //if we were blocking view, we aren't now because we're fading out
stoplag()
/obj/effect/particle_effect/smoke/Initialize()
/obj/effect/particle_effect/smoke/Initialize(mapload)
. = ..()
create_reagents(500, NONE, NO_REAGENTS_VALUE)
START_PROCESSING(SSobj, src)
code/game/objects/effects/effect_system/effects_sparks.dm
+2 -2
View File
@@ -24,7 +24,7 @@
light_range = MINIMUM_USEFUL_LIGHT_RANGE
light_color = LIGHT_COLOR_FIRE
/obj/effect/particle_effect/sparks/Initialize()
/obj/effect/particle_effect/sparks/Initialize(mapload)
. = ..()
flick(icon_state, src) // replay the animation
playsound(src, "sparks", 100, TRUE)
@@ -69,7 +69,7 @@
name = "lightning"
icon_state = "electricity"
/obj/effect/particle_effect/fake_sparks/Initialize()
/obj/effect/particle_effect/fake_sparks/Initialize(mapload)
. = ..()
flick(icon_state, src) // replay the animation
playsound(src, "sparks", 100, TRUE)
code/game/objects/effects/effect_system/effects_water.dm
+2 -2
View File
@@ -7,7 +7,7 @@
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
/obj/effect/particle_effect/water/Initialize()
/obj/effect/particle_effect/water/Initialize(mapload)
. = ..()
QDEL_IN(src, 70)
@@ -45,7 +45,7 @@ steam.start() -- spawns the effect
icon_state = "extinguish"
density = FALSE
/obj/effect/particle_effect/steam/Initialize()
/obj/effect/particle_effect/steam/Initialize(mapload)
. = ..()
QDEL_IN(src, 20)
code/game/objects/effects/forcefields.dm
+1 -1
View File
@@ -8,7 +8,7 @@
CanAtmosPass = ATMOS_PASS_DENSITY
var/timeleft = 300 //Set to 0 for permanent forcefields (ugh)
/obj/effect/forcefield/Initialize()
/obj/effect/forcefield/Initialize(mapload)
. = ..()
if(timeleft)
QDEL_IN(src, timeleft)
code/game/objects/effects/landmarks.dm
+5 -5
View File
@@ -19,7 +19,7 @@
INITIALIZE_IMMEDIATE(/obj/effect/landmark)
/obj/effect/landmark/Initialize()
/obj/effect/landmark/Initialize(mapload)
. = ..()
GLOB.landmarks_list += src
@@ -245,7 +245,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
icon = 'icons/effects/landmarks_static.dmi'
icon_state = "wiznerd_spawn"
/obj/effect/landmark/start/wizard/Initialize()
/obj/effect/landmark/start/wizard/Initialize(mapload)
..()
GLOB.wizardstart += loc
return INITIALIZE_HINT_QDEL
@@ -255,7 +255,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
icon = 'icons/effects/landmarks_static.dmi'
icon_state = "snukeop_spawn"
/obj/effect/landmark/start/nukeop/Initialize()
/obj/effect/landmark/start/nukeop/Initialize(mapload)
..()
GLOB.nukeop_start += loc
return INITIALIZE_HINT_QDEL
@@ -265,7 +265,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
icon = 'icons/effects/landmarks_static.dmi'
icon_state = "snukeop_leader_spawn"
/obj/effect/landmark/start/nukeop_leader/Initialize()
/obj/effect/landmark/start/nukeop_leader/Initialize(mapload)
..()
GLOB.nukeop_leader_start += loc
return INITIALIZE_HINT_QDEL
@@ -277,7 +277,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
/obj/effect/landmark/start/new_player
name = "New Player"
/obj/effect/landmark/start/new_player/Initialize()
/obj/effect/landmark/start/new_player/Initialize(mapload)
..()
GLOB.newplayer_start += loc
return INITIALIZE_HINT_QDEL
code/game/objects/effects/mines.dm
+1 -1
View File
@@ -116,7 +116,7 @@
density = FALSE
var/duration = 0
/obj/effect/mine/pickup/Initialize()
/obj/effect/mine/pickup/Initialize(mapload)
. = ..()
animate(src, pixel_y = 4, time = 20, loop = -1)
code/game/objects/effects/overlays.dm
+1 -1
View File
@@ -13,7 +13,7 @@
icon_state="b_beam"
var/atom/BeamSource
/obj/effect/overlay/beam/Initialize()
/obj/effect/overlay/beam/Initialize(mapload)
. = ..()
QDEL_IN(src, 10)
code/game/objects/effects/spawners/bombspawner.dm
+2 -2
View File
@@ -13,7 +13,7 @@
var/pressure_o = 10 * ONE_ATMOSPHERE //tank pressures
var/assembly_type
/obj/effect/spawner/newbomb/Initialize()
/obj/effect/spawner/newbomb/Initialize(mapload)
. = ..()
var/obj/item/transfer_valve/V = new(src.loc)
var/obj/item/tank/internals/plasma/PT = new(V)
@@ -39,7 +39,7 @@
return INITIALIZE_HINT_QDEL
/obj/effect/spawner/newbomb/timer/syndicate/Initialize()
/obj/effect/spawner/newbomb/timer/syndicate/Initialize(mapload)
temp_p = (OPTIMAL_TEMP_K_PLA_BURN_SCALE(pressure_p, pressure_o, temp_o)/2 + OPTIMAL_TEMP_K_PLA_BURN_RATIO(pressure_p, pressure_o, temp_o)/2) - T0C
. = ..()
code/game/objects/effects/spawners/gibspawner.dm
+14 -14
View File
@@ -91,7 +91,7 @@
gibamounts = list(2, 2, 1)
sound_vol = 40
/obj/effect/gibspawner/generic/Initialize()
/obj/effect/gibspawner/generic/Initialize(mapload)
if(!gibdirections.len)
gibdirections = list(list(WEST, NORTHWEST, SOUTHWEST, NORTH),list(EAST, NORTHEAST, SOUTHEAST, SOUTH), list())
return ..()
@@ -106,7 +106,7 @@
gib_mob_species = /datum/species/human
sound_vol = 50
/obj/effect/gibspawner/human/Initialize()
/obj/effect/gibspawner/human/Initialize(mapload)
if(!gibdirections.len)
gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), GLOB.alldirs, GLOB.alldirs, list())
return ..()
@@ -115,7 +115,7 @@
gibtypes = list(/obj/effect/decal/cleanable/blood/gibs/human, /obj/effect/decal/cleanable/blood/gibs/human/core, /obj/effect/decal/cleanable/blood/gibs/human, /obj/effect/decal/cleanable/blood/gibs/human/core, /obj/effect/decal/cleanable/blood/gibs/human, /obj/effect/decal/cleanable/blood/gibs/human/torso)
gibamounts = list(1, 1, 1, 1, 1, 1)
/obj/effect/gibspawner/human/bodypartless/Initialize()
/obj/effect/gibspawner/human/bodypartless/Initialize(mapload)
if(!gibdirections.len)
gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), GLOB.alldirs, list())
return ..()
@@ -127,7 +127,7 @@
gib_mob_species = /datum/species/lizard
sound_vol = 50
/obj/effect/gibspawner/lizard/Initialize()
/obj/effect/gibspawner/lizard/Initialize(mapload)
if(!gibdirections.len)
gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), GLOB.alldirs, GLOB.alldirs, list())
return ..()
@@ -136,7 +136,7 @@
gibtypes = list(/obj/effect/decal/cleanable/blood/gibs/human/lizard, /obj/effect/decal/cleanable/blood/gibs/human/lizard/core, /obj/effect/decal/cleanable/blood/gibs/human/lizard, /obj/effect/decal/cleanable/blood/gibs/human/lizard/core, /obj/effect/decal/cleanable/blood/gibs/human/lizard, /obj/effect/decal/cleanable/blood/gibs/human/lizard/torso)
gibamounts = list(1, 1, 1, 1, 1, 1)
/obj/effect/gibspawner/lizard/bodypartless/Initialize()
/obj/effect/gibspawner/lizard/bodypartless/Initialize(mapload)
if(!gibdirections.len)
gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), GLOB.alldirs, list())
return ..()
@@ -148,7 +148,7 @@
gib_mob_species = /datum/species/jelly/roundstartslime
sound_vol = 50
/obj/effect/gibspawner/slime/Initialize()
/obj/effect/gibspawner/slime/Initialize(mapload)
if(!gibdirections.len)
gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), GLOB.alldirs, GLOB.alldirs, list())
return ..()
@@ -157,7 +157,7 @@
gibtypes = list(/obj/effect/decal/cleanable/blood/gibs/slime, /obj/effect/decal/cleanable/blood/gibs/slime/core, /obj/effect/decal/cleanable/blood/gibs/slime, /obj/effect/decal/cleanable/blood/gibs/slime/core, /obj/effect/decal/cleanable/blood/gibs/slime, /obj/effect/decal/cleanable/blood/gibs/slime/torso)
gibamounts = list(1, 1, 1, 1, 1, 1)
/obj/effect/gibspawner/slime/bodypartless/Initialize()
/obj/effect/gibspawner/slime/bodypartless/Initialize(mapload)
if(!gibdirections.len)
gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), GLOB.alldirs, list())
return ..()
@@ -171,7 +171,7 @@
sparks = TRUE
sound_to_play = 'sound/effects/bang.ogg'
/obj/effect/gibspawner/ipc/Initialize()
/obj/effect/gibspawner/ipc/Initialize(mapload)
if(!gibdirections.len)
gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), GLOB.alldirs, GLOB.alldirs, list())
return ..()
@@ -180,7 +180,7 @@
gibtypes = list(/obj/effect/decal/cleanable/blood/gibs/ipc, /obj/effect/decal/cleanable/blood/gibs/ipc/core, /obj/effect/decal/cleanable/blood/gibs/ipc, /obj/effect/decal/cleanable/blood/gibs/ipc/core, /obj/effect/decal/cleanable/blood/gibs/ipc, /obj/effect/decal/cleanable/blood/gibs/ipc/torso)
gibamounts = list(1, 1, 1, 1, 1, 1)
/obj/effect/gibspawner/ipc/bodypartless/Initialize()
/obj/effect/gibspawner/ipc/bodypartless/Initialize(mapload)
if(!gibdirections.len)
gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), GLOB.alldirs, list())
return ..()
@@ -190,7 +190,7 @@
gibamounts = list(1, 1, 1, 1, 1, 1, 1)
gib_mob_type = /mob/living/carbon/alien
/obj/effect/gibspawner/xeno/Initialize()
/obj/effect/gibspawner/xeno/Initialize(mapload)
if(!gibdirections.len)
gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), GLOB.alldirs, GLOB.alldirs, list())
return ..()
@@ -199,7 +199,7 @@
gibtypes = list(/obj/effect/decal/cleanable/blood/gibs/xeno, /obj/effect/decal/cleanable/blood/gibs/xeno/core, /obj/effect/decal/cleanable/blood/gibs/xeno, /obj/effect/decal/cleanable/blood/gibs/xeno/core, /obj/effect/decal/cleanable/blood/gibs/xeno, /obj/effect/decal/cleanable/blood/gibs/xeno/torso)
gibamounts = list(1, 1, 1, 1, 1, 1)
/obj/effect/gibspawner/xeno/bodypartless/Initialize()
/obj/effect/gibspawner/xeno/bodypartless/Initialize(mapload)
if(!gibdirections.len)
gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), GLOB.alldirs, list())
return ..()
@@ -215,7 +215,7 @@
gibamounts = list(1, 1, 1, 1)
gib_mob_type = /mob/living/carbon/alien/larva
/obj/effect/gibspawner/larva/Initialize()
/obj/effect/gibspawner/larva/Initialize(mapload)
if(!gibdirections.len)
gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST), list(), GLOB.alldirs)
return ..()
@@ -224,7 +224,7 @@
gibtypes = list(/obj/effect/decal/cleanable/blood/gibs/xeno/larva, /obj/effect/decal/cleanable/blood/gibs/xeno/larva, /obj/effect/decal/cleanable/blood/gibs/xeno/larva)
gibamounts = list(1, 1, 1)
/obj/effect/gibspawner/larva/bodypartless/Initialize()
/obj/effect/gibspawner/larva/bodypartless/Initialize(mapload)
if(!gibdirections.len)
gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST), list())
return ..()
@@ -235,7 +235,7 @@
gibamounts = list(1, 1, 1, 1, 1, 1)
gib_mob_type = /mob/living/silicon/robot
/obj/effect/gibspawner/robot/Initialize()
/obj/effect/gibspawner/robot/Initialize(mapload)
if(!gibdirections.len)
gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), GLOB.alldirs, GLOB.alldirs)
gibamounts[6] = pick(0, 1, 2)
code/game/objects/effects/spawners/lootdrop.dm
+3 -3
View File
@@ -167,7 +167,7 @@
icon = 'icons/obj/lighting.dmi'
icon_state = "random_glowstick"
/obj/effect/spawner/lootdrop/glowstick/Initialize()
/obj/effect/spawner/lootdrop/glowstick/Initialize(mapload)
loot = typesof(/obj/item/flashlight/glowstick)
. = ..()
@@ -222,7 +222,7 @@
/obj/effect/spawner/lootdrop/costume
name = "random costume spawner"
/obj/effect/spawner/lootdrop/costume/Initialize()
/obj/effect/spawner/lootdrop/costume/Initialize(mapload)
loot = list()
for(var/path in subtypesof(/obj/effect/spawner/bundle/costume))
loot[path] = TRUE
@@ -298,7 +298,7 @@
icon = 'icons/obj/storage.dmi'
icon_state = "mre"
/obj/effect/spawner/lootdrop/mre/Initialize()
/obj/effect/spawner/lootdrop/mre/Initialize(mapload)
for(var/A in subtypesof(/obj/item/storage/box/mre))
var/obj/item/storage/box/mre/M = A
var/our_chance = initial(M.spawner_chance)
code/game/objects/effects/spawners/structure.dm
+17 -17
View File
@@ -8,7 +8,7 @@ again.
name = "map structure spawner"
var/list/spawn_list
/obj/effect/spawner/structure/Initialize()
/obj/effect/spawner/structure/Initialize(mapload)
. = ..()
if(spawn_list && spawn_list.len)
for(var/I in spawn_list)
@@ -27,7 +27,7 @@ again.
var/electrochromatic
var/electrochromatic_id
/obj/effect/spawner/structure/window/Initialize()
/obj/effect/spawner/structure/window/Initialize(mapload)
. = ..()
if(!electrochromatic)
return
@@ -50,7 +50,7 @@ again.
/obj/effect/spawner/structure/window/hollow/end
icon_state = "hwindow_spawner_end"
/obj/effect/spawner/structure/window/hollow/end/Initialize()
/obj/effect/spawner/structure/window/hollow/end/Initialize(mapload)
switch(dir)
if(NORTH)
spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/north, /obj/structure/window/spawner/east, /obj/structure/window/spawner/west)
@@ -65,7 +65,7 @@ again.
/obj/effect/spawner/structure/window/hollow/middle
icon_state = "hwindow_spawner_middle"
/obj/effect/spawner/structure/window/hollow/middle/Initialize()
/obj/effect/spawner/structure/window/hollow/middle/Initialize(mapload)
switch(dir)
if(NORTH,SOUTH)
spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/north)
@@ -76,7 +76,7 @@ again.
/obj/effect/spawner/structure/window/hollow/directional
icon_state = "hwindow_spawner_directional"
/obj/effect/spawner/structure/window/hollow/directional/Initialize()
/obj/effect/spawner/structure/window/hollow/directional/Initialize(mapload)
switch(dir)
if(NORTH)
spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/north)
@@ -111,7 +111,7 @@ again.
/obj/effect/spawner/structure/window/hollow/reinforced/end
icon_state = "hrwindow_spawner_end"
/obj/effect/spawner/structure/window/hollow/reinforced/end/Initialize()
/obj/effect/spawner/structure/window/hollow/reinforced/end/Initialize(mapload)
switch(dir)
if(NORTH)
spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west)
@@ -126,7 +126,7 @@ again.
/obj/effect/spawner/structure/window/hollow/reinforced/middle
icon_state = "hrwindow_spawner_middle"
/obj/effect/spawner/structure/window/hollow/reinforced/middle/Initialize()
/obj/effect/spawner/structure/window/hollow/reinforced/middle/Initialize(mapload)
switch(dir)
if(NORTH,SOUTH)
spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/north)
@@ -137,7 +137,7 @@ again.
/obj/effect/spawner/structure/window/hollow/reinforced/directional
icon_state = "hrwindow_spawner_directional"
/obj/effect/spawner/structure/window/hollow/reinforced/directional/Initialize()
/obj/effect/spawner/structure/window/hollow/reinforced/directional/Initialize(mapload)
switch(dir)
if(NORTH)
spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north)
@@ -211,7 +211,7 @@ again.
/obj/effect/spawner/structure/window/hollow/survival_pod/end
icon_state = "podwindow_spawner_end"
/obj/effect/spawner/structure/window/hollow/survival_pod/end/Initialize()
/obj/effect/spawner/structure/window/hollow/survival_pod/end/Initialize(mapload)
switch(dir)
if(NORTH)
spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle/survival_pod/spawner/north, /obj/structure/window/shuttle/survival_pod/spawner/east, /obj/structure/window/shuttle/survival_pod/spawner/west)
@@ -226,7 +226,7 @@ again.
/obj/effect/spawner/structure/window/hollow/survival_pod/middle
icon_state = "podwindow_spawner_middle"
/obj/effect/spawner/structure/window/hollow/survival_pod/middle/Initialize()
/obj/effect/spawner/structure/window/hollow/survival_pod/middle/Initialize(mapload)
switch(dir)
if(NORTH,SOUTH)
spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle/survival_pod, /obj/structure/window/shuttle/survival_pod/spawner/north)
@@ -237,7 +237,7 @@ again.
/obj/effect/spawner/structure/window/hollow/survival_pod/directional
icon_state = "podwindow_spawner_directional"
/obj/effect/spawner/structure/window/hollow/survival_pod/directional/Initialize()
/obj/effect/spawner/structure/window/hollow/survival_pod/directional/Initialize(mapload)
switch(dir)
if(NORTH)
spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle/survival_pod/spawner/north)
@@ -273,7 +273,7 @@ again.
/obj/effect/spawner/structure/window/hollow/plasma/end
icon_state = "phwindow_spawner_end"
/obj/effect/spawner/structure/window/hollow/plasma/end/Initialize()
/obj/effect/spawner/structure/window/hollow/plasma/end/Initialize(mapload)
switch(dir)
if(NORTH)
spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/east, /obj/structure/window/plasma/spawner/west)
@@ -288,7 +288,7 @@ again.
/obj/effect/spawner/structure/window/hollow/plasma/middle
icon_state = "phwindow_spawner_middle"
/obj/effect/spawner/structure/window/hollow/plasma/middle/Initialize()
/obj/effect/spawner/structure/window/hollow/plasma/middle/Initialize(mapload)
switch(dir)
if(NORTH,SOUTH)
spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/north)
@@ -299,7 +299,7 @@ again.
/obj/effect/spawner/structure/window/hollow/plasma/directional
icon_state = "phwindow_spawner_directional"
/obj/effect/spawner/structure/window/hollow/plasma/directional/Initialize()
/obj/effect/spawner/structure/window/hollow/plasma/directional/Initialize(mapload)
switch(dir)
if(NORTH)
spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north)
@@ -334,7 +334,7 @@ again.
/obj/effect/spawner/structure/window/hollow/plasma/reinforced/end
icon_state = "phrwindow_spawner_end"
/obj/effect/spawner/structure/window/hollow/plasma/reinforced/end/Initialize()
/obj/effect/spawner/structure/window/hollow/plasma/reinforced/end/Initialize(mapload)
switch(dir)
if(NORTH)
spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner/west)
@@ -349,7 +349,7 @@ again.
/obj/effect/spawner/structure/window/hollow/plasma/reinforced/middle
icon_state = "phrwindow_spawner_middle"
/obj/effect/spawner/structure/window/hollow/plasma/reinforced/middle/Initialize()
/obj/effect/spawner/structure/window/hollow/plasma/reinforced/middle/Initialize(mapload)
switch(dir)
if(NORTH,SOUTH)
spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/north)
@@ -360,7 +360,7 @@ again.
/obj/effect/spawner/structure/window/hollow/plasma/reinforced/directional
icon_state = "phrwindow_spawner_directional"
/obj/effect/spawner/structure/window/hollow/plasma/reinforced/directional/Initialize()
/obj/effect/spawner/structure/window/hollow/plasma/reinforced/directional/Initialize(mapload)
switch(dir)
if(NORTH)
spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north)
code/game/objects/effects/spiders.dm
+4 -4
View File
@@ -31,7 +31,7 @@
var/genetic = FALSE
icon_state = "stickyweb1"
/obj/structure/spider/stickyweb/Initialize()
/obj/structure/spider/stickyweb/Initialize(mapload)
if(prob(50))
icon_state = "stickyweb2"
. = ..()
@@ -84,7 +84,7 @@
var/poison_per_bite = 5
var/list/faction = list("spiders")
/obj/structure/spider/eggcluster/Initialize()
/obj/structure/spider/eggcluster/Initialize(mapload)
pixel_x = rand(3,-3)
pixel_y = rand(3,-3)
START_PROCESSING(SSobj, src)
@@ -127,7 +127,7 @@
new/obj/item/reagent_containers/food/snacks/spiderling(get_turf(src))
. = ..()
/obj/structure/spider/spiderling/Initialize()
/obj/structure/spider/spiderling/Initialize(mapload)
. = ..()
pixel_x = rand(6,-6)
pixel_y = rand(6,-6)
@@ -248,7 +248,7 @@
icon_state = "cocoon1"
max_integrity = 60
/obj/structure/spider/cocoon/Initialize()
/obj/structure/spider/cocoon/Initialize(mapload)
icon_state = pick("cocoon1","cocoon2","cocoon3")
. = ..()
code/game/objects/effects/temporary_visuals/clockcult.dm
+5 -5
View File
@@ -69,7 +69,7 @@
pixel_y = 20
duration = 20
/obj/effect/temp_visual/ratvar/belligerent_cast/Initialize()
/obj/effect/temp_visual/ratvar/belligerent_cast/Initialize(mapload)
. = ..()
animate(src, alpha = 0, time = duration, easing = EASE_OUT)
@@ -145,7 +145,7 @@
else
playsound(src, "sparks", 50, 1)
/obj/effect/temp_visual/ratvar/ocular_warden/Initialize()
/obj/effect/temp_visual/ratvar/ocular_warden/Initialize(mapload)
. = ..()
pixel_x = rand(-8, 8)
pixel_y = rand(-10, 10)
@@ -184,7 +184,7 @@
layer = ABOVE_MOB_LAYER
duration = 10
/obj/effect/temp_visual/ratvar/component/Initialize()
/obj/effect/temp_visual/ratvar/component/Initialize(mapload)
. = ..()
transform = matrix()*0.75
pixel_x = rand(-10, 10)
@@ -215,7 +215,7 @@
light_power = 2
light_color = "#FAE48C"
/obj/effect/temp_visual/ratvar/sigil/transgression/Initialize()
/obj/effect/temp_visual/ratvar/sigil/transgression/Initialize(mapload)
. = ..()
var/oldtransform = transform
animate(src, transform = matrix()*2, time = 5)
@@ -277,7 +277,7 @@
/obj/effect/temp_visual/steam_release
name = "all the steam"
/obj/effect/temp_visual/steam_release/Initialize()
/obj/effect/temp_visual/steam_release/Initialize(mapload)
..()
for(var/V in GLOB.cardinals)
var/turf/T = get_step(src, V)
code/game/objects/effects/temporary_visuals/temporary_visual.dm
+1 -1
View File
@@ -8,7 +8,7 @@
var/randomdir = TRUE
var/timerid
/obj/effect/temp_visual/Initialize()
/obj/effect/temp_visual/Initialize(mapload)
. = ..()
if(randomdir)
setDir(pick(GLOB.cardinals))
code/game/objects/items.dm
+1 -1
View File
@@ -177,7 +177,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
var/canMouseDown = FALSE
/obj/item/Initialize()
/obj/item/Initialize(mapload)
if(attack_verb)
attack_verb = typelist("attack_verb", attack_verb)
code/game/objects/items/AI_modules.dm
+1 -1
View File
@@ -406,7 +406,7 @@ AI MODULES
/obj/item/aiModule/core/full/custom
name = "Default Core AI Module"
/obj/item/aiModule/core/full/custom/Initialize()
/obj/item/aiModule/core/full/custom/Initialize(mapload)
. = ..()
for(var/line in world.file2list("[global.config.directory]/silicon_laws.txt"))
if(!line)
code/game/objects/items/RCD.dm
+4 -4
View File
@@ -39,7 +39,7 @@ RLD
var/custom_range = 7
var/upgrade = FALSE
/obj/item/construction/Initialize()
/obj/item/construction/Initialize(mapload)
. = ..()
spark_system = new /datum/effect_system/spark_spread
spark_system.set_up(5, 0, src)
@@ -464,7 +464,7 @@ RLD
return TRUE
qdel(rcd_effect)
/obj/item/construction/rcd/Initialize()
/obj/item/construction/rcd/Initialize(mapload)
. = ..()
GLOB.rcd_list += src
@@ -561,7 +561,7 @@ RLD
cut_overlays() //To prevent infinite stacking of overlays
add_overlay("[icon_state]_charge[ratio]")
/obj/item/construction/rcd/Initialize()
/obj/item/construction/rcd/Initialize(mapload)
. = ..()
update_icon()
@@ -699,7 +699,7 @@ RLD
var/color_choice = null
/obj/item/construction/rld/Initialize()
/obj/item/construction/rld/Initialize(mapload)
. = ..()
update_icon()
code/game/objects/items/RCL.dm
+2 -2
View File
@@ -23,7 +23,7 @@
var/datum/radial_menu/persistent/wiring_gui_menu
var/mob/listeningTo
/obj/item/rcl/Initialize()
/obj/item/rcl/Initialize(mapload)
. = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
@@ -314,7 +314,7 @@
else //open the menu
showWiringGui(user)
/obj/item/rcl/pre_loaded/Initialize() //Comes preloaded with cable, for testing stuff
/obj/item/rcl/pre_loaded/Initialize(mapload) //Comes preloaded with cable, for testing stuff
loaded = new()
loaded.max_amount = max_amount
loaded.amount = max_amount
code/game/objects/items/RPD.dm
+1 -1
View File
@@ -532,7 +532,7 @@ GLOBAL_LIST_INIT(fluid_duct_recipes, list(
category = PLUMBING_CATEGORY
locked = TRUE
/obj/item/pipe_dispenser/plumbing/Initialize()
/obj/item/pipe_dispenser/plumbing/Initialize(mapload)
. = ..()
spark_system = new
spark_system.set_up(5, 0, src)
code/game/objects/items/airlock_painter.dm
+3 -3
View File
@@ -16,7 +16,7 @@
var/obj/item/toner/ink = null
/obj/item/airlock_painter/Initialize()
/obj/item/airlock_painter/Initialize(mapload)
. = ..()
ink = new /obj/item/toner(src)
@@ -169,7 +169,7 @@
. = ..()
ui_interact(user)
/obj/item/airlock_painter/decal/Initialize()
/obj/item/airlock_painter/decal/Initialize(mapload)
. = ..()
ink = new /obj/item/toner/large(src)
@@ -237,6 +237,6 @@
name = "extreme decal painter"
icon_state = "decal_sprayer_ex"
/obj/item/airlock_painter/decal/debug/Initialize()
/obj/item/airlock_painter/decal/debug/Initialize(mapload)
. = ..()
ink = new /obj/item/toner/extreme(src)
code/game/objects/items/binoculars.dm
+1 -1
View File
@@ -11,7 +11,7 @@
var/zoom_out_amt = 6
var/zoom_amt = 10
/obj/item/binoculars/Initialize()
/obj/item/binoculars/Initialize(mapload)
. = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
code/game/objects/items/boombox.dm
+1 -1
View File
@@ -48,7 +48,7 @@
baseiconstate = "raiqbawks"
availabletrackids = list("hotline.ogg","chiptune.ogg","genesis.ogg")
/obj/item/boombox/raiq/Initialize()
/obj/item/boombox/raiq/Initialize(mapload)
. = ..()
RegisterSignal(src, COMSIG_ATOM_UPDATED_ICON, .proc/start_party)
code/game/objects/items/broom.dm
+1 -1
View File
@@ -13,7 +13,7 @@
attack_verb = list("swept", "brushed off", "bludgeoned", "whacked")
resistance_flags = FLAMMABLE
/obj/item/broom/Initialize()
/obj/item/broom/Initialize(mapload)
. = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
code/game/objects/items/candle.dm
+1 -1
View File
@@ -15,7 +15,7 @@
var/start_lit = FALSE
var/heats_space = TRUE
/obj/item/candle/Initialize()
/obj/item/candle/Initialize(mapload)
. = ..()
if(start_lit)
light()
code/game/objects/items/cardboard_cutouts.dm
+1 -1
View File
@@ -15,7 +15,7 @@
/// If the cutout actually appears as what it portray and not a discolored version
var/deceptive = FALSE
/obj/item/cardboard_cutout/Initialize()
/obj/item/cardboard_cutout/Initialize(mapload)
. = ..()
if(possible_appearances)
return
code/game/objects/items/cards_ids.dm
+12 -12
View File
@@ -34,7 +34,7 @@
righthand_file = 'icons/mob/inhands/equipment/idcards_righthand.dmi'
var/detail_color = COLOR_ASSEMBLY_ORANGE
/obj/item/card/data/Initialize()
/obj/item/card/data/Initialize(mapload)
.=..()
update_icon()
@@ -448,7 +448,7 @@
var/anyone = FALSE //Can anyone forge the ID or just syndicate?
var/forged = FALSE //have we set a custom name and job assignment, or will we use what we're given when we chameleon change?
/obj/item/card/id/syndicate/Initialize()
/obj/item/card/id/syndicate/Initialize(mapload)
. = ..()
var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/card/id
@@ -566,7 +566,7 @@
registered_name = "Captain"
assignment = "Captain"
/obj/item/card/id/captains_spare/Initialize()
/obj/item/card/id/captains_spare/Initialize(mapload)
var/datum/job/captain/J = new/datum/job/captain
access = J.get_access()
. = ..()
@@ -578,7 +578,7 @@
registered_name = "Central Command"
assignment = "General"
/obj/item/card/id/centcom/Initialize()
/obj/item/card/id/centcom/Initialize(mapload)
access = get_all_centcom_access()
. = ..()
@@ -589,7 +589,7 @@
registered_name = "Emergency Response Team Commander"
assignment = "Emergency Response Team Commander"
/obj/item/card/id/ert/Initialize()
/obj/item/card/id/ert/Initialize(mapload)
access = get_all_accesses()+get_ert_access("commander")-ACCESS_CHANGE_IDS
. = ..()
@@ -598,7 +598,7 @@
registered_name = "Security Response Officer"
assignment = "Security Response Officer"
/obj/item/card/id/ert/Security/Initialize()
/obj/item/card/id/ert/Security/Initialize(mapload)
access = get_all_accesses()+get_ert_access("sec")-ACCESS_CHANGE_IDS
. = ..()
@@ -607,7 +607,7 @@
registered_name = "Engineer Response Officer"
assignment = "Engineer Response Officer"
/obj/item/card/id/ert/Engineer/Initialize()
/obj/item/card/id/ert/Engineer/Initialize(mapload)
access = get_all_accesses()+get_ert_access("eng")-ACCESS_CHANGE_IDS
. = ..()
@@ -616,7 +616,7 @@
registered_name = "Medical Response Officer"
assignment = "Medical Response Officer"
/obj/item/card/id/ert/Medical/Initialize()
/obj/item/card/id/ert/Medical/Initialize(mapload)
access = get_all_accesses()+get_ert_access("med")-ACCESS_CHANGE_IDS
. = ..()
@@ -625,7 +625,7 @@
registered_name = "Religious Response Officer"
assignment = "Religious Response Officer"
/obj/item/card/id/ert/chaplain/Initialize()
/obj/item/card/id/ert/chaplain/Initialize(mapload)
access = get_all_accesses()+get_ert_access("sec")-ACCESS_CHANGE_IDS
. = ..()
@@ -763,7 +763,7 @@
var/department_ID = ACCOUNT_CIV
var/department_name = ACCOUNT_CIV_NAME
/obj/item/card/id/departmental_budget/Initialize()
/obj/item/card/id/departmental_budget/Initialize(mapload)
. = ..()
var/datum/bank_account/B = SSeconomy.get_dep_account(department_ID)
if(B)
@@ -819,7 +819,7 @@
var/id_color = "#00FF00" //defaults to green
var/mutable_appearance/id_overlay
/obj/item/card/id/knight/Initialize()
/obj/item/card/id/knight/Initialize(mapload)
. = ..()
id_overlay = mutable_appearance(icon, "knight_overlay")
update_icon()
@@ -870,7 +870,7 @@
icon_state = "ert_janitor"
assignment = "Jannie"
/obj/item/card/id/debug/Initialize()
/obj/item/card/id/debug/Initialize(mapload)
access = get_all_accesses()+get_all_centcom_access()+get_all_syndicate_access()
registered_account = SSeconomy.get_dep_account(ACCOUNT_CAR)
. = ..()
code/game/objects/items/chainsaw.dm
+1 -1
View File
@@ -23,7 +23,7 @@
var/on = FALSE
var/wielded = FALSE // track wielded status on item
/obj/item/chainsaw/Initialize()
/obj/item/chainsaw/Initialize(mapload)
. = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
code/game/objects/items/charter.dm
+1 -1
View File
@@ -18,7 +18,7 @@
var/static/regex/standard_station_regex
/obj/item/station_charter/Initialize()
/obj/item/station_charter/Initialize(mapload)
. = ..()
if(!standard_station_regex)
var/prefixes = jointext(GLOB.station_prefixes, "|")
code/game/objects/items/chrono_eraser.dm
+3 -3
View File
@@ -52,7 +52,7 @@
var/obj/effect/chrono_field/field = null
var/turf/startpos = null
/obj/item/gun/energy/chrono_gun/Initialize()
/obj/item/gun/energy/chrono_gun/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_NODROP, CHRONO_GUN_TRAIT)
if(istype(loc, /obj/item/chrono_eraser))
@@ -124,7 +124,7 @@
nodamage = 1
var/obj/item/gun/energy/chrono_gun/gun = null
/obj/item/projectile/energy/chrono_beam/Initialize()
/obj/item/projectile/energy/chrono_beam/Initialize(mapload)
. = ..()
var/obj/item/ammo_casing/energy/chrono_beam/C = loc
if(istype(C))
@@ -143,7 +143,7 @@
e_cost = 0
var/obj/item/gun/energy/chrono_gun/gun
/obj/item/ammo_casing/energy/chrono_beam/Initialize()
/obj/item/ammo_casing/energy/chrono_beam/Initialize(mapload)
if(istype(loc))
gun = loc
. = ..()
code/game/objects/items/cigs_lighters.dm
+6 -6
View File
@@ -123,7 +123,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
user.visible_message("<span class='suicide'>[user] is huffing [src] as quickly as [user.p_they()] can! It looks like [user.p_theyre()] trying to give [user.p_them()]self cancer.</span>")
return (TOXLOSS|OXYLOSS)
/obj/item/clothing/mask/cigarette/Initialize()
/obj/item/clothing/mask/cigarette/Initialize(mapload)
. = ..()
create_reagents(chem_volume, INJECTABLE | NO_REACT, NO_REAGENTS_VALUE) // so it doesn't react until you light it
if(list_reagents)
@@ -398,7 +398,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
throwforce = 0
grind_results = list(/datum/reagent/carbon = 2)
/obj/item/cigbutt/Initialize()
/obj/item/cigbutt/Initialize(mapload)
. = ..()
AddElement(/datum/element/trash)
@@ -422,7 +422,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
list_reagents = null
var/packeditem = 0
/obj/item/clothing/mask/cigarette/pipe/Initialize()
/obj/item/clothing/mask/cigarette/pipe/Initialize(mapload)
. = ..()
name = "empty [initial(name)]"
@@ -532,7 +532,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
grind_results = list(/datum/reagent/iron = 1, /datum/reagent/fuel = 5, /datum/reagent/oil = 5)
custom_price = PRICE_ALMOST_CHEAP
/obj/item/lighter/Initialize()
/obj/item/lighter/Initialize(mapload)
. = ..()
if(!overlay_state)
overlay_state = pick(overlay_list)
@@ -670,7 +670,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
COLOR_ASSEMBLY_PURPLE
)
/obj/item/lighter/greyscale/Initialize()
/obj/item/lighter/greyscale/Initialize(mapload)
. = ..()
if(!lighter_color)
lighter_color = pick(color_list)
@@ -917,7 +917,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
var/list/list_reagents = list() //For the base reagents bongs could get
/obj/item/bong/Initialize()
/obj/item/bong/Initialize(mapload)
. = ..()
create_reagents(chem_volume, NO_REACT) // so it doesn't react until you light it
reagents.add_reagent_list(list_reagents)
code/game/objects/items/circuitboards/computer_circuitboards.dm
+1 -1
View File
@@ -313,7 +313,7 @@
var/challenge = FALSE
var/moved = FALSE
/obj/item/circuitboard/computer/syndicate_shuttle/Initialize()
/obj/item/circuitboard/computer/syndicate_shuttle/Initialize(mapload)
. = ..()
GLOB.syndicate_shuttle_boards += src
code/game/objects/items/circuitboards/machine_circuitboards.dm
+2 -2
View File
@@ -77,7 +77,7 @@
#define PATH_POWERCOIL /obj/machinery/power/tesla_coil/power
#define PATH_RPCOIL /obj/machinery/power/tesla_coil/research
/obj/item/circuitboard/machine/tesla_coil/Initialize()
/obj/item/circuitboard/machine/tesla_coil/Initialize(mapload)
. = ..()
if(build_path)
build_path = PATH_POWERCOIL
@@ -347,7 +347,7 @@
#define PATH_FREEZER /obj/machinery/atmospherics/components/unary/thermomachine/freezer
#define PATH_HEATER /obj/machinery/atmospherics/components/unary/thermomachine/heater
/obj/item/circuitboard/machine/thermomachine/Initialize()
/obj/item/circuitboard/machine/thermomachine/Initialize(mapload)
. = ..()
if(!build_path)
if(prob(50))
code/game/objects/items/clown_items.dm
+1 -1
View File
@@ -27,7 +27,7 @@
var/cleanspeed = 50 //slower than mop
force_string = "robust... against germs"
/obj/item/soap/Initialize()
/obj/item/soap/Initialize(mapload)
. = ..()
AddComponent(/datum/component/slippery, 80)
code/game/objects/items/control_wand.dm
+1 -1
View File
@@ -15,7 +15,7 @@
var/region_access = 1 //See access.dm
var/list/access_list
/obj/item/door_remote/Initialize()
/obj/item/door_remote/Initialize(mapload)
. = ..()
access_list = get_region_accesses(region_access)
AddComponent(/datum/component/ntnet_interface)
code/game/objects/items/crayons.dm
+3 -3
View File
@@ -83,7 +83,7 @@
user.visible_message("<span class='suicide'>[user] is jamming [src] up [user.p_their()] nose and into [user.p_their()] brain. It looks like [user.p_theyre()] trying to commit suicide!</span>")
return (BRUTELOSS|OXYLOSS)
/obj/item/toy/crayon/Initialize()
/obj/item/toy/crayon/Initialize(mapload)
. = ..()
// Makes crayons identifiable in things like grinders
if(name == "crayon")
@@ -606,7 +606,7 @@
icon_state = "crayonbox"
w_class = WEIGHT_CLASS_SMALL
/obj/item/storage/crayons/Initialize()
/obj/item/storage/crayons/Initialize(mapload)
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 7
@@ -701,7 +701,7 @@
return (OXYLOSS)
/obj/item/toy/crayon/spraycan/Initialize()
/obj/item/toy/crayon/spraycan/Initialize(mapload)
. = ..()
// If default crayon red colour, pick a more fun spraycan colour
if(!paint_color)
code/game/objects/items/defib.dm
+2 -2
View File
@@ -33,7 +33,7 @@
/obj/item/defibrillator/get_cell()
return cell
/obj/item/defibrillator/Initialize() //starts without a cell for rnd
/obj/item/defibrillator/Initialize(mapload) //starts without a cell for rnd
. = ..()
if(cell)
cell = new cell(src)
@@ -287,7 +287,7 @@
var/disarm_shock_time = 10
var/wielded = FALSE // track wielded status on item
/obj/item/shockpaddles/Initialize()
/obj/item/shockpaddles/Initialize(mapload)
. = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
code/game/objects/items/devices/PDA/PDA.dm
+1 -1
View File
@@ -115,7 +115,7 @@ GLOBAL_LIST_EMPTY(PDAs)
if(LAZYLEN(GLOB.pda_reskins))
. += "<span class='notice'>Ctrl-shift-click it to reskin it.</span>"
/obj/item/pda/Initialize()
/obj/item/pda/Initialize(mapload)
. = ..()
if(fon)
set_light(f_lum, f_pow, f_col)
code/game/objects/items/devices/PDA/PDA_types.dm
+1 -1
View File
@@ -8,7 +8,7 @@
ttone = "honk"
var/slipvictims = list() //CIT CHANGE - makes clown PDAs track unique people slipped
/obj/item/pda/clown/Initialize()
/obj/item/pda/clown/Initialize(mapload)
. = ..()
AddComponent(/datum/component/slippery, 120, NO_SLIP_WHEN_WALKING|SLIP_WHEN_JOGGING, CALLBACK(src, .proc/AfterSlip))
code/game/objects/items/devices/PDA/cart.dm
+3 -3
View File
@@ -52,7 +52,7 @@
var/mob/living/simple_animal/bot/active_bot
var/list/botlist = list()
/obj/item/cartridge/Initialize()
/obj/item/cartridge/Initialize(mapload)
. = ..()
var/obj/item/pda/pda = loc
if(istype(pda))
@@ -131,7 +131,7 @@
icon_state = "cart-tox"
access = CART_REAGENT_SCANNER | CART_ATMOS
/obj/item/cartridge/signal/Initialize()
/obj/item/cartridge/signal/Initialize(mapload)
. = ..()
radio = new(src)
@@ -180,7 +180,7 @@
access = CART_MANIFEST | CART_STATUS_DISPLAY | CART_REAGENT_SCANNER | CART_ATMOS | CART_DRONEPHONE
bot_access_flags = FLOOR_BOT | CLEAN_BOT | MED_BOT | FIRE_BOT
/obj/item/cartridge/rd/Initialize()
/obj/item/cartridge/rd/Initialize(mapload)
. = ..()
radio = new(src)
code/game/objects/items/devices/PDA/radio.dm
+1 -1
View File
@@ -15,7 +15,7 @@
radio_connection = null
return ..()
/obj/item/integrated_signaler/Initialize()
/obj/item/integrated_signaler/Initialize(mapload)
. = ..()
if (frequency < MIN_FREE_FREQ || frequency > MAX_FREE_FREQ)
frequency = sanitize_frequency(frequency)
code/game/objects/items/devices/beacon.dm
+4 -4
View File
@@ -9,11 +9,11 @@
var/enabled = TRUE
var/renamed = FALSE
/obj/item/beacon/Initialize()
/obj/item/beacon/Initialize(mapload)
. = ..()
if (enabled)
GLOB.teleportbeacons += src
else
else
icon_state = "beacon-off"
/obj/item/beacon/Destroy()
@@ -25,7 +25,7 @@
if (enabled)
icon_state = "beacon"
GLOB.teleportbeacons += src
else
else
icon_state = "beacon-off"
GLOB.teleportbeacons.Remove(src)
to_chat(user, "<span class='notice'>You [enabled ? "enable" : "disable"] the beacon.</span>")
@@ -40,5 +40,5 @@
name = new_name
renamed = TRUE
return
else
else
return ..()
code/game/objects/items/devices/dogborg_sleeper.dm
+1 -1
View File
@@ -47,7 +47,7 @@
// Bags are prohibited from this due to the potential explotation of objects, same with brought
/obj/item/dogborg/sleeper/Initialize()
/obj/item/dogborg/sleeper/Initialize(mapload)
. = ..()
update_icon()
item_flags |= NOBLUDGEON //No more attack messages
code/game/objects/items/devices/electroadaptive_pseudocircuit.dm
+1 -1
View File
@@ -11,7 +11,7 @@
var/static/recycleable_circuits = typecacheof(list(/obj/item/electronics/firelock, /obj/item/electronics/airalarm, /obj/item/electronics/firealarm, \
/obj/item/electronics/apc))//A typecache of circuits consumable for material
/obj/item/electroadaptive_pseudocircuit/Initialize()
/obj/item/electroadaptive_pseudocircuit/Initialize(mapload)
. = ..()
maptext = "[circuits]"
code/game/objects/items/devices/flashlight.dm
+2 -2
View File
@@ -17,7 +17,7 @@
var/flashlight_power = 0.8 //strength of the light when on
light_color = "#FFCC66"
/obj/item/flashlight/Initialize()
/obj/item/flashlight/Initialize(mapload)
. = ..()
if(icon_state == "[initial(icon_state)]-on")
on = TRUE
@@ -461,7 +461,7 @@
rad_flags = RAD_NO_CONTAMINATE
var/fuel = 0
/obj/item/flashlight/glowstick/Initialize()
/obj/item/flashlight/glowstick/Initialize(mapload)
fuel = rand(1000, 1500)
light_color = color
. = ..()
code/game/objects/items/devices/geiger_counter.dm
+1 -1
View File
@@ -32,7 +32,7 @@
var/fail_to_receive = 0
var/current_warning = 1
/obj/item/geiger_counter/Initialize()
/obj/item/geiger_counter/Initialize(mapload)
. = ..()
START_PROCESSING(SSobj, src)
code/game/objects/items/devices/gps.dm
+3 -3
View File
@@ -11,7 +11,7 @@
var/emp_proof = FALSE
var/starton = TRUE
/obj/item/gps/Initialize()
/obj/item/gps/Initialize(mapload)
. = ..()
AddComponent(/datum/component/gps/item, gpstag, emp_proof, starton)
@@ -36,7 +36,7 @@
gpstag = "BORG0"
desc = "A mining cyborg internal positioning system. Used as a recovery beacon for damaged cyborg assets, or a collaboration tool for mining teams."
/obj/item/gps/cyborg/Initialize()
/obj/item/gps/cyborg/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_NODROP, CYBORG_ITEM_TRAIT)
@@ -75,7 +75,7 @@
for marking the area around the transition edges."
var/list/turf/tagged
/obj/item/gps/visible_debug/Initialize()
/obj/item/gps/visible_debug/Initialize(mapload)
. = ..()
tagged = list()
START_PROCESSING(SSfastprocess, src)
code/game/objects/items/devices/multitool.dm
+2 -2
View File
@@ -45,7 +45,7 @@
throwforce = 10
obj_flags = UNIQUE_RENAME
/obj/item/multitool/chaplain/Initialize()
/obj/item/multitool/chaplain/Initialize(mapload)
. = ..()
AddComponent(/datum/component/anti_magic, TRUE, TRUE, FALSE, null, null, FALSE)
@@ -130,7 +130,7 @@
var/mob/camera/aiEye/remote/ai_detector/eye
var/datum/action/item_action/toggle_multitool/toggle_action
/obj/item/multitool/ai_detect/Initialize()
/obj/item/multitool/ai_detect/Initialize(mapload)
. = ..()
START_PROCESSING(SSobj, src)
eye = new /mob/camera/aiEye/remote/ai_detector()
code/game/objects/items/devices/paicard.dm
+1 -1
View File
@@ -15,7 +15,7 @@
user.visible_message("<span class='suicide'>[user] is staring sadly at [src]! [user.p_they()] can't keep living without real human intimacy!</span>")
return OXYLOSS
/obj/item/paicard/Initialize()
/obj/item/paicard/Initialize(mapload)
SSpai.pai_card_list += src
add_overlay("pai-off")
AddElement(/datum/element/bed_tuckable, 6, -5, 90)
code/game/objects/items/devices/powersink.dm
+1 -1
View File
@@ -28,7 +28,7 @@ GLOBAL_LIST_EMPTY(power_sinks)
var/obj/structure/cable/attached // the attached cable
/obj/item/powersink/Initialize()
/obj/item/powersink/Initialize(mapload)
. = ..()
GLOB.power_sinks += src
code/game/objects/items/devices/pressureplates.dm
+1 -1
View File
@@ -22,7 +22,7 @@
var/can_trigger = TRUE
var/trigger_delay = 10
/obj/item/pressure_plate/Initialize()
/obj/item/pressure_plate/Initialize(mapload)
. = ..()
tile_overlay = image(icon = 'icons/turf/floors.dmi', icon_state = "pp_overlay")
if(roundstart_signaller)
code/game/objects/items/devices/radio/electropack.dm
+1 -1
View File
@@ -20,7 +20,7 @@
user.visible_message("<span class='suicide'>[user] hooks [user.p_them()]self to the electropack and spams the trigger! It looks like [user.p_theyre()] trying to commit suicide!</span>")
return (FIRELOSS)
/obj/item/electropack/Initialize()
/obj/item/electropack/Initialize(mapload)
. = ..()
set_frequency(frequency)
code/game/objects/items/devices/radio/encryptionkey.dm
+1 -1
View File
@@ -9,7 +9,7 @@
var/independent = FALSE
var/list/channels = list()
/obj/item/encryptionkey/Initialize()
/obj/item/encryptionkey/Initialize(mapload)
. = ..()
if(!channels.len)
desc = "An encryption key for a radio headset. Has no special codes in it. You should probably tell a coder!"
code/game/objects/items/devices/radio/headset.dm
+3 -3
View File
@@ -58,7 +58,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
if (bowman)
AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS))
/obj/item/radio/headset/Initialize()
/obj/item/radio/headset/Initialize(mapload)
. = ..()
recalculateChannels()
@@ -94,12 +94,12 @@ GLOBAL_LIST_INIT(channel_tokens, list(
name = "team leader headset"
command = TRUE
/obj/item/radio/headset/syndicate/Initialize()
/obj/item/radio/headset/syndicate/Initialize(mapload)
. = ..()
make_syndie()
/obj/item/radio/headset/binary
/obj/item/radio/headset/binary/Initialize()
/obj/item/radio/headset/binary/Initialize(mapload)
. = ..()
qdel(keyslot)
keyslot = new /obj/item/encryptionkey/binary
code/game/objects/items/devices/radio/radio.dm
+2 -2
View File
@@ -84,7 +84,7 @@
QDEL_NULL(keyslot)
return ..()
/obj/item/radio/Initialize()
/obj/item/radio/Initialize(mapload)
wires = new /datum/wires/radio(src)
if(prison_radio)
wires.cut(WIRE_TX) // OH GOD WHY
@@ -378,7 +378,7 @@
syndie = 1
keyslot = new /obj/item/encryptionkey/syndicate
/obj/item/radio/borg/syndicate/Initialize()
/obj/item/radio/borg/syndicate/Initialize(mapload)
. = ..()
set_frequency(FREQ_SYNDICATE)
code/game/objects/items/devices/reverse_bear_trap.dm
+1 -1
View File
@@ -22,7 +22,7 @@
var/datum/looping_sound/reverse_bear_trap/soundloop
var/datum/looping_sound/reverse_bear_trap_beep/soundloop2
/obj/item/reverse_bear_trap/Initialize()
/obj/item/reverse_bear_trap/Initialize(mapload)
. = ..()
soundloop = new(src)
soundloop2 = new(src)
code/game/objects/items/devices/traitordevices.dm
+1 -1
View File
@@ -78,7 +78,7 @@ effective or pretty fucking useless.
var/ui_x = 320
var/ui_y = 335
/obj/item/healthanalyzer/rad_laser/Initialize()
/obj/item/healthanalyzer/rad_laser/Initialize(mapload)
. = ..()
AddComponent(/datum/component/identification/syndicate, ID_COMPONENT_DEL_ON_IDENTIFY, ID_COMPONENT_EFFECT_NO_ACTIONS, ID_COMPONENT_IDENTIFY_WITH_DECONSTRUCTOR)
code/game/objects/items/dice.dm
+2 -2
View File
@@ -50,7 +50,7 @@
var/can_be_rigged = TRUE
var/rigged = FALSE
/obj/item/dice/Initialize()
/obj/item/dice/Initialize(mapload)
. = ..()
result = roll(sides)
update_icon()
@@ -89,7 +89,7 @@
desc = "A die with six sides. 6 TIMES 255 TIMES 255 TILE TOTAL EXISTENCE, SQUARE YOUR MIND OF EDUCATED STUPID: 2 DOES NOT EXIST."
icon_state = "spaced6"
/obj/item/dice/d6/space/Initialize()
/obj/item/dice/d6/space/Initialize(mapload)
. = ..()
if(prob(10))
name = "spess cube"
code/game/objects/items/dualsaber.dm
+2 -2
View File
@@ -84,7 +84,7 @@
block_return[BLOCK_RETURN_REDIRECT_METHOD] = REDIRECT_METHOD_DEFLECT
. |= BLOCK_SHOULD_REDIRECT
/obj/item/dualsaber/Initialize()
/obj/item/dualsaber/Initialize(mapload)
. = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
@@ -94,7 +94,7 @@
AddComponent(/datum/component/two_handed, force_unwielded=3, force_wielded=34, \
wieldsound='sound/weapons/saberon.ogg', unwieldsound='sound/weapons/saberoff.ogg')
/obj/item/dualsaber/Initialize()
/obj/item/dualsaber/Initialize(mapload)
. = ..()
if(LAZYLEN(possible_colors))
saber_color = pick(possible_colors)
code/game/objects/items/extinguisher.dm
+1 -1
View File
@@ -53,7 +53,7 @@
power = 7
cooling_power = 3
/obj/item/extinguisher/Initialize()
/obj/item/extinguisher/Initialize(mapload)
. = ..()
create_reagents(max_water, AMOUNT_VISIBLE)
reagents.add_reagent(chem, max_water)
code/game/objects/items/fireaxe.dm
+1 -1
View File
@@ -21,7 +21,7 @@
bare_wound_bonus = 20
var/wielded = FALSE // track wielded status on item
/obj/item/fireaxe/Initialize()
/obj/item/fireaxe/Initialize(mapload)
. = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
code/game/objects/items/fluff.dm
+2 -2
View File
@@ -88,7 +88,7 @@
poly_states = 0
actions_types = list(/datum/action/item_action/squeeze)
/obj/item/toy/fluff/tennis_poly/tri/squeak/Initialize()
/obj/item/toy/fluff/tennis_poly/tri/squeak/Initialize(mapload)
. = ..()
AddComponent(/datum/component/squeak)
@@ -124,7 +124,7 @@
name = "polychromic bone"
desc = "A polychromic chew bone. Makes a small squeak when squeezed."
/obj/item/toy/fluff/bone_poly/squeak/Initialize()
/obj/item/toy/fluff/bone_poly/squeak/Initialize(mapload)
. = ..()
AddComponent(/datum/component/squeak)
code/game/objects/items/granters.dm
+1 -1
View File
@@ -368,7 +368,7 @@
/obj/item/book/granter/spell/random
icon_state = "random_book"
/obj/item/book/granter/spell/random/Initialize()
/obj/item/book/granter/spell/random/Initialize(mapload)
. = ..()
var/static/banned_spells = list(/obj/item/book/granter/spell/mimery_blockade, /obj/item/book/granter/spell/mimery_guns)
var/real_type = pick(subtypesof(/obj/item/book/granter/spell) - banned_spells)
code/game/objects/items/grenades/chem_grenade.dm
+15 -15
View File
@@ -20,7 +20,7 @@
var/no_splash = FALSE //If the grenade deletes even if it has no reagents to splash with. Used for slime core reactions.
var/casedesc = "This basic model accepts both beakers and bottles. It heats contents by 10°K upon ignition." // Appears when examining empty casings.
/obj/item/grenade/chem_grenade/Initialize()
/obj/item/grenade/chem_grenade/Initialize(mapload)
. = ..()
create_reagents(1000)
stage_change() // If no argument is set, it will change the stage to the current stage, useful for stock grenades that start READY.
@@ -326,7 +326,7 @@
desc = "Used for emergency sealing of hull breaches."
stage = READY
/obj/item/grenade/chem_grenade/metalfoam/Initialize()
/obj/item/grenade/chem_grenade/metalfoam/Initialize(mapload)
. = ..()
var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
@@ -344,7 +344,7 @@
desc = "Used for emergency sealing of hull breaches, while keeping areas accessible."
stage = READY
/obj/item/grenade/chem_grenade/smart_metal_foam/Initialize()
/obj/item/grenade/chem_grenade/smart_metal_foam/Initialize(mapload)
. = ..()
var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
@@ -362,7 +362,7 @@
desc = "Used for clearing rooms of living things."
stage = READY
/obj/item/grenade/chem_grenade/incendiary/Initialize()
/obj/item/grenade/chem_grenade/incendiary/Initialize(mapload)
. = ..()
var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
@@ -380,7 +380,7 @@
desc = "Used for purging large areas of invasive plant species. Contents under pressure. Do not directly inhale contents."
stage = READY
/obj/item/grenade/chem_grenade/antiweed/Initialize()
/obj/item/grenade/chem_grenade/antiweed/Initialize(mapload)
. = ..()
var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
@@ -399,7 +399,7 @@
desc = "BLAM!-brand foaming space cleaner. In a special applicator for rapid cleaning of wide areas."
stage = READY
/obj/item/grenade/chem_grenade/cleaner/Initialize()
/obj/item/grenade/chem_grenade/cleaner/Initialize(mapload)
. = ..()
var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
@@ -417,7 +417,7 @@
desc = "Waffle Co.-brand foaming space cleaner. In a special applicator for rapid cleaning of wide areas."
stage = READY
/obj/item/grenade/chem_grenade/ez_clean/Initialize()
/obj/item/grenade/chem_grenade/ez_clean/Initialize(mapload)
. = ..()
var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)
@@ -436,7 +436,7 @@
desc = "Used for nonlethal riot control. Contents under pressure. Do not directly inhale contents."
stage = READY
/obj/item/grenade/chem_grenade/teargas/Initialize()
/obj/item/grenade/chem_grenade/teargas/Initialize(mapload)
. = ..()
var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)
@@ -455,7 +455,7 @@
desc = "Used for melting armoured opponents."
stage = READY
/obj/item/grenade/chem_grenade/facid/Initialize()
/obj/item/grenade/chem_grenade/facid/Initialize(mapload)
. = ..()
var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src)
@@ -475,7 +475,7 @@
desc = "Used for wide scale painting projects."
stage = READY
/obj/item/grenade/chem_grenade/colorful/Initialize()
/obj/item/grenade/chem_grenade/colorful/Initialize(mapload)
. = ..()
var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
@@ -494,7 +494,7 @@
stage = READY
var/glitter_type = /datum/reagent/glitter
/obj/item/grenade/chem_grenade/glitter/Initialize()
/obj/item/grenade/chem_grenade/glitter/Initialize(mapload)
. = ..()
var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
@@ -527,7 +527,7 @@
desc = "BURN!-brand foaming clf3. In a special applicator for rapid purging of wide areas."
stage = READY
/obj/item/grenade/chem_grenade/clf3/Initialize()
/obj/item/grenade/chem_grenade/clf3/Initialize(mapload)
. = ..()
var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src)
@@ -545,7 +545,7 @@
desc = "Tiger Cooperative chemical foam grenade. Causes temporary irration, blindness, confusion, mutism, and mutations to carbon based life forms. Contains additional spore toxin."
stage = READY
/obj/item/grenade/chem_grenade/bioterrorfoam/Initialize()
/obj/item/grenade/chem_grenade/bioterrorfoam/Initialize(mapload)
. = ..()
var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src)
@@ -565,7 +565,7 @@
desc = "WARNING: GRENADE WILL RELEASE DEADLY SPORES CONTAINING ACTIVE AGENTS. SEAL SUIT AND AIRFLOW BEFORE USE."
stage = READY
/obj/item/grenade/chem_grenade/tuberculosis/Initialize()
/obj/item/grenade/chem_grenade/tuberculosis/Initialize(mapload)
. = ..()
var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src)
@@ -585,7 +585,7 @@
icon_state = "holy_grenade"
stage = READY
/obj/item/grenade/chem_grenade/holy/Initialize()
/obj/item/grenade/chem_grenade/holy/Initialize(mapload)
. = ..()
var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)
code/game/objects/items/grenades/ghettobomb.dm
+1 -1
View File
@@ -19,7 +19,7 @@
var/range = 3
var/list/times
/obj/item/grenade/iedcasing/Initialize()
/obj/item/grenade/iedcasing/Initialize(mapload)
. = ..()
add_overlay("improvised_grenade_filled")
add_overlay("improvised_grenade_wired")
code/game/objects/items/grenades/plastic.dm
+1 -1
View File
@@ -21,7 +21,7 @@
var/full_damage_on_mobs = FALSE
var/can_gib_mobs = FALSE
/obj/item/grenade/plastic/Initialize()
/obj/item/grenade/plastic/Initialize(mapload)
. = ..()
plastic_overlay = mutable_appearance(icon, "[item_state]2", HIGH_OBJ_LAYER)
code/game/objects/items/handcuffs.dm
+1 -1
View File
@@ -260,7 +260,7 @@
var/armed = FALSE
var/trap_damage = 20
/obj/item/restraints/legcuffs/beartrap/Initialize()
/obj/item/restraints/legcuffs/beartrap/Initialize(mapload)
. = ..()
icon_state = "[initial(icon_state)][armed]"
code/game/objects/items/his_grace.dm
+1 -1
View File
@@ -25,7 +25,7 @@
var/victims_needed = 10 //Citadel change from 25 to 10
var/ascend_bonus = 15
/obj/item/his_grace/Initialize()
/obj/item/his_grace/Initialize(mapload)
. = ..()
START_PROCESSING(SSprocessing, src)
GLOB.poi_list += src
code/game/objects/items/holy_weapons.dm
+6 -6
View File
@@ -229,7 +229,7 @@
var/chaplain_spawnable = TRUE
total_mass = TOTAL_MASS_MEDIEVAL_WEAPON
/obj/item/nullrod/Initialize()
/obj/item/nullrod/Initialize(mapload)
. = ..()
AddComponent(/datum/component/anti_magic, TRUE, TRUE, FALSE, null, null, FALSE)
@@ -314,7 +314,7 @@
attack_verb = list("punched", "cross countered", "pummeled")
total_mass = TOTAL_MASS_HAND_REPLACEMENT
/obj/item/nullrod/godhand/Initialize()
/obj/item/nullrod/godhand/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT)
@@ -455,7 +455,7 @@
sharpness = SHARP_EDGED
attack_verb = list("chopped", "sliced", "cut", "reaped")
/obj/item/nullrod/scythe/Initialize()
/obj/item/nullrod/scythe/Initialize(mapload)
. = ..()
AddComponent(/datum/component/butchering, 70, 110) //the harvest gives a high bonus chance
@@ -582,7 +582,7 @@
tool_behaviour = TOOL_SAW
toolspeed = 2
/obj/item/nullrod/chainsaw/Initialize()
/obj/item/nullrod/chainsaw/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT)
AddComponent(/datum/component/butchering, 30, 100, 0, hitsound)
@@ -662,7 +662,7 @@
bare_wound_bonus = 25
total_mass = TOTAL_MASS_HAND_REPLACEMENT
/obj/item/nullrod/armblade/Initialize()
/obj/item/nullrod/armblade/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT)
AddComponent(/datum/component/butchering, 80, 70)
@@ -831,7 +831,7 @@
var/praying = FALSE
var/deity_name = "Coderbus" //This is the default, hopefully won't actually appear if the religion subsystem is running properly
/obj/item/nullrod/rosary/Initialize()
/obj/item/nullrod/rosary/Initialize(mapload)
.=..()
if(GLOB.deity)
deity_name = GLOB.deity
code/game/objects/items/implants/implant_chem.dm
+1 -1
View File
@@ -21,7 +21,7 @@
<b>Integrity:</b> Implant will last so long as the subject is alive."}
return dat
/obj/item/implant/chem/Initialize()
/obj/item/implant/chem/Initialize(mapload)
. = ..()
create_reagents(50, OPENCONTAINER)
GLOB.tracked_chem_implants += src
code/game/objects/items/implants/implant_stealth.dm
+1 -1
View File
@@ -16,7 +16,7 @@
animate(src, , alpha = 0, time = 5)
START_PROCESSING(SSobj, src)
/obj/structure/closet/cardboard/agent/Initialize()
/obj/structure/closet/cardboard/agent/Initialize(mapload)
. = ..()
go_invisible()
code/game/objects/items/implants/implant_track.dm
+2 -2
View File
@@ -11,11 +11,11 @@
var/lifespan = 5 MINUTES //how many deciseconds does the implant last?
allow_teleport = FALSE
/obj/item/implant/tracking/c38/Initialize()
/obj/item/implant/tracking/c38/Initialize(mapload)
. = ..()
QDEL_IN(src, lifespan)
/obj/item/implant/tracking/Initialize()
/obj/item/implant/tracking/Initialize(mapload)
. = ..()
GLOB.tracked_implants += src
code/game/objects/items/implants/implantchair.dm
+1 -1
View File
@@ -21,7 +21,7 @@
var/message_cooldown
var/breakout_time = 600
/obj/machinery/implantchair/Initialize()
/obj/machinery/implantchair/Initialize(mapload)
. = ..()
open_machine()
update_icon()
code/game/objects/items/inducer.dm
+4 -4
View File
@@ -14,7 +14,7 @@
var/recharging = FALSE
var/gun_charger = FALSE
/obj/item/inducer/Initialize()
/obj/item/inducer/Initialize(mapload)
. = ..()
if(!cell && cell_type)
cell = new cell_type
@@ -180,7 +180,7 @@
powertransfer = 500
opened = TRUE
/obj/item/inducer/sci/Initialize()
/obj/item/inducer/sci/Initialize(mapload)
. = ..()
update_icon()
@@ -199,11 +199,11 @@
cell_type = null
opened = TRUE
/obj/item/inducer/sci/combat/dry/Initialize() //Just in case
/obj/item/inducer/sci/combat/dry/Initialize(mapload) //Just in case
. = ..()
update_icon()
/obj/item/inducer/sci/combat/Initialize()
/obj/item/inducer/sci/combat/Initialize(mapload)
. = ..()
update_icon()
code/game/objects/items/kitchen.dm
+4 -4
View File
@@ -84,7 +84,7 @@
bare_wound_bonus = 10
custom_price = PRICE_NORMAL
/obj/item/kitchen/knife/Initialize()
/obj/item/kitchen/knife/Initialize(mapload)
. = ..()
AddComponent(/datum/component/butchering, 80 - force, 100, force - 10) //bonus chance increases depending on force
@@ -120,7 +120,7 @@
bare_wound_bonus = 10
custom_price = PRICE_NORMAL
/obj/item/kitchen/efink/Initialize()
/obj/item/kitchen/efink/Initialize(mapload)
. = ..()
AddComponent(/datum/component/butchering, 80 - force, 100, force - 10) //bonus chance increases depending on force
@@ -209,7 +209,7 @@
var/light_on = FALSE
var/brightness_on = 7
/obj/item/kitchen/knife/combat/survival/knuckledagger/Initialize()
/obj/item/kitchen/knife/combat/survival/knuckledagger/Initialize(mapload)
. = ..()
AddComponent(/datum/component/butchering, 30, 130, 20) // it's good for butchering stuff
@@ -322,6 +322,6 @@
desc = "A knife used to cleanly butcher. Its razor-sharp edge has been honed for butchering, but has been poorly maintained over the years."
attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
/obj/item/kitchen/knife/scimitar/Initialize()
/obj/item/kitchen/knife/scimitar/Initialize(mapload)
. = ..()
AddComponent(/datum/component/butchering, 90 - force, 100, force - 60) //bonus chance increases depending on force
code/game/objects/items/manuals.dm
+1 -1
View File
@@ -336,7 +336,7 @@
title = "Outdated Chemistry Textbook"
page_link = "Guide_to_chemistry"
/obj/item/book/manual/wiki/chemistry/Initialize()
/obj/item/book/manual/wiki/chemistry/Initialize(mapload)
. = ..()
new /obj/item/book/manual/wiki/cit/chemistry(loc)
new /obj/item/book/manual/wiki/cit/chem_recipies(loc)
code/game/objects/items/melee/energy.dm
+3 -3
View File
@@ -8,7 +8,7 @@
var/sword_color
total_mass = 0.4 //Survival flashlights typically weigh around 5 ounces.
/obj/item/melee/transforming/energy/Initialize()
/obj/item/melee/transforming/energy/Initialize(mapload)
. = ..()
total_mass_on = (total_mass_on ? total_mass_on : (w_class_on * 0.75))
if(active)
@@ -331,7 +331,7 @@
sharpness = SHARP_EDGED
//Most of the other special functions are handled in their own files. aka special snowflake code so kewl
/obj/item/melee/transforming/energy/blade/Initialize()
/obj/item/melee/transforming/energy/blade/Initialize(mapload)
. = ..()
spark_system = new /datum/effect_system/spark_spread()
spark_system.set_up(5, 0, src)
@@ -371,7 +371,7 @@
light_color = "#37FFF7"
actions_types = list()
/obj/item/melee/transforming/energy/sword/cx/Initialize()
/obj/item/melee/transforming/energy/sword/cx/Initialize(mapload)
icon_state_on = icon_state
return ..()
code/game/objects/items/melee/misc.dm
+7 -7
View File
@@ -46,7 +46,7 @@
sharpness = SHARP_EDGED
total_mass = TOTAL_MASS_HAND_REPLACEMENT
/obj/item/melee/synthetic_arm_blade/Initialize()
/obj/item/melee/synthetic_arm_blade/Initialize(mapload)
. = ..()
AddComponent(/datum/component/butchering, 60, 80) //very imprecise
@@ -84,7 +84,7 @@
parry_flags = PARRY_DEFAULT_HANDLE_FEEDBACK
parry_automatic_enabled = TRUE
/obj/item/melee/sabre/Initialize()
/obj/item/melee/sabre/Initialize(mapload)
. = ..()
AddComponent(/datum/component/butchering, 30, 95, 5) //fast and effective, but as a sword, it might damage the results.
AddElement(/datum/element/sword_point)
@@ -208,7 +208,7 @@
. |= BLOCK_SHOULD_REDIRECT
return_list[BLOCK_RETURN_REDIRECT_METHOD] = REDIRECT_METHOD_DEFLECT
/obj/item/melee/rapier/Initialize()
/obj/item/melee/rapier/Initialize(mapload)
. = ..()
AddComponent(/datum/component/butchering, 20, 65, 0)
@@ -277,7 +277,7 @@
wound_bonus = 15
/obj/item/melee/classic_baton/Initialize()
/obj/item/melee/classic_baton/Initialize(mapload)
. = ..()
if(sword_point)
AddElement(/datum/element/sword_point)
@@ -518,7 +518,7 @@
var/balanced = 1
force_string = "INFINITE"
/obj/item/melee/supermatter_sword/Initialize()
/obj/item/melee/supermatter_sword/Initialize(mapload)
. = ..()
shard = new /obj/machinery/power/supermatter_crystal(src)
qdel(shard.countdown)
@@ -625,7 +625,7 @@
var/datum/beam/beam
total_mass = 2.5
/obj/item/melee/roastingstick/Initialize()
/obj/item/melee/roastingstick/Initialize(mapload)
. = ..()
if (!ovens)
ovens = typecacheof(list(/obj/singularity, /obj/machinery/power/supermatter_crystal, /obj/structure/bonfire, /obj/structure/destructible/clockwork/massive/ratvar))
@@ -741,7 +741,7 @@
var/overlay_state = "mace_handle"
var/mutable_appearance/overlay
/obj/item/melee/cleric_mace/Initialize()
/obj/item/melee/cleric_mace/Initialize(mapload)
. = ..()
overlay = mutable_appearance(icon, overlay_state)
overlay.appearance_flags = RESET_COLOR
code/game/objects/items/melee/transforming.dm
+1 -1
View File
@@ -15,7 +15,7 @@
var/clumsy_check = TRUE
var/total_mass_on //Total mass in ounces when transformed. Primarily for balance purposes. Don't think about it too hard.
/obj/item/melee/transforming/Initialize()
/obj/item/melee/transforming/Initialize(mapload)
. = ..()
if(active)
if(attack_verb_on.len)
code/game/objects/items/pet_carrier.dm
+1 -1
View File
@@ -253,7 +253,7 @@
///chem transfer rate / second
var/transfer_rate = 5
/obj/item/pet_carrier/bluespace/Initialize()
/obj/item/pet_carrier/bluespace/Initialize(mapload)
. = ..()
create_reagents(300, OPENCONTAINER, DEFAULT_REAGENTS_VALUE) //equivalent of bsbeakers
code/game/objects/items/pinpointer.dm
+1 -1
View File
@@ -22,7 +22,7 @@
/// resets target on toggle
var/resets_target = TRUE
/obj/item/pinpointer/Initialize()
/obj/item/pinpointer/Initialize(mapload)
. = ..()
GLOB.pinpointer_list += src
code/game/objects/items/pitchfork.dm
+2 -2
View File
@@ -15,7 +15,7 @@
resistance_flags = FIRE_PROOF
var/wielded = FALSE // track wielded status on item
/obj/item/pitchfork/Initialize()
/obj/item/pitchfork/Initialize(mapload)
. = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
@@ -42,7 +42,7 @@
force = 19
throwforce = 24
/obj/item/pitchfork/demonic/Initialize()
/obj/item/pitchfork/demonic/Initialize(mapload)
. = ..()
set_light(3,6,LIGHT_COLOR_RED)
code/game/objects/items/plushes.dm
+1 -1
View File
@@ -466,7 +466,7 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths())
desc = "Something fucked up"
can_random_spawn = FALSE
/obj/item/toy/plush/random/Initialize()
/obj/item/toy/plush/random/Initialize(mapload)
..()
var/newtype
var/list/snowflake_list = CONFIG_GET(keyed_list/snowflake_plushies)
code/game/objects/items/pneumaticCannon.dm
+2 -2
View File
@@ -35,7 +35,7 @@
trigger_guard = TRIGGER_GUARD_NORMAL
/obj/item/pneumatic_cannon/Initialize()
/obj/item/pneumatic_cannon/Initialize(mapload)
. = ..()
if(selfcharge)
init_charge()
@@ -292,7 +292,7 @@
clumsyCheck = FALSE
var/static/list/pie_typecache = typecacheof(/obj/item/reagent_containers/food/snacks/pie)
/obj/item/pneumatic_cannon/pie/Initialize()
/obj/item/pneumatic_cannon/pie/Initialize(mapload)
. = ..()
allowed_typecache = pie_typecache
code/game/objects/items/religion.dm
+1 -1
View File
@@ -165,7 +165,7 @@
desc = "It's a backpack with lots of extra room. A banner with Nanotrasen's logo is attached, that can't be removed."
icon_state = "bannerpack"
/obj/item/storage/backpack/bannerpack/Initialize()
/obj/item/storage/backpack/bannerpack/Initialize(mapload)
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_combined_w_class = 27 //6 more then normal, for the tradeoff of declaring yourself an antag at all times.
code/game/objects/items/robot/robot_items.dm
+1 -1
View File
@@ -564,7 +564,7 @@
energy = 50000
energy_recharge = 5000
/obj/item/borg/projectile_dampen/Initialize()
/obj/item/borg/projectile_dampen/Initialize(mapload)
. = ..()
projectile_effect = image('icons/effects/fields.dmi', "projectile_dampen_effect")
tracked = list()
code/game/objects/items/shields.dm
+2 -2
View File
@@ -366,7 +366,7 @@
item_state = "flashshield"
var/obj/item/assembly/flash/handheld/embedded_flash
/obj/item/shield/riot/flash/Initialize()
/obj/item/shield/riot/flash/Initialize(mapload)
. = ..()
embedded_flash = new(src)
@@ -561,7 +561,7 @@
var/active = 0
var/clumsy_check = TRUE
/obj/item/shield/energy/Initialize()
/obj/item/shield/energy/Initialize(mapload)
. = ..()
icon_state = "[base_icon_state]0"
code/game/objects/items/singularityhammer.dm
+1 -1
View File
@@ -97,7 +97,7 @@
total_mass = TOTAL_MASS_MEDIEVAL_WEAPON
var/wielded = FALSE // track wielded status on item
/obj/item/mjollnir/Initialize()
/obj/item/mjollnir/Initialize(mapload)
. = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
code/game/objects/items/spear.dm
+1 -1
View File
@@ -25,7 +25,7 @@
wound_bonus = -15
bare_wound_bonus = 15
/obj/item/spear/Initialize()
/obj/item/spear/Initialize(mapload)
. = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)

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