cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2025-12-10 09:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
silicons
2021-02-25 02:29:52 -07:00
parent 10369a482c
commit ac7cb45b28
46 changed files with 271 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/__HELPERS/unsorted.dm
View File

@@ -1287,8 +1287,9 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
color = origin.color
set_light(origin.light_range, origin.light_power, origin.light_color)
/mob/dview/New()
..()
INITIALIZE_IMMEDIATE(/mob/dview)
/mob/dview/Initialize(mapload)
. = ..()
// We don't want to be in any mob lists; we're a dummy not a mob.
mob_list -= src
if(stat == DEAD)

12
code/defines/obj/weapon.dm
View File

@@ -515,10 +515,10 @@
w_class = ITEMSIZE_SMALL
var/rating = 1
/obj/item/stock_parts/New()
src.pixel_x = rand(-5.0, 5)
src.pixel_y = rand(-5.0, 5)
..()
/obj/item/stock_parts/Initialize(mapload)
. = ..()
pixel_x = rand(-5.0, 5)
pixel_y = rand(-5.0, 5)
/obj/item/stock_parts/get_rating()
return rating
@@ -542,9 +542,9 @@
var/charge = 0
var/max_charge = 1000
/obj/item/stock_parts/capacitor/New()
/obj/item/stock_parts/capacitor/Initialize(mapload)
. = ..()
max_charge *= rating
max_charge *= rating // this is garbage someone remove it later and hardcode
/obj/item/stock_parts/capacitor/proc/charge(var/amount)
charge += amount

6
code/game/area/areas.dm
View File

@@ -54,7 +54,9 @@
minimap_color = I.GetPixel(1,1)
else // no icon state? use random.
minimap_color = rgb(rand(50,70),rand(50,70),rand(50,70)) // This interacts with the map loader, so it needs to be set immediately
return ..()
/area/Initialize(mapload)
icon_state = ""
uid = ++global_uid
all_areas += src
@@ -68,10 +70,6 @@
luminosity = 0
else
luminosity = 1
..()
/area/Initialize(mapload)
. = ..()
return INITIALIZE_HINT_LATELOAD // Areas tradiationally are initialized AFTER other atoms.

5
code/game/atoms_movable.dm
View File

@@ -209,11 +209,6 @@
var/atom/master = null
anchored = 1
/atom/movable/overlay/New()
for(var/x in src.verbs)
src.verbs -= x
..()
/atom/movable/overlay/attackby(a, b)
if (src.master)
return src.master.attackby(a, b)

3
code/game/gamemodes/changeling/powers/electric_lockpick.dm
View File

@@ -32,7 +32,8 @@
icon_state = "electric_hand"
show_examine = FALSE
/obj/item/finger_lockpick/New()
/obj/item/finger_lockpick/Initialize(mapload)
. = ..()
if(ismob(loc))
to_chat(loc, "<span class='notice'>We shape our finger to fit inside electronics, and are ready to force them open.</span>")

5
code/game/gamemodes/changeling/powers/fabricate_clothing.dm
View File

@@ -264,12 +264,9 @@ var/global/list/changeling_fabricated_clothing = list(
access = null
canremove = 0
/obj/item/card/id/syndicate/changeling/New(mob/user as mob)
..()
registered_user = user
/obj/item/card/id/syndicate/changeling/Initialize(mapload)
. = ..()
registered_user = loc
access = null
/obj/item/card/id/syndicate/changeling/verb/shred()

5
code/game/gamemodes/events/holidays/Christmas.dm
View File

@@ -23,9 +23,6 @@
desc = "Directions for use: Requires two people, one to pull each end."
var/cracked = 0
/obj/item/toy/xmas_cracker/New()
..()
/obj/item/toy/xmas_cracker/attack(mob/target, mob/user)
if( !cracked && (istype(target,/mob/living/silicon) || (istype(target,/mob/living/carbon/human) && !target.get_active_hand())) && target.stat == CONSCIOUS)
target.visible_message("<span class='notice'>[user] and [target] pop \an [src]! *pop*</span>", "<span class='notice'>You pull \an [src] with [target]! *pop*</span>", "<span class='notice'>You hear a *pop*.</span>")
@@ -40,7 +37,7 @@
"What do you get from eating tree decorations?\n\n<i>Tinsilitis!</i>",
"What do snowmen wear on their heads?\n\n<i>Ice caps!</i>",
"Why is Christmas just like life on ss13?\n\n<i>You do all the work and the fat guy gets all the credit.</i>",
"Why doesn<73>t Santa have any children?\n\n<i>Because he only comes down the chimney.</i>")
"Why doesn<73>t Santa have any children?\n\n<i>Because he only comes down the chimney.</i>")
new /obj/item/clothing/head/festive(target.loc)
user.update_icons()
cracked = 1

3
code/game/gamemodes/technomancer/equipment.dm
View File

@@ -111,7 +111,7 @@
name = "hypo belt"
desc = "A medical belt designed to carry autoinjectors and other medical equipment."
/obj/item/storage/belt/medical/technomancer/New()
/obj/item/storage/belt/medical/technomancer/PopulateContents()
new /obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute(src)
new /obj/item/reagent_containers/hypospray/autoinjector/biginjector/burn(src)
new /obj/item/reagent_containers/hypospray/autoinjector/biginjector/toxin(src)
@@ -120,7 +120,6 @@
new /obj/item/reagent_containers/hypospray/autoinjector/biginjector/pain(src)
new /obj/item/reagent_containers/hypospray/autoinjector/biginjector/organ(src)
new /obj/item/reagent_containers/hypospray/autoinjector/biginjector/combat(src)
..()
/datum/technomancer/equipment/belt_of_holding
name = "Belt of Holding"

4
code/game/gamemodes/technomancer/spells/aura/aura.dm
View File

@@ -6,8 +6,8 @@
aspect = null
var/glow_color = "#FFFFFF"
/obj/item/spell/aura/New()
..()
/obj/item/spell/aura/Initialize(mapload)
. = ..()
set_light(calculate_spell_power(7), calculate_spell_power(4), l_color = glow_color)
START_PROCESSING(SSobj, src)
log_and_message_admins("has started casting [src].")

13
code/game/gamemodes/technomancer/spells/insert/insert.dm
View File

