diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index f488651af14..cae0e6a34e4 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -434,10 +434,7 @@ icon_gib = null meat_amount = 0 meat_type = null - -/mob/living/simple_animal/hostile/carp/holodeck/New() - ..() - set_light(2) //hologram lighting + light_range = 2 /mob/living/simple_animal/hostile/carp/holodeck/proc/set_safety(var/safe) if (safe) diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm index 5c9a0142f49..ec482872e59 100644 --- a/code/modules/mining/minebot.dm +++ b/code/modules/mining/minebot.dm @@ -15,9 +15,8 @@ var/melee_upgrade var/drill_upgrade -/mob/living/silicon/robot/drone/mining/New() - - ..() +/mob/living/silicon/robot/drone/mining/Initialize() + . = ..() verbs += /mob/living/proc/hide remove_language("Robot Talk") @@ -238,4 +237,4 @@ M.drill_upgrade = 1 if(!M.jetpack) M.jetpack = new /obj/item/weapon/tank/jetpack/carbondioxide/synthetic(src) - qdel(src) \ No newline at end of file + qdel(src) diff --git a/code/modules/mob/freelook/ai/eye.dm b/code/modules/mob/freelook/ai/eye.dm index 90c6b2dd455..378a5f2bf8d 100644 --- a/code/modules/mob/freelook/ai/eye.dm +++ b/code/modules/mob/freelook/ai/eye.dm @@ -49,12 +49,14 @@ SetName(src.name) // Intiliaze the eye by assigning it's "ai" variable to us. Then set it's loc to us. -/mob/living/silicon/ai/New() - ..() +/mob/living/silicon/ai/Initialize() + . = ..() create_eyeobj() - spawn(5) - if(eyeobj) - eyeobj.forceMove(src.loc) + addtimer(CALLBACK(src, .proc/init_move_eyeobj), 5) + +/mob/living/silicon/ai/proc/init_move_eyeobj() + if (eyeobj) + eyeobj.forceMove(loc) /mob/living/silicon/ai/Destroy() destroy_eyeobj() diff --git a/code/modules/mob/living/bot/bot.dm b/code/modules/mob/living/bot/bot.dm index df3213d2013..398e014da57 100644 --- a/code/modules/mob/living/bot/bot.dm +++ b/code/modules/mob/living/bot/bot.dm @@ -19,8 +19,8 @@ var/list/req_one_access = list() var/master_access = access_robotics -/mob/living/bot/New() - ..() +/mob/living/bot/Initialize() + . = ..() update_icons() botcard = new /obj/item/weapon/card/id(src) diff --git a/code/modules/mob/living/bot/cleanbot.dm b/code/modules/mob/living/bot/cleanbot.dm index ff15054a394..423def2c956 100644 --- a/code/modules/mob/living/bot/cleanbot.dm +++ b/code/modules/mob/living/bot/cleanbot.dm @@ -45,8 +45,8 @@ var/list/cleanbot_types // Going to use this to generate a list of types once th if(istype(crossed,/mob/living/bot/cleanbot)) return 0 return ..() -/mob/living/bot/cleanbot/New() - ..() +/mob/living/bot/cleanbot/Initialize() + . = ..() get_targets() listener = new /obj/cleanbot_listener(src) @@ -54,8 +54,7 @@ var/list/cleanbot_types // Going to use this to generate a list of types once th janitorial_supplies |= src - if(SSradio) - SSradio.add_object(listener, beacon_freq, filter = RADIO_NAVBEACONS) + SSradio.add_object(listener, beacon_freq, filter = RADIO_NAVBEACONS) /mob/living/bot/cleanbot/Destroy() . = ..() diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index 3de8e1b6fca..c69bdae06f5 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -17,7 +17,8 @@ var/language var/death_msg = "lets out a waning guttural screech, green blood bubbling from its maw." -/mob/living/carbon/alien/New() +/mob/living/carbon/alien/Initialize() + . = ..() time_of_birth = world.time @@ -33,8 +34,6 @@ gender = NEUTER - ..() - /mob/living/carbon/alien/u_equip(obj/item/W as obj) return @@ -49,4 +48,4 @@ return //Consider adding cuffs and hats to this, for the sake of fun. /mob/living/carbon/alien/cannot_use_vents() - return \ No newline at end of file + return diff --git a/code/modules/mob/living/carbon/alien/diona/diona_nymph.dm b/code/modules/mob/living/carbon/alien/diona/diona_nymph.dm index 356765fc84a..b73bf3675cc 100644 --- a/code/modules/mob/living/carbon/alien/diona/diona_nymph.dm +++ b/code/modules/mob/living/carbon/alien/diona/diona_nymph.dm @@ -49,8 +49,8 @@ else ..() -/mob/living/carbon/alien/diona/New() - ..() +/mob/living/carbon/alien/diona/Initialize() + . = ..() //species = all_species[] set_species("Diona") setup_dionastats() @@ -313,4 +313,4 @@ return hat = new_hat new_hat.forceMove(src) - update_icons() \ No newline at end of file + update_icons() diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm index c67249dfe5b..c1eedb15285 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -8,8 +8,8 @@ maxHealth = 25 health = 25 -/mob/living/carbon/alien/larva/New() - ..() +/mob/living/carbon/alien/larva/Initialize() + . = ..() add_language("Xenomorph") //Bonus language. internal_organs |= new /obj/item/organ/xenos/hivenode(src) - create_reagents(100) \ No newline at end of file + create_reagents(100) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 8285ec1c395..d61e0ce9497 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -1,11 +1,11 @@ -/mob/living/carbon/New() +/mob/living/carbon/Initialize() //setup reagent holders bloodstr = new/datum/reagents/metabolism(1000, src, CHEM_BLOOD) ingested = new/datum/reagents/metabolism(1000, src, CHEM_INGEST) touching = new/datum/reagents/metabolism(1000, src, CHEM_TOUCH) reagents = bloodstr - ..() + . = ..() /mob/living/carbon/Life() ..() diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 48ab5f71fa9..4652e1772d8 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -10,7 +10,7 @@ var/obj/item/weapon/rig/wearing_rig // This is very not good, but it's much much better than calling get_rig() every update_canmove() call. mob_size = 9//Based on average weight of a human -/mob/living/carbon/human/New(var/new_loc, var/new_species = null) +/mob/living/carbon/human/Initialize(mapload, var/new_species = null) eat_types |= TYPE_ORGANIC//Any mobs that are given the devour verb, can eat nonhumanoid organics. Only applies to unathi for now if(!dna) @@ -66,7 +66,8 @@ human_mob_list |= src - ..() + + . = ..() if(dna) dna.ready_dna(src) diff --git a/code/modules/mob/living/carbon/human/human_species.dm b/code/modules/mob/living/carbon/human/human_species.dm index 66bbc924cf7..7565352b9fc 100644 --- a/code/modules/mob/living/carbon/human/human_species.dm +++ b/code/modules/mob/living/carbon/human/human_species.dm @@ -2,92 +2,92 @@ real_name = "Test Dummy" status_flags = GODMODE|CANPUSH -/mob/living/carbon/human/resomi/New(var/new_loc) +/mob/living/carbon/human/resomi/Initialize(mapload) h_style = "Resomi Plumage" - ..(new_loc, "Resomi") + . = ..(mapload, "Resomi") -/mob/living/carbon/human/skrell/New(var/new_loc) +/mob/living/carbon/human/skrell/Initialize(mapload) h_style = "Skrell Male Tentacles" - ..(new_loc, "Skrell") + . = ..(mapload, "Skrell") -/mob/living/carbon/human/tajaran/New(var/new_loc) +/mob/living/carbon/human/tajaran/Initialize(mapload) h_style = "Tajaran Ears" - ..(new_loc, "Tajara") + . = ..(mapload, "Tajara") -/mob/living/carbon/human/unathi/New(var/new_loc) +/mob/living/carbon/human/unathi/Initialize(mapload) h_style = "Unathi Horns" - ..(new_loc, "Unathi") + . = ..(mapload, "Unathi") -/mob/living/carbon/human/vox/New(var/new_loc) +/mob/living/carbon/human/vox/Initialize(mapload) h_style = "Short Vox Quills" - ..(new_loc, "Vox") + . = ..(mapload, "Vox") -/mob/living/carbon/human/voxarmalis/New(var/new_loc) +/mob/living/carbon/human/voxarmalis/Initialize(mapload) h_style = "Bald" - ..(new_loc, "Vox Armalis") + . = ..(mapload, "Vox Armalis") -/mob/living/carbon/human/diona/New(var/new_loc) - ..(new_loc, "Diona") +/mob/living/carbon/human/diona/Initialize(mapload) + . = ..(mapload, "Diona") src.gender = NEUTER -/mob/living/carbon/human/machine/New(var/new_loc) +/mob/living/carbon/human/machine/Initialize(mapload) h_style = "blue IPC screen" - ..(new_loc, "Baseline Frame") + . = ..(mapload, "Baseline Frame") /mob/living/carbon/human/monkey mob_size = 2.6//Based on howler monkey, rough real world equivilant to on-mob sprite size -/mob/living/carbon/human/monkey/New(var/new_loc) - ..(new_loc, "Monkey") +/mob/living/carbon/human/monkey/Initialize(mapload) + . = ..(mapload, "Monkey") /mob/living/carbon/human/farwa mob_size = 2.6//Roughly the same size as monkey -/mob/living/carbon/human/farwa/New(var/new_loc) - ..(new_loc, "Farwa") +/mob/living/carbon/human/farwa/Initialize(mapload) + . = ..(mapload, "Farwa") /mob/living/carbon/human/neaera mob_size = 2.6//Roughly the same size as monkey -/mob/living/carbon/human/neaera/New(var/new_loc) - ..(new_loc, "Neaera") +/mob/living/carbon/human/neaera/Initialize(mapload) + . = ..(mapload, "Neaera") /mob/living/carbon/human/stok mob_size = 2.6//Roughly the same size as monkey -/mob/living/carbon/human/stok/New(var/new_loc) - ..(new_loc, "Stok") +/mob/living/carbon/human/stok/Initialize(mapload) + . = ..(mapload, "Stok") /mob/living/carbon/human/bug mob_size = 2.6//Roughly the same size as monkey -/mob/living/carbon/human/bug/New(var/new_loc) - ..(new_loc, "V'krexi") +/mob/living/carbon/human/bug/Initialize(mapload) + . = ..(mapload, "V'krexi") src.gender = FEMALE -/mob/living/carbon/human/type_a/New(var/new_loc) - ..(new_loc, "Vaurca Worker") +/mob/living/carbon/human/type_a/Initialize(mapload) + . = ..(mapload, "Vaurca Worker") src.gender = NEUTER -/mob/living/carbon/human/type_b/New(var/new_loc) - ..(new_loc, "Vaurca Warrior") +/mob/living/carbon/human/type_b/Initialize(mapload) + . = ..(mapload, "Vaurca Warrior") src.gender = NEUTER -/mob/living/carbon/human/type_c/New(var/new_loc) - ..(new_loc, "Vaurca Breeder") +/mob/living/carbon/human/type_c/Initialize(mapload) + . = ..(mapload, "Vaurca Breeder") src.gender = FEMALE /mob/living/carbon/human/type_c layer = 5 -/mob/living/carbon/human/industrial/New(var/new_loc) - ..(new_loc, "Industrial Frame") +/mob/living/carbon/human/industrial/Initialize(mapload) + ..(mapload, "Industrial Frame") -/mob/living/carbon/human/shell/New(var/new_loc) - ..(new_loc, "Shell Frame") +/mob/living/carbon/human/shell/Initialize(mapload) + ..(mapload, "Shell Frame") -/mob/living/carbon/human/terminator/New(var/new_loc) - ..(new_loc, "Hunter-Killer") +/mob/living/carbon/human/terminator/Initialize(mapload) + . = ..(mapload, "Hunter-Killer") add_language(LANGUAGE_SOL_COMMON, 1) add_language(LANGUAGE_UNATHI, 1) add_language(LANGUAGE_SIIK_MAAS, 1) diff --git a/code/modules/mob/living/carbon/human/npcs.dm b/code/modules/mob/living/carbon/human/npcs.dm index d7f43579738..7b549a01e3f 100644 --- a/code/modules/mob/living/carbon/human/npcs.dm +++ b/code/modules/mob/living/carbon/human/npcs.dm @@ -5,12 +5,14 @@ worn_state = "punpun" species_restricted = list("Monkey") -/mob/living/carbon/human/monkey/punpun/New() +/mob/living/carbon/human/monkey/punpun/Initialize() ..() - spawn(1) - name = "Pun Pun" - real_name = name - w_uniform = new /obj/item/clothing/under/punpun(src) + return INITIALIZE_HINT_LATELOAD + +/mob/living/carbon/human/monkey/punpun/LateInitialize() + name = "Pun Pun" + real_name = name + w_uniform = new /obj/item/clothing/under/punpun(src) /obj/item/clothing/under/nupnup name = "christmas uniform" @@ -19,9 +21,11 @@ worn_state = "nupnup" species_restricted = list("Monkey") -/mob/living/carbon/human/monkey/nupnup/New() +/mob/living/carbon/human/monkey/nupnup/Initialize() ..() - spawn(1) - name = "Winston, the Christmas Monkey" - real_name = name - w_uniform = new /obj/item/clothing/under/nupnup(src) + return INITIALIZE_HINT_LATELOAD + +/mob/living/carbon/human/monkey/nupnup/LateInitialize() + name = "Winston, the Christmas Monkey" + real_name = name + w_uniform = new /obj/item/clothing/under/nupnup(src) diff --git a/code/modules/mob/living/carbon/human/species/outsider/skeleton.dm b/code/modules/mob/living/carbon/human/species/outsider/skeleton.dm index e1f41a01cf7..e9a8b8f55ff 100644 --- a/code/modules/mob/living/carbon/human/species/outsider/skeleton.dm +++ b/code/modules/mob/living/carbon/human/species/outsider/skeleton.dm @@ -1,5 +1,5 @@ -/mob/living/carbon/human/skeleton/New(var/new_loc) - ..(new_loc, "Skeleton") +/mob/living/carbon/human/skeleton/Initialize(mapload) + . = ..(mapload, "Skeleton") /datum/species/skeleton //SPOOKY name = "Skeleton" diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/xenomorphs.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/xenomorphs.dm index 504577c7d33..8a3db7bf948 100644 --- a/code/modules/mob/living/carbon/human/species/xenomorphs/xenomorphs.dm +++ b/code/modules/mob/living/carbon/human/species/xenomorphs/xenomorphs.dm @@ -7,18 +7,18 @@ proc/create_new_xenomorph(var/alien_caste,var/target) new_alien.set_species("Xenomorph [alien_caste]") return new_alien -/mob/living/carbon/human/xdrone/New(var/new_loc) +/mob/living/carbon/human/xdrone/Initialize(mapload) h_style = "Bald" - ..(new_loc, "Xenomorph Drone") + . = ..(mapload, "Xenomorph Drone") -/mob/living/carbon/human/xsentinel/New(var/new_loc) +/mob/living/carbon/human/xsentinel/Initialize(mapload) h_style = "Bald" - ..(new_loc, "Xenomorph Sentinel") + . = ..(mapload, "Xenomorph Sentinel") -/mob/living/carbon/human/xhunter/New(var/new_loc) +/mob/living/carbon/human/xhunter/Initialize(mapload) h_style = "Bald" - ..(new_loc, "Xenomorph Hunter") + . = ..(mapload, "Xenomorph Hunter") -/mob/living/carbon/human/xqueen/New(var/new_loc) +/mob/living/carbon/human/xqueen/Initialize(mapload) h_style = "Bald" - ..(new_loc, "Xenomorph Queen") + . = ..(mapload, "Xenomorph Queen") diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm index 606b7666a5c..48ae4440097 100644 --- a/code/modules/mob/living/carbon/metroid/metroid.dm +++ b/code/modules/mob/living/carbon/metroid/metroid.dm @@ -60,21 +60,22 @@ var/core_removal_stage = 0 //For removing cores. -/mob/living/carbon/slime/New(var/location, var/colour="grey") +/mob/living/carbon/slime/Initialize(mapload, colour = "grey") + . = ..() verbs += /mob/living/proc/ventcrawl src.colour = colour number = rand(1, 1000) name = "[colour] [is_adult ? "adult" : "baby"] slime ([number])" - if (is_adult)mob_size = 6 + if (is_adult) + mob_size = 6 real_name = name slime_mutation = mutation_table(colour) mutation_chance = rand(25, 35) var/sanitizedcolour = replacetext(colour, " ", "") coretype = text2path("/obj/item/slime_extract/[sanitizedcolour]") regenerate_icons() - ..(location) /mob/living/carbon/slime/movement_delay() if (bodytemperature >= 330.23) // 135 F diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 539a7e4c116..a4c1ecbf0e4 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -99,7 +99,7 @@ var/list/ai_verbs_default = list( src.verbs -= ai_verbs_default src.verbs -= silicon_subsystems -/mob/living/silicon/ai/New(loc, var/datum/ai_laws/L, var/obj/item/device/mmi/B, var/safety = 0) +/mob/living/silicon/ai/Initialize(mapload, datum/ai_laws/L, obj/item/device/mmi/B, safety = 0) shouldnt_see = typecacheof(/obj/effect/rune) announcement = new() announcement.title = "A.I. Announcement" @@ -183,7 +183,7 @@ var/list/ai_verbs_default = list( hud_list[SPECIALROLE_HUD] = image('icons/mob/hud.dmi', src, "hudblank") ai_list += src - ..() + return ..() /mob/living/silicon/ai/proc/init_powersupply() new /obj/machinery/ai_powersupply(src) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 3dc31668394..5a3cdb8c4ec 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -111,18 +111,16 @@ M.do_attack_animation(src) updatehealth() -/mob/living/silicon/pai/New(var/obj/item/device/paicard/newlocation) - var/obj/item/device/paicard/paicard - if (istype(newlocation)) - paicard = newlocation - else +/mob/living/silicon/pai/Initialize(mapload) + var/obj/item/device/paicard/paicard = loc + if (!istype(paicard)) //If we get here, then we must have been created by adminspawning. //so lets assist with debugging by creating our own card and adding ourself to it - paicard = new/obj/item/device/paicard(newlocation) + paicard = new/obj/item/device/paicard(loc) paicard.pai = src canmove = 0 - src.loc = paicard + loc = paicard card = paicard sradio = new(src) if(card) @@ -142,12 +140,14 @@ pda = new(src) ID = new(src) ID.registered_name = "" - spawn(5) - pda.ownjob = "Personal Assistant" - pda.owner = text("[]", src) - pda.name = pda.owner + " (" + pda.ownjob + ")" - pda.toff = 1 - ..() + addtimer(CALLBACK(src, .proc/set_pda), 5) + . = ..() + +/mob/living/silicon/pai/proc/set_pda() + pda.ownjob = "Personal Assistant" + pda.owner = "[src]" + pda.name = "[pda.owner] ([pda.ownjob])" + pda.toff = TRUE /mob/living/silicon/pai/Login() greet() diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 136ff3c9116..4a021590db1 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -103,9 +103,8 @@ holder_type = /obj/item/weapon/holder/drone/heavy range_limit = 0 -/mob/living/silicon/robot/drone/New() - - ..() +/mob/living/silicon/robot/drone/Initialize() + . = ..() verbs += /mob/living/proc/hide remove_language("Robot Talk") diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index a4eba17eaa9..f7c4a80c70d 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -117,7 +117,7 @@ /mob/living/silicon/robot/proc/robot_checklaws ) -/mob/living/silicon/robot/New(loc,var/unfinished = 0) +/mob/living/silicon/robot/Initialize(mapload, unfinished = 0) spark_system = bind_spark(src, 5) add_language("Robot Talk", 1) @@ -158,7 +158,7 @@ if(!cell) cell = new cell_type(src) - ..() + . = ..() if(cell) var/datum/robot_component/cell_component = components["power cell"] diff --git a/code/modules/mob/living/silicon/robot/syndicate_robot.dm b/code/modules/mob/living/silicon/robot/syndicate_robot.dm index 6f835b1e28f..0c2a1252c15 100644 --- a/code/modules/mob/living/silicon/robot/syndicate_robot.dm +++ b/code/modules/mob/living/silicon/robot/syndicate_robot.dm @@ -23,8 +23,8 @@ if(!jetpack) jetpack = new /obj/item/weapon/tank/jetpack/carbondioxide/synthetic(src) -/mob/living/silicon/robot/syndicate/New() - ..() +/mob/living/silicon/robot/syndicate/Initialize() + . = ..() verbs += /mob/living/silicon/robot/proc/choose_icon /mob/living/silicon/robot/syndicate/updateicon() //because this was the only way I found out how to make their eyes and etc works diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 0d88f8d83b7..16901b62493 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -32,9 +32,9 @@ #define SEC_HUD 1 //Security HUD mode #define MED_HUD 2 //Medical HUD mode -/mob/living/silicon/New() +/mob/living/silicon/Initialize() silicon_mob_list |= src - ..() + . = ..() add_language("Ceti Basic") init_id() diff --git a/code/modules/mob/living/simple_animal/bees.dm b/code/modules/mob/living/simple_animal/bees.dm index 61d61a3a546..ee52a843cea 100644 --- a/code/modules/mob/living/simple_animal/bees.dm +++ b/code/modules/mob/living/simple_animal/bees.dm @@ -21,8 +21,8 @@ turns_per_move = 6 var/obj/machinery/portable_atmospherics/hydroponics/my_hydrotray -/mob/living/simple_animal/bee/New(loc, var/obj/machinery/beehive/new_parent) - ..() +/mob/living/simple_animal/bee/Initialize(mapload, var/obj/machinery/beehive/new_parent) + . = ..() parent = new_parent /mob/living/simple_animal/bee/Destroy() @@ -257,8 +257,8 @@ /mob/living/simple_animal/bee/standalone loner = 1 -/mob/living/simple_animal/bee/standalone/New(loc, var/obj/machinery/beehive/new_parent) - ..() +/mob/living/simple_animal/bee/standalone/Initialize(mapload, var/obj/machinery/beehive/new_parent) + . = ..() strength = rand(4,8) update_icons() diff --git a/code/modules/mob/living/simple_animal/borer/borer.dm b/code/modules/mob/living/simple_animal/borer/borer.dm index 90147865365..c560cfbc5fc 100644 --- a/code/modules/mob/living/simple_animal/borer/borer.dm +++ b/code/modules/mob/living/simple_animal/borer/borer.dm @@ -41,8 +41,8 @@ if(mind) borers.add_antagonist(mind) -/mob/living/simple_animal/borer/New() - ..() +/mob/living/simple_animal/borer/Initialize() + . = ..() add_language("Cortical Link") verbs += /mob/living/proc/ventcrawl diff --git a/code/modules/mob/living/simple_animal/constructs/constructs.dm b/code/modules/mob/living/simple_animal/constructs/constructs.dm index 60e05c41602..6f9dece14c5 100644 --- a/code/modules/mob/living/simple_animal/constructs/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs/constructs.dm @@ -40,8 +40,8 @@ /mob/living/simple_animal/construct/cultify() return -/mob/living/simple_animal/construct/New() - ..() +/mob/living/simple_animal/construct/Initialize() + . = ..() name = text("[initial(name)] ([rand(1, 1000)])") real_name = name add_language("Cult") diff --git a/code/modules/mob/living/simple_animal/familiars/familiars.dm b/code/modules/mob/living/simple_animal/familiars/familiars.dm index b5f2155bdd9..c837b77ae7d 100644 --- a/code/modules/mob/living/simple_animal/familiars/familiars.dm +++ b/code/modules/mob/living/simple_animal/familiars/familiars.dm @@ -19,8 +19,8 @@ var/list/wizardy_spells = list() -/mob/living/simple_animal/familiar/New() - ..() +/mob/living/simple_animal/familiar/Initialize() + . = ..() add_language(LANGUAGE_TCB) for(var/spell in wizardy_spells) src.add_spell(new spell, "const_spell_ready") @@ -198,8 +198,8 @@ supernatural = 1 -/mob/living/simple_animal/mouse/familiar/New() - ..() +/mob/living/simple_animal/mouse/familiar/Initialize() + . = ..() add_spell(new /spell/targeted/heal_target, "const_spell_ready") add_spell(new /spell/targeted/heal_target/area, "const_spell_ready") add_language(LANGUAGE_TCB) diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index fb0d166eef0..938d7470b35 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -285,6 +285,6 @@ .=..() desc = "Bones is dead" -/mob/living/simple_animal/cat/kitten/New() +/mob/living/simple_animal/cat/kitten/Initialize() + . = ..() gender = pick(MALE, FEMALE) - ..() diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index 3080683f301..67b18f18192 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -27,8 +27,8 @@ var/obj/item/inventory_head var/obj/item/inventory_back -/mob/living/simple_animal/corgi/New() - ..() +/mob/living/simple_animal/corgi/Initialize() + . = ..() nutrition = max_nutrition * 0.3 //Ian doesn't start with a full belly so will be hungry at roundstart nutrition_step = mob_size * 0.12 diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index 72d23298f31..d232e97337e 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -25,10 +25,10 @@ melee_damage_upper = 5 var/datum/reagents/udder = null -/mob/living/simple_animal/hostile/retaliate/goat/New() +/mob/living/simple_animal/hostile/retaliate/goat/Initialize() + . = ..() udder = new(50) udder.my_atom = src - ..() /mob/living/simple_animal/hostile/retaliate/goat/beg(var/atom/thing, var/atom/holder) visible_emote("butts insistently at [holder]'s legs and reaches towards their [thing].",0) @@ -113,10 +113,10 @@ var/datum/reagents/udder = null mob_size = 20//based on mass of holstein fresian dairy cattle, what the sprite is based on -/mob/living/simple_animal/cow/New() +/mob/living/simple_animal/cow/Initialize() + . = ..() udder = new(50) udder.my_atom = src - ..() /mob/living/simple_animal/cow/attackby(var/obj/item/O as obj, var/mob/user as mob) var/obj/item/weapon/reagent_containers/glass/G = O @@ -181,8 +181,8 @@ mob_size = 0.75//just a rough estimate, the real value should be way lower hunger_enabled = FALSE -/mob/living/simple_animal/chick/New() - ..() +/mob/living/simple_animal/chick/Initialize() + . = ..() pixel_x = rand(-6, 6) pixel_y = rand(0, 10) @@ -229,8 +229,8 @@ var/static/chicken_count = 0 -/mob/living/simple_animal/chicken/New() - ..() +/mob/living/simple_animal/chicken/Initialize() + . = ..() if(!body_color) body_color = pick( list("brown","black","white") ) icon_state = "chicken_[body_color]" diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm index 8c2bfab8e4a..89820d7733b 100644 --- a/code/modules/mob/living/simple_animal/friendly/lizard.dm +++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm @@ -22,9 +22,8 @@ var/decompose_time = 18000 -/mob/living/simple_animal/lizard/New() - ..() - +/mob/living/simple_animal/lizard/Initialize() + . = ..() nutrition = rand(max_nutrition*0.25, max_nutrition*0.75) /mob/living/simple_animal/lizard/Life() diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index b4c194a0142..1000ddcf388 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -286,12 +286,14 @@ //TOM IS ALIVE! SQUEEEEEEEE~K :) /mob/living/simple_animal/mouse/brown/Tom name = "Tom" + real_name = "Tom" desc = "Jerry the cat is not amused." -/mob/living/simple_animal/mouse/brown/Tom/New() - ..() +/mob/living/simple_animal/mouse/brown/Tom/Initialize() + . = ..() // Change my name back, don't want to be named Tom (666) name = initial(name) + real_name = name /mob/living/simple_animal/mouse/cannot_use_vents() return diff --git a/code/modules/mob/living/simple_animal/friendly/mushroom.dm b/code/modules/mob/living/simple_animal/friendly/mushroom.dm index c00a4b65626..3a9112dd386 100644 --- a/code/modules/mob/living/simple_animal/friendly/mushroom.dm +++ b/code/modules/mob/living/simple_animal/friendly/mushroom.dm @@ -23,8 +23,8 @@ holder_type = /obj/item/weapon/holder/mushroom mob_size = 2 -/mob/living/simple_animal/mushroom/New() - ..() +/mob/living/simple_animal/mushroom/Initialize() + . = ..() harvest_time = world.time var/count = 0 for (var/mob/living/simple_animal/mushroom in living_mob_list) @@ -33,8 +33,6 @@ if (count > GLOBAL_MUSHROOM_LIMIT) qdel(src) - - /mob/living/simple_animal/mushroom/attack_hand(mob/living/carbon/human/M as mob) if (src.stat == DEAD)//If the creature is dead, we don't pet it, we just pickup the corpse on click get_scooped(M, usr) @@ -85,4 +83,4 @@ if(src) gib() -#undef GLOBAL_MUSHROOM_LIMIT \ No newline at end of file +#undef GLOBAL_MUSHROOM_LIMIT diff --git a/code/modules/mob/living/simple_animal/friendly/ratking.dm b/code/modules/mob/living/simple_animal/friendly/ratking.dm index 65777a33bec..7da3e6a00d5 100644 --- a/code/modules/mob/living/simple_animal/friendly/ratking.dm +++ b/code/modules/mob/living/simple_animal/friendly/ratking.dm @@ -28,8 +28,8 @@ var/announce_name = "Request" var/list/rats = list() -/mob/living/simple_animal/mouse/king/New() - ..() +/mob/living/simple_animal/mouse/king/Initialize() + . = ..() update() diff --git a/code/modules/mob/living/simple_animal/friendly/slime.dm b/code/modules/mob/living/simple_animal/friendly/slime.dm index 1c18bd42f24..62e6212e5d6 100644 --- a/code/modules/mob/living/simple_animal/friendly/slime.dm +++ b/code/modules/mob/living/simple_animal/friendly/slime.dm @@ -38,8 +38,8 @@ mob_size = 6 composition_reagent = "slimejelly" -/mob/living/simple_animal/adultslime/New() - ..() +/mob/living/simple_animal/adultslime/Initialize() + . = ..() add_overlay("aslime-:33") diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm index 8644ea0e8b5..e125ca97654 100644 --- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm +++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm @@ -42,8 +42,8 @@ pass_flags = PASSTABLE | PASSDOORHATCH speak_emote = list("beeps","clicks","chirps") -/mob/living/simple_animal/spiderbot/New() - ..() +/mob/living/simple_animal/spiderbot/Initialize() + . = ..() add_language("Ceti Basic") default_language = all_languages["Ceti Basic"] verbs |= /mob/living/proc/ventcrawl @@ -185,14 +185,14 @@ eject_brain() return ..() -/mob/living/simple_animal/spiderbot/New() +/mob/living/simple_animal/spiderbot/Initialize() + . = ..() radio = new /obj/item/device/radio/borg(src) camera = new /obj/machinery/camera(src) camera.c_tag = "spiderbot-[real_name]" camera.replace_networks(list("SS13")) - ..() /mob/living/simple_animal/spiderbot/death() diff --git a/code/modules/mob/living/simple_animal/hostile/bat.dm b/code/modules/mob/living/simple_animal/hostile/bat.dm index 773cbe06b9f..0e497f1b55b 100644 --- a/code/modules/mob/living/simple_animal/hostile/bat.dm +++ b/code/modules/mob/living/simple_animal/hostile/bat.dm @@ -39,8 +39,8 @@ faction = "scarybat" var/mob/living/owner -/mob/living/simple_animal/hostile/scarybat/New(loc, mob/living/L as mob) - ..() +/mob/living/simple_animal/hostile/scarybat/Initialize(mapload, mob/living/L as mob) + . = ..() if(istype(L)) owner = L diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm index 6957e3b4e7a..5b187521815 100644 --- a/code/modules/mob/living/simple_animal/hostile/bear.dm +++ b/code/modules/mob/living/simple_animal/hostile/bear.dm @@ -76,8 +76,8 @@ response_disarm = "gently pushes aside" response_harm = "pokes" -/mob/living/simple_animal/hostile/bear/New() - ..() +/mob/living/simple_animal/hostile/bear/Initialize() + . = ..() update_bearmode() /mob/living/simple_animal/hostile/bear/harvest() @@ -434,7 +434,7 @@ var/datum/effect_system/sparks/spark_system always_space_mode = TRUE -/mob/living/simple_animal/hostile/bear/spatial/New() +/mob/living/simple_animal/hostile/bear/spatial/Initialize() . = ..() spark_system = bind_spark(src, 5) diff --git a/code/modules/mob/living/simple_animal/hostile/faithless.dm b/code/modules/mob/living/simple_animal/hostile/faithless.dm index f3c92cbe310..ae450fa6319 100644 --- a/code/modules/mob/living/simple_animal/hostile/faithless.dm +++ b/code/modules/mob/living/simple_animal/hostile/faithless.dm @@ -85,7 +85,7 @@ var/list/darkform_spells = list(/spell/targeted/ethereal_jaunt/shift, /spell/aoe_turf/conjure/forcewall/lesser) -/mob/living/simple_animal/hostile/faithless/wizard/New() - ..() +/mob/living/simple_animal/hostile/faithless/wizard/Initialize() + . = ..() for(var/spell in darkform_spells) src.add_spell(new spell, "const_spell_ready") diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index ac333ee308c..e1b4fea53d5 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -64,7 +64,7 @@ poison_per_bite = 5 move_to_delay = 4 -/mob/living/simple_animal/hostile/giant_spider/New(var/location, var/atom/parent) +/mob/living/simple_animal/hostile/giant_spider/Initialize(mapload, atom/parent) get_light_and_color(parent) ..() diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm index d7125670179..29b0bbacefc 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimic.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm @@ -134,8 +134,8 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca var/destroy_objects = 0 var/knockdown_people = 0 -/mob/living/simple_animal/hostile/mimic/copy/New(loc, var/obj/copy, var/mob/living/creator) - ..(loc) +/mob/living/simple_animal/hostile/mimic/copy/Initialize(mapload, obj/copy, mob/living/creator) + . = ..(mapload) CopyObject(copy, creator) /mob/living/simple_animal/hostile/mimic/copy/death() diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm index 7ab84995840..03594587d68 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm @@ -49,8 +49,8 @@ var/has_loot = 1 faction = "malf_drone" -/mob/living/simple_animal/hostile/retaliate/malf_drone/New() - ..() +/mob/living/simple_animal/hostile/retaliate/malf_drone/Initialize() + . = ..() if(prob(5)) projectiletype = /obj/item/projectile/beam/pulse/drone projectilesound = 'sound/weapons/pulse2.ogg' diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 72ed6f724e5..1c7f92c7330 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -83,8 +83,8 @@ var/obj/item/held_item = null -/mob/living/simple_animal/parrot/New() - ..() +/mob/living/simple_animal/parrot/Initialize() + . = ..() if(!ears) var/headset = pick(/obj/item/device/radio/headset/headset_sec, \ /obj/item/device/radio/headset/headset_eng, \ @@ -683,10 +683,10 @@ desc = "Poly the Parrot. An expert on quantum cracker theory." speak = list("Poly wanna cracker!", ":e Check the singlo, you chucklefucks!",":e Wire the solars, you lazy bums!",":e WHO TOOK THE DAMN VOIDSUITS?",":e OH GOD ITS FREE CALL THE SHUTTLE") -/mob/living/simple_animal/parrot/Poly/New() +/mob/living/simple_animal/parrot/Poly/Initialize() ears = new /obj/item/device/radio/headset/headset_eng(src) available_channels = list(":e") - ..() + . = ..() /mob/living/simple_animal/parrot/say(var/message) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 1aa59dae49d..cb41c80e916 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -103,8 +103,8 @@ /mob/living/simple_animal/proc/beg(var/atom/thing, var/atom/holder) visible_emote("gazes longingly at [holder]'s [thing]",0) -/mob/living/simple_animal/New() - ..() +/mob/living/simple_animal/Initialize() + . = ..() seek_move_delay = (1 / seek_speed) / (world.tick_lag / 10)//number of ticks between moves turns_since_scan = rand(min_scan_interval, max_scan_interval)//Randomise this at the start so animals don't sync up health = maxHealth