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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits

Browse Source
This commit is contained in:
Putnam3145
2022-05-17 13:22:40 -07:00
parent d5c36b4a99 35f86287e2
commit 33889870c9
1311 changed files with 12771 additions and 10321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/arachnid_web.dm
+2 -2
View File
@@ -16,7 +16,7 @@
playsound(loc, 'sound/items/welder.ogg', 100, TRUE)
/obj/structure/arachnid/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
if(damage_flag == "melee")
if(damage_flag == MELEE)
switch(damage_type)
if(BURN)
damage_amount *= 2
@@ -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
+14 -17
View File
@@ -40,9 +40,16 @@
if(hotspot && istype(T) && T.air)
qdel(hotspot)
var/datum/gas_mixture/G = T.air
var/plas_amt = min(30,G.get_moles(GAS_PLASMA)) //Absorb some plasma
G.adjust_moles(GAS_PLASMA,-plas_amt)
absorbed_plasma += plas_amt
var/amt_removed = min(30,G.get_moles(GAS_PLASMA)) //Absorb some plasma
G.adjust_moles(GAS_PLASMA,-amt_removed)
absorbed_plasma += amt_removed
var/list/fire_gases = GLOB.gas_data.fire_temperatures.Copy()
for(var/gas in fire_gases - GAS_PLASMA)
if(amt_removed <= 0)
break
var/this_amount = min(30-amt_removed, G.get_moles(gas))
G.adjust_moles(gas, -this_amount)
amt_removed -= this_amount
if(G.return_temperature() > T20C)
G.set_temperature(max(G.return_temperature()/2,T20C))
T.air_update_turf()
@@ -90,7 +97,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 +278,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)
@@ -291,9 +298,6 @@
to_chat(user, "<span class='warning'>You hit [src] but bounce off it!</span>")
playsound(src.loc, 'sound/weapons/tap.ogg', 100, 1)
/obj/structure/foamedmetal/CanPass(atom/movable/mover, turf/target)
return !density
/obj/structure/foamedmetal/iron
max_integrity = 50
icon_state = "ironfoam"
@@ -306,8 +310,9 @@
icon_state = "atmos_resin"
alpha = 120
max_integrity = 10
pass_flags_self = PASSGLASS
/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
@@ -336,14 +341,6 @@
for(var/obj/item/Item in O)
Item.extinguish()
/obj/structure/foamedmetal/resin/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && (mover.pass_flags & PASSGLASS))
return TRUE
. = ..()
/obj/structure/foamedmetal/resin/BlockThermalConductivity()
return TRUE
#undef ALUMINUM_FOAM
#undef IRON_FOAM
#undef RESIN_FOAM
code/game/objects/effects/effect_system/effects_smoke.dm
+5 -7
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)
@@ -133,13 +133,11 @@
M.emote("cough")
return 1
/obj/effect/particle_effect/smoke/bad/CanPass(atom/movable/mover, turf/target)
if(istype(mover, /obj/item/projectile/beam))
var/obj/item/projectile/beam/B = mover
/obj/effect/particle_effect/smoke/bad/Crossed(atom/movable/AM, oldloc)
. = ..()
if(istype(AM, /obj/item/projectile/beam))
var/obj/item/projectile/beam/B = AM
B.damage = (B.damage/2)
return 1
/datum/effect_system/smoke_spread/bad
effect_type = /obj/effect/particle_effect/smoke/bad
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/effects.dm
-3
View File
@@ -18,9 +18,6 @@
/obj/effect/acid_act()
return
/obj/effect/mech_melee_attack(obj/mecha/M)
return 0
/obj/effect/blob_act(obj/structure/blob/B)
return
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
@@ -185,7 +185,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)
. = ..()
@@ -240,7 +240,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
@@ -316,7 +316,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
+7 -7
View File
@@ -15,7 +15,7 @@
/obj/structure/spider/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
if(damage_flag == "melee")
if(damage_flag == MELEE)
switch(damage_type)
if(BURN)
damage_amount *= 2
@@ -31,12 +31,13 @@
var/genetic = FALSE
icon_state = "stickyweb1"
/obj/structure/spider/stickyweb/Initialize()
/obj/structure/spider/stickyweb/Initialize(mapload)
if(prob(50))
icon_state = "stickyweb2"
. = ..()
/obj/structure/spider/stickyweb/CanPass(atom/movable/mover, turf/target)
/obj/structure/spider/stickyweb/CanAllowThrough(atom/movable/mover, turf/target)
. = ..()
if (genetic)
return
if(istype(mover, /mob/living/simple_animal/hostile/poison/giant_spider))
@@ -49,7 +50,6 @@
return FALSE
else if(istype(mover, /obj/item/projectile))
return prob(30)
return TRUE
/obj/structure/spider/stickyweb/genetic //for the spider genes in genetics
genetic = TRUE
@@ -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
+15 -11
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)
@@ -129,14 +129,18 @@
"<span class='userdanger'>Your [I.name] shields you from [src]!</span>")
continue
L.visible_message("<span class='warning'>[L] is struck by a [name]!</span>", "<span class='userdanger'>You're struck by a [name]!</span>")
L.apply_damage(damage, BURN, "chest", L.run_armor_check("chest", "laser", "Your armor absorbs [src]!", "Your armor blocks part of [src]!", 0, "Your armor was penetrated by [src]!"))
L.apply_damage(damage, BURN, "chest", L.run_armor_check("chest", LASER, "Your armor absorbs [src]!", "Your armor blocks part of [src]!", 0, "Your armor was penetrated by [src]!"))
log_combat(user, L, "struck with a volt blast")
hit_amount++
for(var/obj/mecha/M in T)
if(M.occupant)
if(is_servant_of_ratvar(M.occupant))
continue
to_chat(M.occupant, "<span class='userdanger'>Your [M.name] is struck by a [name]!</span>")
for(var/obj/vehicle/sealed/mecha/M in T)
if(LAZYLEN(M.occupants))
for(var/mob/living/MB in M.occupants)
if(is_servant_of_ratvar(MB))
continue
else
to_chat(MB, "<span class='userdanger'>Your [M.name] is struck by a [name]!</span>")
continue
M.visible_message("<span class='warning'>[M] is struck by a [name]!</span>")
M.take_damage(damage, BURN, 0, 0)
hit_amount++
@@ -145,7 +149,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 +188,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 +219,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 +281,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))