@@ -11,8 +11,8 @@
var/obj/item/inserted_spell/inserting = null
var/allow_stacking = 0
/obj/item/spell/insert/New()
..()
/obj/item/spell/insert/Initialize(mapload)
. = ..()
set_light(spell_light_range, spell_light_intensity, l_color = light_color)
/obj/item/inserted_spell
@@ -20,13 +20,12 @@
var/mob/living/host = null
var/spell_power_at_creation = 1.0 // This is here because the spell object that made this object probably won't exist.
/obj/item/inserted_spell/New(var/newloc, var/user, var/obj/item/spell/insert/inserter)
..(newloc)
host = newloc
/obj/item/inserted_spell/Initialize(mapload, mob/user, obj/item/spell/insert/inserter)
. = ..()
host = loc
origin = user
if(light_color)
spawn(1)
set_light(inserter.spell_light_range, inserter.spell_light_intensity, inserter.spell_color)
set_light(inserter.spell_light_range, inserter.spell_light_intensity, inserter.spell_color)
on_insert()
/obj/item/inserted_spell/proc/on_insert()

4
code/game/gamemodes/technomancer/spells/modifier/modifier.dm
View File

@@ -9,8 +9,8 @@
var/spell_light_intensity = 2
var/spell_light_range = 3
/obj/item/spell/modifier/New()
..()
/obj/item/spell/modifier/Initialize(mapload)
. = ..()
set_light(spell_light_range, spell_light_intensity, l_color = light_color)
/obj/item/spell/modifier/on_melee_cast(atom/hit_atom, mob/user)

4
code/game/gamemodes/technomancer/spells/radiance.dm
View File

@@ -16,8 +16,8 @@
var/power = 250
toggled = 1
/obj/item/spell/radiance/New()
..()
/obj/item/spell/radiance/Initialize(mapload)
. = ..()
set_light(7, 4, l_color = "#D9D900")
START_PROCESSING(SSobj, src)
log_and_message_admins("has casted [src].")

4
code/game/gamemodes/technomancer/spells/shield.dm
View File

@@ -18,8 +18,8 @@
var/damage_to_energy_multiplier = 30.0 //Determines how much energy to charge for blocking, e.g. 20 damage attack = 600 energy cost
var/datum/effect_system/spark_spread/spark_system = null
/obj/item/spell/shield/New()
..()
/obj/item/spell/shield/Initialize(mapload)
. = ..()
set_light(3, 2, l_color = "#006AFF")
spark_system = new /datum/effect_system/spark_spread()
spark_system.set_up(5, 0, src)

11
code/game/gamemodes/technomancer/spells/spawner/destablize.dm
View File

@@ -14,8 +14,8 @@
aspect = ASPECT_UNSTABLE
spawner_type = /obj/effect/temporary_effect/destablize
/obj/item/spell/spawner/destablize/New()
..()
/obj/item/spell/spawner/destablize/Initialize(mapload)
. = ..()
set_light(3, 2, l_color = "#C26DDE")
/obj/item/spell/spawner/destablize/on_ranged_cast(atom/hit_atom, mob/user)
@@ -35,10 +35,9 @@
var/instability_power = 5
var/instability_range = 6
/obj/effect/temporary_effect/destablize/New()
..()
spawn(0)
radiate_loop()
/obj/effect/temporary_effect/destablize/Initialize(mapload)
. = ..()
INVOKE_ASYNC(src, .proc/radiate_loop)
/obj/effect/temporary_effect/destablize/proc/radiate_loop()
while(pulses_remaining)

6
code/game/machinery/CableLayer.dm
View File

@@ -8,13 +8,13 @@
var/max_cable = 100
var/on = 0
/obj/machinery/cablelayer/New()
/obj/machinery/cablelayer/Initialize(mapload, newdir)
. = ..()
cable = new(src)
cable.amount = 100
..()
/obj/machinery/cablelayer/Move(new_turf,M_Dir)
..()
. = ..()
layCable(new_turf,M_Dir)
/obj/machinery/cablelayer/attack_hand(mob/user as mob)

8
code/game/machinery/alarm.dm
View File

@@ -95,8 +95,8 @@
/obj/machinery/alarm/alarms_hidden
alarms_hidden = TRUE
/obj/machinery/alarm/server/New()
..()
/obj/machinery/alarm/server/Initialize(mapload)
. = ..()
req_access = list(access_rd, access_atmospherics, access_engine_equip)
TLV["oxygen"] = list(-1.0, -1.0,-1.0,-1.0) // Partial pressure, kpa
TLV["carbon dioxide"] = list(-1.0, -1.0, 5, 10) // Partial pressure, kpa
@@ -115,8 +115,8 @@
elect_master(exclude_self = TRUE)
return ..()
/obj/machinery/alarm/New()
..()
/obj/machinery/alarm/Initialize(mapload)
. = ..()
first_run()
/obj/machinery/alarm/proc/first_run()

3
code/game/machinery/cloning.dm
View File

@@ -545,8 +545,7 @@
name = "Diskette Box"
icon_state = "disk_kit"
/obj/item/storage/box/disks/New()
..()
/obj/item/storage/box/disks/PopulateContents()
new /obj/item/disk/data(src)
new /obj/item/disk/data(src)
new /obj/item/disk/data(src)

4
code/game/mecha/mech_prosthetics.dm
View File

@@ -29,8 +29,8 @@
var/species = "Human"
var/sync_message = ""
/obj/machinery/pros_fabricator/New()
..()
/obj/machinery/pros_fabricator/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/stock_parts/matter_bin(src)
component_parts += new /obj/item/stock_parts/matter_bin(src)

4
code/game/objects/effects/alien/aliens.dm
View File

@@ -392,8 +392,8 @@ Alien plants should do something if theres a lot of poison
var/ticks = 0
var/target_strength = 0
/obj/effect/alien/acid/New(loc, target)
..(loc)
/obj/effect/alien/acid/Initialize(mapload, target)
. = ..()
src.target = target
if(isturf(target)) // Turf take twice as long to take down.

4
code/game/objects/effects/chem/coating.dm
View File

@@ -6,8 +6,8 @@
icon = 'icons/effects/effects.dmi'
icon_state = "dirt"
/obj/effect/decal/cleanable/chemcoating/New()
..()
/obj/effect/decal/cleanable/chemcoating/Initialize(mapload)
. = ..()
create_reagents(100)
/obj/effect/decal/cleanable/chemcoating/Initialize(mapload)

9
code/game/objects/effects/chem/foam.dm
View File

@@ -15,8 +15,8 @@
var/expand = 1
var/metal = 0
/obj/effect/effect/foam/New(var/loc, var/ismetal = 0)
..(loc)
/obj/effect/effect/foam/Initialize(mapload, ismetal = FALSE)
. = ..()
icon_state = "[ismetal? "m" : ""]foam"
metal = ismetal
playsound(src, 'sound/effects/bubbles2.ogg', 80, 1, -3)
@@ -33,7 +33,6 @@
flick("[icon_state]-disolve", src)
sleep(5)
qdel(src)
return
/obj/effect/effect/foam/proc/checkReagents() // transfer any reagents to the floor
if(!metal && reagents)
@@ -134,8 +133,8 @@
can_atmos_pass = ATMOS_PASS_NO
var/metal = 1 // 1 = aluminum, 2 = iron
/obj/structure/foamedmetal/New()
..()
/obj/structure/foamedmetal/Initialize(mapload)
. = ..()
update_nearby_tiles(1)
/obj/structure/foamedmetal/Destroy()

5
code/game/objects/effects/decals/Cleanable/fuel.dm
View File

@@ -6,7 +6,8 @@
anchored = 1
var/amount = 1
/obj/effect/decal/cleanable/liquid_fuel/New(turf/newLoc,amt=1,nologs=1)
/obj/effect/decal/cleanable/liquid_fuel/Initialize(mapload, amt = 1, nologs = TRUE)
var/turf/newLoc = loc
if(!nologs)
message_admins("Liquid fuel has spilled in [newLoc.loc.name] ([newLoc.x],[newLoc.y],[newLoc.z]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[newLoc.x];Y=[newLoc.y];Z=[newLoc.z]'>JMP</a>)")
log_game("Liquid fuel has spilled in [newLoc.loc.name] ([newLoc.x],[newLoc.y],[newLoc.z])")
@@ -25,7 +26,7 @@
if(!has_spread)
Spread()
else
qdel(src)
return INITIALIZE_HINT_QDEL
/obj/effect/decal/cleanable/liquid_fuel/proc/Spread(exclude=list())
//Allows liquid fuels to sometimes flow into other tiles.

18
code/game/objects/effects/decals/Cleanable/humans.dm
View File

@@ -144,8 +144,8 @@ var/global/list/image/splatter_cache=list()
amount = 0
var/list/drips = list()
/obj/effect/decal/cleanable/blood/drip/New()
..()
/obj/effect/decal/cleanable/blood/drip/Initialize(mapload)
. = ..()
drips |= icon_state
/obj/effect/decal/cleanable/blood/writing
@@ -156,8 +156,8 @@ var/global/list/image/splatter_cache=list()
amount = 0
var/message
/obj/effect/decal/cleanable/blood/writing/New()
..()
/obj/effect/decal/cleanable/blood/writing/Initialize(mapload)
. = ..()
if(random_icon_states.len)
for(var/obj/effect/decal/cleanable/blood/writing/W in loc)
random_icon_states.Remove(W.icon_state)
@@ -238,12 +238,12 @@ var/global/list/image/splatter_cache=list()
var/list/datum/disease2/disease/virus2 = list()
var/dry=0 // Keeps the lag down
/obj/effect/decal/cleanable/mucus/New()
spawn(DRYING_TIME * 2)
dry=1
/obj/effect/decal/cleanable/mucus/Initialize(mapload)
. = ..()
addtimer(VARSET_CALLBACK(src, dry, TRUE), DRYING_TIME * 2)
//This version should be used for admin spawns and pre-mapped virus vectors (e.g. in PoIs), this version does not dry
/obj/effect/decal/cleanable/mucus/mapped/New()
..()
/obj/effect/decal/cleanable/mucus/mapped/Initialize(mapload)
. = ..()
virus2 |= new /datum/disease2/disease
virus2[1].makerandom()

2
code/game/objects/effects/decals/warning_stripes.dm
View File

@@ -1,7 +1,7 @@
/obj/effect/decal/warning_stripes
icon = 'icons/effects/warning_stripes.dmi'
/obj/effect/decal/warning_stripes/New()
/obj/effect/decal/warning_stripes/Initialize(mapload)
. = ..()
var/turf/T=get_turf(src)
var/image/I=image(icon, icon_state = icon_state, dir = dir)

36
code/game/objects/effects/spawners/bombspawner.dm
View File

@@ -23,8 +23,8 @@
/obj/effect/spawner/bomb/suicide
btype = 3
/obj/effect/spawner/bomb/New()
..()
/obj/effect/spawner/bomb/Initialize(mapload)
. = ..()
switch (src.btype)
// radio
@@ -213,13 +213,10 @@
var/phoron_amt = 0
var/oxygen_amt = 0
/obj/effect/spawner/onetankbomb/New(newloc) //just needs an assembly.
..(newloc)
/obj/effect/spawner/onetankbomb/Initialize(mapload)
var/type = pick(/obj/item/tank/phoron/onetankbomb, /obj/item/tank/oxygen/onetankbomb)
new type(src.loc)
qdel(src)
return INITIALIZE_HINT_QDEL
/obj/effect/spawner/onetankbomb/full
name = "Single-tank bomb"
@@ -229,28 +226,7 @@
// var/assembly_type = /obj/item/assembly/signaler
//Note that the maximum amount of gas you can put in a 70L air tank at 1013.25 kPa and 519K is 16.44 mol.
/obj/effect/spawner/onetankbomb/full/New(newloc) //just needs an assembly.
..(newloc)
/obj/effect/spawner/onetankbomb/full/Initialize(mapload)
var/type = pick(/obj/item/tank/phoron/onetankbomb/full, /obj/item/tank/oxygen/onetankbomb/full)
new type(src.loc)
qdel(src)
/obj/effect/spawner/onetankbomb/frag
name = "Single-tank bomb"
icon = 'icons/mob/screen1.dmi'
icon_state = "x"
// var/assembly_type = /obj/item/assembly/signaler
//Note that the maximum amount of gas you can put in a 70L air tank at 1013.25 kPa and 519K is 16.44 mol.
/obj/effect/spawner/onetankbomb/full/New(newloc) //just needs an assembly.
..(newloc)
var/type = pick(/obj/item/tank/phoron/onetankbomb/full, /obj/item/tank/oxygen/onetankbomb/full)
new type(src.loc)
qdel(src)
return INITIALIZE_HINT_QDEL

8
code/game/objects/effects/spiders.dm
View File

@@ -89,9 +89,9 @@
START_PROCESSING(SSobj, src)
return ..()
/obj/effect/spider/eggcluster/New(var/location, var/atom/parent)
/obj/effect/spider/eggcluster/Initialize(mapload, atom/parent)
. = ..()
get_light_and_color(parent)
..()
/obj/effect/spider/eggcluster/Destroy()
STOP_PROCESSING(SSobj, src)
@@ -140,7 +140,8 @@
/obj/effect/spider/spiderling/frost
grow_as = list(/mob/living/simple_mob/animal/giant_spider/frost)
/obj/effect/spider/spiderling/New(var/location, var/atom/parent)
/obj/effect/spider/spiderling/Initialize(mapload, atom/parent)
. = ..()
pixel_x = rand(6,-6)
pixel_y = rand(6,-6)
START_PROCESSING(SSobj, src)
@@ -148,7 +149,6 @@
if(prob(50))
amount_grown = 1
get_light_and_color(parent)
..()
/obj/effect/spider/spiderling/Destroy()
STOP_PROCESSING(SSobj, src)

4
code/game/objects/effects/step_triggers.dm
View File

@@ -183,8 +183,8 @@ var/global/list/tele_landmarks = list() // Terrible, but the alternative is loop
/obj/effect/landmark/teleport_mark
var/landmark_id = null
/obj/effect/landmark/teleport_mark/New()
..()
/obj/effect/landmark/teleport_mark/Initialize(mapload)
. = ..()
tele_landmarks += src
/obj/effect/landmark/teleport_mark/Destroy()

4
code/game/objects/items/devices/defib.dm
View File

@@ -563,9 +563,9 @@
/obj/item/shockpaddles/linked
var/obj/item/defib_kit/base_unit
/obj/item/shockpaddles/linked/New(newloc, obj/item/defib_kit/defib)
/obj/item/shockpaddles/linked/Initialize(mapload, obj/item/defib_kit/defib)
. = ..()
base_unit = defib
..(newloc)
/obj/item/shockpaddles/linked/Destroy()
if(base_unit)

4
code/game/objects/items/devices/flashlight.dm
View File

@@ -462,8 +462,8 @@
on = 1 //Bio-luminesence has one setting, on.
power_use = 0
/obj/item/flashlight/slime/New()
..()
/obj/item/flashlight/slime/Initialize(mapload)
. = ..()
set_light(brightness_on, flashlight_power, flashlight_colour)
/obj/item/flashlight/slime/update_icon()

7
code/game/objects/items/storage/internal.dm
View File

@@ -4,12 +4,11 @@
preserve_item = 1
var/obj/item/master_item
/obj/item/storage/internal/New(obj/item/MI)
master_item = MI
loc = master_item
/obj/item/storage/internal/Initialize(mapload)
. = ..()
master_item = loc
//name = master_item.name //VOREStation Removal
verbs -= /obj/item/verb/verb_pickup //make sure this is never picked up.
..()
/obj/item/storage/internal/Destroy()
master_item = null

70
code/game/objects/items/weapons/implants/implantcase.dm
View File

@@ -121,11 +121,9 @@
desc = "A case containing an adrenalin implant."
icon_state = "implantcase-b"
/obj/item/implantcase/adrenalin/New()
/obj/item/implantcase/adrenalin/Initialize(mapload)
src.imp = new /obj/item/implant/adrenalin( src )
..()
return
return ..()
/obj/item/implantcase/dexplosive
name = "glass case - 'explosive'"
@@ -150,117 +148,105 @@
desc = "A case containing a GalCom language implant."
icon_state = "implantcase-b"
/obj/item/implantcase/language/New()
/obj/item/implantcase/language/Initialize(mapload)
src.imp = new /obj/item/implant/language( src )
..()
return
return ..()
/obj/item/implantcase/language/eal
name = "glass case - 'EAL'"
desc = "A case containing an Encoded Audio Language implant."
icon_state = "implantcase-b"
/obj/item/implantcase/language/eal/New()
/obj/item/implantcase/language/eal/Initialize(mapload)
src.imp = new /obj/item/implant/language/eal( src )
..()
return
return ..()
/obj/item/implantcase/shades
name = "glass case - 'Integrated Shades'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/implantcase/shades/New()
/obj/item/implantcase/shades/Initialize(mapload)
src.imp = new /obj/item/implant/organ( src )
..()
return
return ..()
/obj/item/implantcase/taser
name = "glass case - 'Taser'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/implantcase/taser/New()
/obj/item/implantcase/taser/Initialize(mapload)
src.imp = new /obj/item/implant/organ/limbaugment( src )
..()
return
return ..()
/obj/item/implantcase/laser
name = "glass case - 'Laser'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/implantcase/laser/New()
/obj/item/implantcase/laser/Initialize(mapload)
src.imp = new /obj/item/implant/organ/limbaugment/laser( src )
..()
return
return ..()
/obj/item/implantcase/dart
name = "glass case - 'Dart'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/implantcase/dart/New()
/obj/item/implantcase/dart/Initialize(mapload)
src.imp = new /obj/item/implant/organ/limbaugment/dart( src )
..()
return
return ..()
/obj/item/implantcase/toolkit
name = "glass case - 'Toolkit'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/implantcase/toolkit/New()
/obj/item/implantcase/toolkit/Initialize(mapload)
src.imp = new /obj/item/implant/organ/limbaugment/upperarm( src )
..()
return
return ..()
/obj/item/implantcase/medkit
name = "glass case - 'Toolkit'"
name = "glass case - 'Medikit'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/implantcase/medkit/New()
/obj/item/implantcase/medkit/Initialize(mapload)
src.imp = new /obj/item/implant/organ/limbaugment/upperarm/medkit( src )
..()
return
return ..()
/obj/item/implantcase/surge
name = "glass case - 'Muscle Overclocker'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/implantcase/surge/New()
/obj/item/implantcase/surge/Initialize(mapload)
src.imp = new /obj/item/implant/organ/limbaugment/upperarm/surge( src )
..()
return
return ..()
/obj/item/implantcase/analyzer
name = "glass case - 'Scanner'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/implantcase/analyzer/New()
/obj/item/implantcase/analyzer/Initialize(mapload)
src.imp = new /obj/item/implant/organ/limbaugment/wrist( src )
..()
return
return ..()
/obj/item/implantcase/sword
name = "glass case - 'Scanner'"
name = "glass case - 'Sword'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/implantcase/sword/New()
/obj/item/implantcase/sword/Initialize(mapload)
src.imp = new /obj/item/implant/organ/limbaugment/wrist/sword( src )
..()
return
return ..()
/obj/item/implantcase/sprinter
name = "glass case - 'Sprinter'"
desc = "A case containing a nanite fabricator implant."
icon_state = "implantcase-b"
/obj/item/implantcase/sprinter/New()
/obj/item/implantcase/sprinter/Initialize(mapload)
src.imp = new /obj/item/implant/organ/pelvic( src )
..()
return
return ..()

24
code/game/objects/items/weapons/tanks/tanks.dm
View File

@@ -573,29 +573,29 @@ var/list/global/tank_gauge_cache = list()
src.overlays += "bomb_assembly"
/obj/item/tank/phoron/onetankbomb/New()
..()
/obj/item/tank/phoron/onetankbomb/Initialize(mapload)
. = ..()
src.onetankbomb()
/obj/item/tank/oxygen/onetankbomb/New()
..()
/obj/item/tank/oxygen/onetankbomb/Initialize(mapload)
. = ..()
src.onetankbomb()
/obj/item/tank/phoron/onetankbomb/full/New()
..()
/obj/item/tank/phoron/onetankbomb/full/Initialize(mapload)
. = ..()
src.onetankbomb(2)
/obj/item/tank/oxygen/onetankbomb/full/New()
..()
/obj/item/tank/oxygen/onetankbomb/full/Initialize(mapload)
. = ..()
src.onetankbomb(2)
/obj/item/tank/phoron/onetankbomb/small/New()
..()
/obj/item/tank/phoron/onetankbomb/small/Initialize(mapload)
. = ..()
src.onetankbomb(0)
/obj/item/tank/oxygen/onetankbomb/small/New()
..()
/obj/item/tank/oxygen/onetankbomb/small/Initialize(mapload)
. = ..()
src.onetankbomb(0)
/////////////////////////////////

16
code/game/objects/structures/bonfire.dm
View File

@@ -13,8 +13,8 @@
var/set_temperature = T0C + 30 //K
var/heating_power = 80000
/obj/structure/bonfire/New(newloc, material_name)
..(newloc)
/obj/structure/bonfire/Initialize(mapload, material_name)
. = ..()
if(!material_name)
material_name = MAT_WOOD
material = get_material_by_name("[material_name]")
@@ -24,15 +24,15 @@
color = material.icon_colour
// Blue wood.
/obj/structure/bonfire/sifwood/New(newloc, material_name)
..(newloc, MAT_SIFWOOD)
/obj/structure/bonfire/sifwood/Initialize(mapload)
. = ..(mapload, MAT_SIFWOOD)
/obj/structure/bonfire/permanent/New(newloc, material_name)
..()
/obj/structure/bonfire/permanent/Initialize(mapload, material_name)
. = ..()
ignite()
/obj/structure/bonfire/permanent/sifwood/New(newloc, material_name)
..(newloc, MAT_SIFWOOD)
/obj/structure/bonfire/permanent/sifwood/Initialize(mapload)
. = ..(mapload, MAT_SIFWOOD)
/obj/structure/bonfire/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/stack/rods) && !can_buckle && !grill)

14
code/game/objects/structures/electricchair.dm
View File

@@ -6,10 +6,9 @@
var/obj/item/assembly/shock_kit/part = null
var/last_time = 1.0
/obj/structure/bed/chair/e_chair/New()
..()
overlays += image('icons/obj/objects.dmi', src, "echair_over", MOB_LAYER + 1, dir)
return
/obj/structure/bed/chair/e_chair/Initialize(mapload)
. = ..()
add_overlay(image('icons/obj/objects.dmi', src, "echair_over", MOB_LAYER + 1, dir))
/obj/structure/bed/chair/e_chair/attackby(obj/item/W as obj, mob/user as mob)
if(W.is_wrench())
@@ -38,10 +37,9 @@
return
/obj/structure/bed/chair/e_chair/rotate_clockwise()
..()
overlays.Cut()
overlays += image('icons/obj/objects.dmi', src, "echair_over", MOB_LAYER + 1, dir) //there's probably a better way of handling this, but eh. -Pete
return
. = ..()
cut_overlays()
add_overlay(image('icons/obj/objects.dmi', src, "echair_over", MOB_LAYER + 1, dir)) //there's probably a better way of handling this, but eh. -Pete
/obj/structure/bed/chair/e_chair/proc/shock()
if(!on)

68
code/game/objects/structures/flora.dm
View File

@@ -78,8 +78,8 @@
icon = 'icons/obj/flora/snowflora.dmi'
icon_state = "snowbush1"
/obj/structure/flora/bush/New()
..()
/obj/structure/flora/bush/Initialize(mapload)
. = ..()
icon_state = "snowbush[rand(1, 6)]"
/obj/structure/flora/pottedplant
@@ -97,113 +97,113 @@
icon = 'icons/obj/flora/ausflora.dmi'
icon_state = "firstbush_1"
/obj/structure/flora/ausbushes/New()
..()
/obj/structure/flora/ausbushes/Initialize(mapload)
. = ..()
icon_state = "firstbush_[rand(1, 4)]"
/obj/structure/flora/ausbushes/reedbush
icon_state = "reedbush_1"
/obj/structure/flora/ausbushes/reedbush/New()
..()
/obj/structure/flora/ausbushes/reedbush/Initialize(mapload)
. = ..()
icon_state = "reedbush_[rand(1, 4)]"
/obj/structure/flora/ausbushes/leafybush
icon_state = "leafybush_1"
/obj/structure/flora/ausbushes/leafybush/New()
..()
/obj/structure/flora/ausbushes/leafybush/Initialize(mapload)
. = ..()
icon_state = "leafybush_[rand(1, 3)]"
/obj/structure/flora/ausbushes/palebush
icon_state = "palebush_1"
/obj/structure/flora/ausbushes/palebush/New()
..()
/obj/structure/flora/ausbushes/palebush/Initialize(mapload)
. = ..()
icon_state = "palebush_[rand(1, 4)]"
/obj/structure/flora/ausbushes/stalkybush
icon_state = "stalkybush_1"
/obj/structure/flora/ausbushes/stalkybush/New()
..()
/obj/structure/flora/ausbushes/stalkybush/Initialize(mapload)
. = ..()
icon_state = "stalkybush_[rand(1, 3)]"
/obj/structure/flora/ausbushes/grassybush
icon_state = "grassybush_1"
/obj/structure/flora/ausbushes/grassybush/New()
..()
/obj/structure/flora/ausbushes/grassybush/Initialize(mapload)
. = ..()
icon_state = "grassybush_[rand(1, 4)]"
/obj/structure/flora/ausbushes/fernybush
icon_state = "fernybush_1"
/obj/structure/flora/ausbushes/fernybush/New()
..()
/obj/structure/flora/ausbushes/fernybush/Initialize(mapload)
. = ..()
icon_state = "fernybush_[rand(1, 3)]"
/obj/structure/flora/ausbushes/sunnybush
icon_state = "sunnybush_1"
/obj/structure/flora/ausbushes/sunnybush/New()
..()
/obj/structure/flora/ausbushes/sunnybush/Initialize(mapload)
. = ..()
icon_state = "sunnybush_[rand(1, 3)]"
/obj/structure/flora/ausbushes/genericbush
icon_state = "genericbush_1"
/obj/structure/flora/ausbushes/genericbush/New()
..()
/obj/structure/flora/ausbushes/genericbush/Initialize(mapload)
. = ..()
icon_state = "genericbush_[rand(1, 4)]"
/obj/structure/flora/ausbushes/pointybush
icon_state = "pointybush_1"
/obj/structure/flora/ausbushes/pointybush/New()
..()
/obj/structure/flora/ausbushes/pointybush/Initialize(mapload)
. = ..()
icon_state = "pointybush_[rand(1, 4)]"
/obj/structure/flora/ausbushes/lavendergrass
icon_state = "lavendergrass_1"
/obj/structure/flora/ausbushes/lavendergrass/New()
..()
/obj/structure/flora/ausbushes/lavendergrass/Initialize(mapload)
. = ..()
icon_state = "lavendergrass_[rand(1, 4)]"
/obj/structure/flora/ausbushes/ywflowers
icon_state = "ywflowers_1"
/obj/structure/flora/ausbushes/ywflowers/New()
..()
/obj/structure/flora/ausbushes/ywflowers/Initialize(mapload)
. = ..()
icon_state = "ywflowers_[rand(1, 3)]"
/obj/structure/flora/ausbushes/brflowers
icon_state = "brflowers_1"
/obj/structure/flora/ausbushes/brflowers/New()
..()
/obj/structure/flora/ausbushes/brflowers/Initialize(mapload)
. = ..()
icon_state = "brflowers_[rand(1, 3)]"
/obj/structure/flora/ausbushes/ppflowers
icon_state = "ppflowers_1"
/obj/structure/flora/ausbushes/ppflowers/New()
..()
/obj/structure/flora/ausbushes/ppflowers/Initialize(mapload)
. = ..()
icon_state = "ppflowers_[rand(1, 3)]"
/obj/structure/flora/ausbushes/sparsegrass
icon_state = "sparsegrass_1"
/obj/structure/flora/ausbushes/sparsegrass/New()
..()
/obj/structure/flora/ausbushes/sparsegrass/Initialize(mapload)
. = ..()
icon_state = "sparsegrass_[rand(1, 3)]"
/obj/structure/flora/ausbushes/fullgrass
icon_state = "fullgrass_1"
/obj/structure/flora/ausbushes/fullgrass/New()
..()
/obj/structure/flora/ausbushes/fullgrass/Initialize(mapload)
. = ..()
icon_state = "fullgrass_[rand(1, 3)]"
/obj/structure/flora/skeleton

4
code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm
View File

@@ -77,7 +77,7 @@
var/list/shadekin_abilities
/mob/living/simple_mob/shadekin/Initialize(mapload)
/mob/living/simple_mob/shadekin/Initialize()
//You spawned the prototype, and want a totally random one.
if(type == /mob/living/simple_mob/shadekin)
@@ -123,7 +123,7 @@
var/list/ability_types = subtypesof(/obj/effect/shadekin_ability)
shadekin_abilities = list()
for(var/type in ability_types)
shadekin_abilities += new type(src)
shadekin_abilities += new type(null, src)
update_icon()

6
code/modules/nifsoft/software/13_soulcatcher.dm
View File

@@ -438,9 +438,9 @@
icon_state = "beacon"
var/mob/living/carbon/human/parent_human
/mob/observer/eye/ar_soul/New(var/mob/brainmob, var/mob/living/carbon/human/human)
/mob/observer/eye/ar_soul/Initialize(mapload, mob/brainmob, mob/living/carbon/human/human)
ASSERT(brainmob && brainmob.client)
..()
. = ..()
owner = brainmob //Set eyeobj's owner
parent_human = human //E-z reference to human
@@ -579,7 +579,7 @@
if(!client || !client.prefs)
return //Um...
eyeobj = new/mob/observer/eye/ar_soul(src,nif.human)
eyeobj = new/mob/observer/eye/ar_soul(src, src, nif.human)
soulcatcher.notify_into("[src] now AR projecting.")
/mob/living/carbon/brain/caught_soul/verb/jump_to_owner()

36
code/modules/recycling/disposal.dm
View File

@@ -29,18 +29,21 @@
// create a new disposal
// find the attached trunk (if present) and init gas resvr.
/obj/machinery/disposal/New()
..()
spawn(5)
trunk = locate() in src.loc
if(!trunk)
mode = 0
flush = 0
else
trunk.linked = src // link the pipe trunk to self
/obj/machinery/disposal/Initialize(mapload, newdir)
. = ..()
return INITIALIZE_HINT_LATELOAD
air_contents = new/datum/gas_mixture(PRESSURE_TANK_VOLUME)
update()
/obj/machinery/disposal/LateInitialize()
. = ..()
trunk = locate() in src.loc
if(!trunk)
mode = 0
flush = 0
else
trunk.linked = src // link the pipe trunk to self
air_contents = new/datum/gas_mixture(PRESSURE_TANK_VOLUME)
update()
/obj/machinery/disposal/Destroy()
eject()
@@ -1308,14 +1311,15 @@
icon_state = "pipe-t"
var/obj/linked // the linked obj/machinery/disposal or obj/disposaloutlet
/obj/structure/disposalpipe/trunk/New()
..()
/obj/structure/disposalpipe/trunk/Initialize(mapload)
. = ..()
dpdir = dir
spawn(1)
getlinked()
return INITIALIZE_HINT_LATELOAD
/obj/structure/disposalpipe/trunk/LateInitialize()
. = ..()
getlinked()
update()
return
/obj/structure/disposalpipe/trunk/proc/getlinked()
linked = null

6
code/modules/research/research.dm
View File

@@ -229,7 +229,8 @@ research holder datum.
matter = list(DEFAULT_WALL_MATERIAL = 30, "glass" = 10)
var/datum/tech/stored
/obj/item/disk/tech_disk/New()
/obj/item/disk/tech_disk/Initialize(mapload)
. = ..()
pixel_x = rand(-5.0, 5)
pixel_y = rand(-5.0, 5)
@@ -243,6 +244,7 @@ research holder datum.
matter = list(DEFAULT_WALL_MATERIAL = 30, "glass" = 10)
var/datum/design/blueprint
/obj/item/disk/design_disk/New()
/obj/item/disk/design_disk/Initialize(mapload)
. = ..()
pixel_x = rand(-5.0, 5)
pixel_y = rand(-5.0, 5)

4
code/modules/research/server.dm
View File

@@ -15,8 +15,8 @@
req_access = list(access_rd) //Only the R&D can change server settings.
circuit = /obj/item/circuitboard/rdserver
/obj/machinery/r_n_d/server/New()
..()
/obj/machinery/r_n_d/server/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/stock_parts/scanning_module(src)
component_parts += new /obj/item/stack/cable_coil(src)

4
code/modules/resleeving/implant.dm
View File

@@ -52,8 +52,8 @@
var/list/obj/item/implant/backup/imps = list()
var/max_implants = 4 //Iconstates need to exist due to the update proc!
/obj/item/backup_implanter/New()
..()
/obj/item/backup_implanter/Initialize(mapload)
. = ..()
for(var/i = 1 to max_implants)
var/obj/item/implant/backup/imp = new(src)
imps |= imp

95
code/modules/tables/presets.dm
View File

@@ -3,118 +3,118 @@
icon_state = "plain_preview"
color = "#EEEEEE"
/obj/structure/table/standard/New()
/obj/structure/table/standard/Initialize(mapload)
material = get_material_by_name(DEFAULT_TABLE_MATERIAL)
..()
return ..()
/obj/structure/table/steel
icon_state = "plain_preview"
color = "#666666"
/obj/structure/table/steel/New()
/obj/structure/table/steel/Initialize(mapload)
material = get_material_by_name(DEFAULT_WALL_MATERIAL)
..()
return ..()
/obj/structure/table/marble
icon_state = "stone_preview"
color = "#CCCCCC"
/obj/structure/table/marble/New()
/obj/structure/table/marble/Initialize(mapload)
material = get_material_by_name("marble")
..()
return ..()
/obj/structure/table/reinforced
icon_state = "reinf_preview"
color = "#EEEEEE"
/obj/structure/table/reinforced/New()
/obj/structure/table/reinforced/Initialize(mapload)
material = get_material_by_name(DEFAULT_TABLE_MATERIAL)
reinforced = get_material_by_name(DEFAULT_WALL_MATERIAL)
..()
return ..()
/obj/structure/table/steel_reinforced
icon_state = "reinf_preview"
color = "#666666"
/obj/structure/table/steel_reinforced/New()
/obj/structure/table/steel_reinforced/Initialize(mapload)
material = get_material_by_name(DEFAULT_WALL_MATERIAL)
reinforced = get_material_by_name(DEFAULT_WALL_MATERIAL)
..()
return ..()
/obj/structure/table/wooden_reinforced
icon_state = "reinf_preview"
color = "#824B28"
/obj/structure/table/wooden_reinforced/New()
/obj/structure/table/wooden_reinforced/Initialize(mapload)
material = get_material_by_name("wood")
reinforced = get_material_by_name(DEFAULT_WALL_MATERIAL)
..()
return ..()
/obj/structure/table/woodentable
icon_state = "plain_preview"
color = "#824B28"
/obj/structure/table/woodentable/New()
/obj/structure/table/woodentable/Initialize(mapload)
material = get_material_by_name("wood")
..()
return ..()
/obj/structure/table/sifwoodentable
icon_state = "plain_preview"
color = "#824B28"
/obj/structure/table/sifwoodentable/New()
/obj/structure/table/sifwoodentable/Initialize(mapload)
material = get_material_by_name("alien wood")
..()
return ..()
/obj/structure/table/sifwooden_reinforced
icon_state = "reinf_preview"
color = "#824B28"
/obj/structure/table/sifwooden_reinforced/New()
/obj/structure/table/sifwooden_reinforced/Initialize(mapload)
material = get_material_by_name("alien wood")
reinforced = get_material_by_name(DEFAULT_WALL_MATERIAL)
..()
return ..()
/obj/structure/table/gamblingtable
icon_state = "gamble_preview"
/obj/structure/table/gamblingtable/New()
/obj/structure/table/gamblingtable/Initialize(mapload)
material = get_material_by_name("wood")
carpeted = 1
..()
return ..()
/obj/structure/table/glass
icon_state = "plain_preview"
color = "#00E1FF"
alpha = 77 // 0.3 * 255
/obj/structure/table/glass/New()
/obj/structure/table/glass/Initialize(mapload)
material = get_material_by_name("glass")
..()
return ..()
/obj/structure/table/borosilicate
icon_state = "plain_preview"
color = "#4D3EAC"
alpha = 77
/obj/structure/table/borosilicate/New()
/obj/structure/table/borosilicate/Initialize(mapload)
material = get_material_by_name("borosilicate glass")
..()
return ..()
/obj/structure/table/holotable
icon_state = "holo_preview"
color = "#EEEEEE"
/obj/structure/table/holotable/New()
/obj/structure/table/holotable/Initialize(mapload)
material = get_material_by_name("holo[DEFAULT_TABLE_MATERIAL]")
..()
return ..()
/obj/structure/table/woodentable/holotable
icon_state = "holo_preview"
/obj/structure/table/woodentable/holotable/New()
/obj/structure/table/woodentable/holotable/Initialize(mapload)
material = get_material_by_name("holowood")
..()
return ..()
/obj/structure/table/alien
name = "alien table"
@@ -123,11 +123,11 @@
can_reinforce = FALSE
can_plate = FALSE
/obj/structure/table/alien/New()
/obj/structure/table/alien/Initialize(mapload)
material = get_material_by_name("alium")
verbs -= /obj/structure/table/verb/do_flip
verbs -= /obj/structure/table/proc/do_put
..()
return ..()
/obj/structure/table/alien/dismantle(obj/item/tool/wrench/W, mob/user)
to_chat(user, "<span class='warning'>You cannot dismantle \the [src].</span>")
@@ -138,26 +138,27 @@
icon_state = "plain_preview"
color = "#EEEEEE"
/obj/structure/table/bench/standard/New()
/obj/structure/table/bench/standard/Initialize(mapload)
material = get_material_by_name(DEFAULT_TABLE_MATERIAL)
..()
return ..()
/obj/structure/table/bench/steel
icon_state = "plain_preview"
color = "#666666"
/obj/structure/table/bench/steel/New()
/obj/structure/table/bench/steel/Initialize(mapload)
. = ..()
material = get_material_by_name(DEFAULT_WALL_MATERIAL)
..()
return ..()
/obj/structure/table/bench/marble
icon_state = "stone_preview"
color = "#CCCCCC"
/obj/structure/table/bench/marble/New()
/obj/structure/table/bench/marble/Initialize(mapload)
material = get_material_by_name("marble")
..()
return ..()
/*
/obj/structure/table/bench/reinforced
icon_state = "reinf_preview"
@@ -190,17 +191,17 @@
icon_state = "plain_preview"
color = "#824B28"
/obj/structure/table/bench/wooden/New()
/obj/structure/table/bench/wooden/Initialize(mapload)
material = get_material_by_name("wood")
..()
return ..()
/obj/structure/table/bench/sifwooden
icon_state = "plain_preview"
color = "#824B28"
/obj/structure/table/bench/sifwooden/New()
/obj/structure/table/bench/sifwooden/Initialize(mapload)
material = get_material_by_name("alien wood")
..()
return ..()
/obj/structure/table/bench/sifwooden/padded
icon_state = "padded_preview"
@@ -209,19 +210,19 @@
/obj/structure/table/bench/padded
icon_state = "padded_preview"
/obj/structure/table/bench/padded/New()
/obj/structure/table/bench/padded/Initialize(mapload)
material = get_material_by_name(DEFAULT_WALL_MATERIAL)
carpeted = 1
..()
return ..()
/obj/structure/table/bench/glass
icon_state = "plain_preview"
color = "#00E1FF"
alpha = 77 // 0.3 * 255
/obj/structure/table/bench/glass/New()
/obj/structure/table/bench/glass/Initialize(mapload)
material = get_material_by_name("glass")
..()
return ..()
/*
/obj/structure/table/bench/holotable
@@ -262,6 +263,6 @@
connections = list("nw0", "ne0", "sw0", "se0")
/obj/structure/table/sandbags/New()
/obj/structure/table/sandbags/Initialize(mapload)
material = get_material_by_name("sandbag")
..()
return ..()

4
code/modules/xenobio2/machinery/injector.dm
View File

@@ -19,8 +19,8 @@
circuit = /obj/item/circuitboard/xenobioinjectormachine
/obj/machinery/xenobio2/manualinjector/New()
..()
/obj/machinery/xenobio2/manualinjector/Initialize(mapload)
. = ..()
var/datum/reagents/R = new/datum/reagents(1000)
reagents = R
R.my_atom = src

12
maps/tether/submaps/beach/_beach.dm
View File

@@ -106,15 +106,15 @@
// These are step-teleporters, for map edge transitions
// This top one goes INTO the cave
/obj/effect/step_trigger/teleporter/away_beach_tocave/New()
..()
/obj/effect/step_trigger/teleporter/away_beach_tocave/Initialize(mapload)
. = ..()
teleport_x = src.x // X is horizontal. This is a top of map transition, so you want the same horizontal alignment in the cave as you have on the beach
teleport_y = 2 // 2 is because it's putting you on row 2 of the map to the north
teleport_z = z+1 // The cave is always our Z-level plus 1, because it's loaded after us
// This one goes OUT OF the cave
/obj/effect/step_trigger/teleporter/away_beach_tobeach/New()
..()
/obj/effect/step_trigger/teleporter/away_beach_tobeach/Initialize(mapload)
. = ..()
teleport_x = src.x // Same reason as bove
teleport_y = world.maxy - 1 // This means "1 space from the top of the map"
teleport_z = z-1 // Opposite of 'tocave', beach is always loaded as the map before us
@@ -126,8 +126,8 @@
name = "Water"
icon_state = "water"
/turf/simulated/floor/beach/coastwater/New()
..()
/turf/simulated/floor/beach/coastwater/Initialize(mapload)
. = ..()
add_overlay(image("icon"='icons/misc/beach.dmi',"icon_state"="water","layer"=MOB_LAYER+0.1))
// -- Areas -- //

2
maps/tether/tether_things.dm
View File

@@ -261,7 +261,7 @@ var/global/list/latejoin_tram = list()
/obj/effect/landmark/tram/New()
latejoin_tram += loc // Register this turf as tram latejoin.
latejoin += loc // Also register this turf as fallback latejoin, since we won't have any arrivals shuttle landmarks.
..()
return ..()
/datum/spawnpoint/tram
display_name = "Tram Station"

5
modular_citadel/code/modules/shadekin/ability_objects.dm
View File

@@ -8,10 +8,9 @@
var/shift_mode = NOT_WHILE_SHIFTED
var/ab_sound
/obj/effect/shadekin_ability/New(var/new_kin)
..()
/obj/effect/shadekin_ability/Initialize(mapload, mob/living/simple_animal/shadekin/new_kin)
. = ..()
my_kin = new_kin
loc = null
/obj/effect/shadekin_ability/Destroy()
my_kin = null