diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm index 69ccb4240a..b5175b215f 100644 --- a/code/game/machinery/airlock_control.dm +++ b/code/game/machinery/airlock_control.dm @@ -20,28 +20,28 @@ close(1) if("unlock") - locked = FALSE + locked = FALSE update_icon() if("lock") - locked = TRUE + locked = TRUE update_icon() if("secure_open") - locked = FALSE + locked = FALSE update_icon() sleep(2) open(1) - locked = TRUE + locked = TRUE update_icon() if("secure_close") - locked = FALSE + locked = FALSE close(1) - locked = TRUE + locked = TRUE sleep(2) update_icon() @@ -88,7 +88,7 @@ name = "airlock sensor" resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF - anchored = TRUE + anchored = TRUE power_channel = ENVIRON var/id_tag @@ -97,8 +97,8 @@ var/datum/radio_frequency/radio_connection - var/on = TRUE - var/alert = FALSE + var/on = TRUE + var/alert = FALSE /obj/machinery/airlock_sensor/update_icon() @@ -143,9 +143,9 @@ radio_connection = SSradio.add_object(src, frequency, GLOB.RADIO_AIRLOCK) /obj/machinery/airlock_sensor/Initialize() - ..() + . = ..() set_frequency(frequency) /obj/machinery/airlock_sensor/Destroy() - SSradio.remove_object(src,frequency) + SSradio.remove_object(src,frequency) return ..() \ No newline at end of file diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 2033fd7146..a8e9c7bcca 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -4,17 +4,17 @@ icon_screen = "crew" icon_keyboard = "med_key" circuit = /obj/item/circuitboard/computer/operating - var/mob/living/carbon/human/patient - var/obj/structure/table/optable/table + var/mob/living/carbon/human/patient + var/obj/structure/table/optable/table light_color = LIGHT_COLOR_BLUE /obj/machinery/computer/operating/Initialize() - ..() + . = ..() find_table() /obj/machinery/computer/operating/proc/find_table() - for(var/dir in GLOB.cardinals) + for(var/dir in GLOB.cardinals) table = locate(/obj/structure/table/optable, get_step(src, dir)) if(table) table.computer = src @@ -63,4 +63,4 @@ var/datum/surgery_step/surgery_step = procedure.get_surgery_step() dat += "Next step: [capitalize(surgery_step.name)]
" dat += "" - return dat + return dat \ No newline at end of file diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index 8131dbd4a6..2d1d771203 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -84,7 +84,7 @@ light_color = LIGHT_COLOR_CYAN /obj/machinery/computer/atmos_control/Initialize() - ..() + . = ..() set_frequency(frequency) /obj/machinery/computer/atmos_control/Destroy() @@ -227,4 +227,4 @@ else if(output_tag == id_tag) output_info = signal.data else - ..(signal) + ..(signal) \ No newline at end of file diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 44822d3771..f3fabcc21c 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -40,25 +40,25 @@ return ..() /obj/machinery/computer/message_monitor/emag_act(mob/user) - if(emagged) - return - if(!isnull(src.linkedServer)) - emagged = TRUE - screen = 2 - spark_system.set_up(5, 0, src) - src.spark_system.start() - var/obj/item/paper/monitorkey/MK = new/obj/item/paper/monitorkey - MK.loc = src.loc - // Will help make emagging the console not so easy to get away with. - MK.info += "

�%@%(*$%&(�&?*(%&�/{}" - var/time = 100 * length(src.linkedServer.decryptkey) - addtimer(CALLBACK(src, .proc/UnmagConsole), time) - message = rebootmsg - else - to_chat(user, "A no server error appears on the screen.") + if(emagged) + return + if(!isnull(src.linkedServer)) + emagged = TRUE + screen = 2 + spark_system.set_up(5, 0, src) + src.spark_system.start() + var/obj/item/paper/monitorkey/MK = new/obj/item/paper/monitorkey + MK.loc = src.loc + // Will help make emagging the console not so easy to get away with. + MK.info += "

�%@%(*$%&(�&?*(%&�/{}" + var/time = 100 * length(src.linkedServer.decryptkey) + addtimer(CALLBACK(src, .proc/UnmagConsole), time) + message = rebootmsg + else + to_chat(user, "A no server error appears on the screen.") /obj/machinery/computer/message_monitor/Initialize() - ..() + . = ..() //Is the server isn't linked to a server, and there's a server available, default it to the first one in the list. if(!linkedServer) if(GLOB.message_servers && GLOB.message_servers.len > 0) @@ -236,7 +236,7 @@ src.screen = 0 // Return the screen back to normal /obj/machinery/computer/message_monitor/proc/UnmagConsole() - emagged = FALSE + emagged = FALSE /obj/machinery/computer/message_monitor/proc/ResetMessage() customsender = "System Administrator" @@ -309,7 +309,7 @@ message = noserver else if(auth) - var/dkey = trim(stripped_input(usr, "Please enter the decryption key.")) + var/dkey = trim(stripped_input(usr, "Please enter the decryption key.")) if(dkey && dkey != "") if(src.linkedServer.decryptkey == dkey) var/newkey = trim(input(usr,"Please enter the new key (3 - 16 characters max):")) @@ -414,11 +414,11 @@ customrecepient.tnote += "← From [customsender] ([customjob]):
[custommessage]
" if (!customrecepient.silent) playsound(customrecepient.loc, 'sound/machines/twobeep.ogg', 50, 1) - customrecepient.audible_message("[icon2html(customrecepient, viewers(customrecepient))] *[customrecepient.ttone]*", null, 3) + customrecepient.audible_message("[icon2html(customrecepient, viewers(customrecepient))] *[customrecepient.ttone]*", null, 3) if( customrecepient.loc && ishuman(customrecepient.loc) ) var/mob/living/carbon/human/H = customrecepient.loc - to_chat(H, "[icon2html(customrecepient, viewers(H))] Message from [customsender] ([customjob]), \"[custommessage]\" (Reply)") - log_talk(usr,"[key_name(usr)] (PDA: [customsender]) sent \"[custommessage]\" to [customrecepient.owner]",LOGPDA) + to_chat(H, "[icon2html(customrecepient, viewers(H))] Message from [customsender] ([customjob]), \"[custommessage]\" (Reply)") + log_talk(usr,"[key_name(usr)] (PDA: [customsender]) sent \"[custommessage]\" to [customrecepient.owner]",LOGPDA) customrecepient.cut_overlays() customrecepient.add_overlay(mutable_appearance('icons/obj/pda.dmi', "pda-r")) //Sender is faking as someone who exists @@ -427,11 +427,11 @@ customrecepient.tnote += "← From [PDARec.owner] ([customjob]):
[custommessage]
" if (!customrecepient.silent) playsound(customrecepient.loc, 'sound/machines/twobeep.ogg', 50, 1) - customrecepient.audible_message("[icon2html(customrecepient, viewers(customrecepient))] *[customrecepient.ttone]*", null, 3) + customrecepient.audible_message("[icon2html(customrecepient, viewers(customrecepient))] *[customrecepient.ttone]*", null, 3) if( customrecepient.loc && ishuman(customrecepient.loc) ) var/mob/living/carbon/human/H = customrecepient.loc - to_chat(H, "[icon2html(customrecepient, H)] Message from [PDARec.owner] ([customjob]), \"[custommessage]\" (Reply)") - log_talk(usr,"[key_name(usr)] (PDA: [PDARec.owner]) sent \"[custommessage]\" to [customrecepient.owner]",LOGPDA) + to_chat(H, "[icon2html(customrecepient, H)] Message from [PDARec.owner] ([customjob]), \"[custommessage]\" (Reply)") + log_talk(usr,"[key_name(usr)] (PDA: [PDARec.owner]) sent \"[custommessage]\" to [customrecepient.owner]",LOGPDA) customrecepient.cut_overlays() customrecepient.add_overlay(mutable_appearance('icons/obj/pda.dmi', "pda-r")) //Finally.. @@ -468,4 +468,4 @@ info = "

Daily Key Reset


The new message monitor key is '[server.decryptkey]'.
Please keep this a secret and away from the clown.
If necessary, change the password to a more secure one." info_links = info add_overlay("paper_words") - break + break \ No newline at end of file diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 3f18cc29e9..943419c548 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -10,7 +10,7 @@ /obj/machinery/computer/pod/Initialize() - ..() + . = ..() for(var/obj/machinery/mass_driver/M in range(range, src)) if(M.id == id) connected = M @@ -21,7 +21,7 @@ return if(!connected) - say("Cannot locate mass driver connector. Cancelling firing sequence!") + say("Cannot locate mass driver connector. Cancelling firing sequence!") return for(var/obj/machinery/door/poddoor/M in range(range, src)) @@ -130,7 +130,7 @@ name = "\improper ProComp Executive IIc" desc = "The Syndicate operate on a tight budget. Operates external airlocks." title = "External Airlock Controls" - req_access = list(ACCESS_SYNDICATE) + req_access = list(ACCESS_SYNDICATE) /obj/machinery/computer/pod/old/syndicate/attack_hand(mob/user) if(!allowed(user)) @@ -142,4 +142,4 @@ /obj/machinery/computer/pod/old/swf name = "\improper Magix System IV" - desc = "An arcane artifact that holds much magic. Running E-Knock 2.2: Sorceror's Edition" + desc = "An arcane artifact that holds much magic. Running E-Knock 2.2: Sorceror's Edition" \ No newline at end of file diff --git a/code/game/machinery/computer/telecrystalconsoles.dm b/code/game/machinery/computer/telecrystalconsoles.dm index 678d856dce..52de3830df 100644 --- a/code/game/machinery/computer/telecrystalconsoles.dm +++ b/code/game/machinery/computer/telecrystalconsoles.dm @@ -22,7 +22,7 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E var/obj/machinery/computer/telecrystals/boss/linkedboss = null /obj/machinery/computer/telecrystals/uplinker/Initialize() - ..() + . = ..() var/ID = pick_n_take(GLOB.possible_uplinker_IDs) if(!ID) @@ -220,4 +220,4 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E src.updateUsrDialog() return -#undef NUKESCALINGMODIFIER +#undef NUKESCALINGMODIFIER \ No newline at end of file diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index d0d40e7233..36366ffbd9 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -215,7 +215,7 @@ /obj/machinery/magnetic_controller/Initialize() - ..() + . = ..() if(autolink) for(var/obj/machinery/magnetic_module/M in GLOB.machines) if(M.freq == frequency && M.code == code) @@ -391,4 +391,4 @@ if(!(nextchar in list(";", "&", "*", " "))) // if char is a separator, ignore rpath += copytext(path, i, i+1) // else, add to list - // there doesn't HAVE to be separators but it makes paths syntatically visible + // there doesn't HAVE to be separators but it makes paths syntatically visible \ No newline at end of file diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index d90e91a428..b3a7f99758 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -706,7 +706,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C ..() var/T = pick(subtypesof(/obj/machinery/vending/snack) - /obj/machinery/vending/snack/random) new T(get_turf(src)) - qdel(src) + return INITIALIZE_HINT_QDEL /obj/machinery/vending/snack/blue icon_state = "snackblue" @@ -758,7 +758,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C . = ..() var/T = pick(subtypesof(/obj/machinery/vending/cola) - /obj/machinery/vending/cola/random) new T(get_turf(src)) - qdel(src) + return INITIALIZE_HINT_QDEL /obj/machinery/vending/cola/blue icon_state = "Cola_Machine" @@ -1195,4 +1195,4 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C #undef STANDARD_CHARGE #undef CONTRABAND_CHARGE -#undef COIN_CHARGE +#undef COIN_CHARGE \ No newline at end of file diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index e0cec3af02..7401797a47 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -160,7 +160,7 @@ /obj/effect/landmark/start/wizard/Initialize(mapload) ..() GLOB.wizardstart += loc - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/landmark/start/new_player name = "New Player" @@ -173,7 +173,7 @@ /obj/effect/landmark/start/new_player/Initialize(mapload) ..() - qdel(src) + return INITIALIZE_HINT_QDEL @@ -183,7 +183,7 @@ /obj/effect/landmark/latejoin/Initialize(mapload) ..() SSjob.latejoin_trackers += loc - qdel(src) + return INITIALIZE_HINT_QDEL // carp. /obj/effect/landmark/carpspawn @@ -229,7 +229,7 @@ /obj/effect/landmark/xeno_spawn/Initialize(mapload) ..() GLOB.xeno_spawn += loc - qdel(src) + return INITIALIZE_HINT_QDEL // blobs. /obj/effect/landmark/blobstart @@ -238,7 +238,7 @@ /obj/effect/landmark/blobstart/Initialize(mapload) ..() GLOB.blobstart += loc - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/landmark/secequipment name = "secequipment" @@ -246,7 +246,7 @@ /obj/effect/landmark/secequipment/Initialize(mapload) ..() GLOB.secequipment += loc - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/landmark/prisonwarp name = "prisonwarp" @@ -254,15 +254,15 @@ /obj/effect/landmark/prisonwarp/Initialize(mapload) ..() GLOB.prisonwarp += loc - qdel(src) - + return INITIALIZE_HINT_QDEL + /obj/effect/landmark/ert_spawn name = "Emergencyresponseteam" /obj/effect/landmark/ert_spawn/Initialize(mapload) ..() GLOB.emergencyresponseteamspawn += loc - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/landmark/holding_facility name = "Holding Facility" @@ -270,7 +270,7 @@ /obj/effect/landmark/holding_facility/Initialize(mapload) ..() GLOB.holdingfacility += loc - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/landmark/thunderdome/observe name = "tdomeobserve" @@ -278,7 +278,7 @@ /obj/effect/landmark/thunderdome/observe/Initialize(mapload) ..() GLOB.tdomeobserve += loc - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/landmark/thunderdome/one name = "tdome1" @@ -286,7 +286,7 @@ /obj/effect/landmark/thunderdome/one/Initialize(mapload) ..() GLOB.tdome1 += loc - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/landmark/thunderdome/two name = "tdome2" @@ -294,7 +294,7 @@ /obj/effect/landmark/thunderdome/two/Initialize(mapload) ..() GLOB.tdome2 += loc - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/landmark/thunderdome/admin name = "tdomeadmin" @@ -302,7 +302,7 @@ /obj/effect/landmark/thunderdome/admin/Initialize(mapload) ..() GLOB.tdomeadmin += loc - qdel(src) + return INITIALIZE_HINT_QDEL //generic event spawns /obj/effect/landmark/event_spawn @@ -330,4 +330,4 @@ /obj/effect/landmark/ruin/Destroy() GLOB.ruin_landmarks -= src ruin_template = null - . = ..() + . = ..() \ No newline at end of file diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 94cabaf6e1..2bfce20ccd 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -18,7 +18,7 @@ if(lootspawn) new lootspawn(T) lootcount-- - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/spawner/lootdrop/armory_contraband name = "armory contraband gun spawner" @@ -89,7 +89,7 @@ /obj/effect/spawner/lootdrop/maintenance/Initialize(mapload) loot = GLOB.maintenance_loot - ..() + . = ..() /obj/effect/spawner/lootdrop/crate_spawner name = "lootcrate spawner" //USE PROMO CODE "SELLOUT" FOR 20% OFF! @@ -130,7 +130,7 @@ loot = list() for(var/path in subtypesof(/obj/effect/spawner/bundle/costume)) loot[path] = TRUE - ..() + . = ..() // Minor lootdrops follow @@ -162,4 +162,4 @@ name = "25% cyborg mask spawner" loot = list( /obj/item/clothing/mask/gas/cyborg = 25, - "" = 75) + "" = 75) \ No newline at end of file diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index 4c4c537859..26cf258c8e 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -31,7 +31,7 @@ obj/item/construction var/no_ammo_message = "The \'Low Ammo\' light on the device blinks yellow." /obj/item/construction/Initialize() - ..() + . = ..() desc = "A [src]. It currently holds [matter]/[max_matter] matter-units." spark_system = new /datum/effect_system/spark_spread spark_system.set_up(5, 0, src) diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index f3e78dfac9..bfc8bc9da3 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -160,7 +160,7 @@ update_label("John Doe", "Clowny") var/anyone = FALSE //Can anyone forge the ID or just syndicate? /obj/item/card/id/syndicate/Initialize() - ..() + . = ..() var/datum/action/item_action/chameleon/change/chameleon_action = new(src) chameleon_action.chameleon_type = /obj/item/card/id chameleon_action.chameleon_name = "ID Card" @@ -180,14 +180,14 @@ update_label("John Doe", "Clowny") if(isliving(user) && user.mind) if(user.mind.special_role || anyone) if(alert(user, "Action", "Agent ID", "Show", "Forge") == "Forge") - var t = copytext(sanitize(input(user, "What name would you like to put on this card?", "Agent card name", registered_name ? registered_name : (ishuman(user) ? user.real_name : user.name))as text | null),1,26) + var/t = copytext(sanitize(input(user, "What name would you like to put on this card?", "Agent card name", registered_name ? registered_name : (ishuman(user) ? user.real_name : user.name))as text | null),1,26) if(!t || t == "Unknown" || t == "floor" || t == "wall" || t == "r-wall") //Same as mob/dead/new_player/prefrences.dm if (t) alert("Invalid name.") return registered_name = t - var u = copytext(sanitize(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Assistant")as text | null),1,MAX_MESSAGE_LEN) + var/u = copytext(sanitize(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Assistant")as text | null),1,MAX_MESSAGE_LEN) if(!u) registered_name = "" return @@ -220,7 +220,7 @@ update_label("John Doe", "Clowny") /obj/item/card/id/captains_spare/Initialize() var/datum/job/captain/J = new/datum/job/captain access = J.get_access() - ..() + . = ..() /obj/item/card/id/centcom name = "\improper CentCom ID" @@ -231,7 +231,7 @@ update_label("John Doe", "Clowny") /obj/item/card/id/centcom/Initialize() access = get_all_centcom_access() - ..() + . = ..() /obj/item/card/id/ert name = "\improper CentCom ID" @@ -242,7 +242,7 @@ update_label("John Doe", "Clowny") /obj/item/card/id/ert/Initialize() access = get_all_accesses()+get_ert_access("commander")-ACCESS_CHANGE_IDS - ..() + . = ..() /obj/item/card/id/ert/Security registered_name = "Security Response Officer" @@ -250,7 +250,7 @@ update_label("John Doe", "Clowny") /obj/item/card/id/ert/Security/Initialize() access = get_all_accesses()+get_ert_access("sec")-ACCESS_CHANGE_IDS - ..() + . = ..() /obj/item/card/id/ert/Engineer registered_name = "Engineer Response Officer" @@ -258,7 +258,7 @@ update_label("John Doe", "Clowny") /obj/item/card/id/ert/Engineer/Initialize() access = get_all_accesses()+get_ert_access("eng")-ACCESS_CHANGE_IDS - ..() + . = ..() /obj/item/card/id/ert/Medical registered_name = "Medical Response Officer" @@ -266,7 +266,7 @@ update_label("John Doe", "Clowny") /obj/item/card/id/ert/Medical/Initialize() access = get_all_accesses()+get_ert_access("med")-ACCESS_CHANGE_IDS - ..() + . = ..() /obj/item/card/id/prisoner name = "prisoner ID card" diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index bd54fda56f..8b27659ada 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -4,13 +4,13 @@ icon = 'icons/obj/radio.dmi' icon_state = "electropack0" item_state = "electropack" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' - flags_1 = CONDUCT_1 + lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + flags_1 = CONDUCT_1 slot_flags = SLOT_BACK w_class = WEIGHT_CLASS_HUGE materials = list(MAT_METAL=10000, MAT_GLASS=2500) - var/on = TRUE + var/on = TRUE var/code = 2 var/frequency = 1449 var/shock_cooldown = 0 @@ -20,11 +20,11 @@ return (FIRELOSS) /obj/item/device/electropack/Initialize() - ..() + . = ..() SSradio.add_object(src, frequency, GLOB.RADIO_CHAT) /obj/item/device/electropack/Destroy() - SSradio.remove_object(src, frequency) + SSradio.remove_object(src, frequency) return ..() /obj/item/device/electropack/attack_hand(mob/user) @@ -52,8 +52,8 @@ user.put_in_hands(A) A.add_fingerprint(user) - if(src.flags_1 & NODROP_1) - A.flags_1 |= NODROP_1 + if(src.flags_1 & NODROP_1) + A.flags_1 |= NODROP_1 else return ..() @@ -108,7 +108,7 @@ spawn(100) shock_cooldown = 0 var/mob/living/L = loc - step(L, pick(GLOB.cardinals)) + step(L, pick(GLOB.cardinals)) to_chat(L, "You feel a sharp shock!") var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread @@ -143,4 +143,4 @@ Code: "} user << browse(dat, "window=radio") onclose(user, "radio") - return + return \ No newline at end of file diff --git a/code/game/objects/items/eightball.dm b/code/game/objects/items/eightball.dm index 82d4c3d99f..d8be420a08 100644 --- a/code/game/objects/items/eightball.dm +++ b/code/game/objects/items/eightball.dm @@ -37,10 +37,10 @@ "Very doubtful") /obj/item/toy/eightball/Initialize(mapload) - ..() + . = ..() if(prob(1)) new /obj/item/toy/eightball/haunted(get_turf(src)) - qdel(src) + return INITIALIZE_HINT_QDEL /obj/item/toy/eightball/attack_self(mob/user) if(shaking) @@ -81,7 +81,7 @@ var/fixed_answer /obj/item/toy/eightball/broken/Initialize(mapload) - ..() + . = ..() fixed_answer = pick(possible_answers) /obj/item/toy/eightball/broken/get_answer() @@ -97,7 +97,7 @@ var/list/votes /obj/item/toy/eightball/haunted/Initialize(mapload) - ..() + . = ..() votes = list() GLOB.poi_list |= src diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index bf5cf0417c..50b0f4e7e6 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -253,7 +253,7 @@ var/trap_damage = 20 /obj/item/restraints/legcuffs/beartrap/Initialize() - ..() + . = ..() icon_state = "[initial(icon_state)][armed]" /obj/item/restraints/legcuffs/beartrap/suicide_act(mob/user) @@ -369,4 +369,4 @@ var/obj/item/restraints/legcuffs/beartrap/B = new /obj/item/restraints/legcuffs/beartrap/energy/cyborg(get_turf(hit_atom)) B.Crossed(hit_atom) qdel(src) - ..() + ..() \ No newline at end of file diff --git a/code/game/objects/items/implants/implantcase.dm b/code/game/objects/items/implants/implantcase.dm index 08681ac9e4..0bafff176b 100644 --- a/code/game/objects/items/implants/implantcase.dm +++ b/code/game/objects/items/implants/implantcase.dm @@ -61,7 +61,7 @@ return ..() /obj/item/implantcase/Initialize(mapload) - ..() + . = ..() if(imp_type) imp = new imp_type(src) update_icon() @@ -80,4 +80,4 @@ /obj/item/implantcase/adrenaline name = "implant case - 'Adrenaline'" desc = "A glass case containing an adrenaline implant." - imp_type = /obj/item/implant/adrenalin + imp_type = /obj/item/implant/adrenalin \ No newline at end of file diff --git a/code/game/objects/items/implants/implanter.dm b/code/game/objects/items/implants/implanter.dm index 24b1928dbc..372671acf5 100644 --- a/code/game/objects/items/implants/implanter.dm +++ b/code/game/objects/items/implants/implanter.dm @@ -59,7 +59,7 @@ return ..() /obj/item/implanter/Initialize(mapload) - ..() + . = ..() if(imp_type) imp = new imp_type(src) update_icon() @@ -70,4 +70,4 @@ /obj/item/implanter/emp name = "implanter (EMP)" - imp_type = /obj/item/implant/emp + imp_type = /obj/item/implant/emp \ No newline at end of file diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index fe89f42338..2290ea91d3 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -289,7 +289,7 @@ icon_state = initial(icon_state) /obj/item/storage/backpack/satchel/flat/Initialize(mapload) - ..() + . = ..() SSpersistence.new_secret_satchels += src /obj/item/storage/backpack/satchel/flat/PopulateContents() @@ -306,7 +306,7 @@ var/revealed = 0 /obj/item/storage/backpack/satchel/flat/secret/Initialize() - ..() + . = ..() if(isfloorturf(loc) && !istype(loc, /turf/open/floor/plating/)) hide(1) diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index c1a47742e9..489f1c6bf0 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -735,7 +735,7 @@ var/theme_name /obj/item/storage/box/ingredients/Initialize() - ..() + . = ..() if(theme_name) name = "[name] ([theme_name])" desc = "A box containing supplementary ingredients for the aspiring chef. The box's theme is '[theme_name]'." diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 4b93fde13f..4dc90de6be 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -56,7 +56,7 @@ item_state = "firstaid-ointment" /obj/item/storage/firstaid/fire/Initialize(mapload) - ..() + . = ..() icon_state = pick("ointment","firefirstaid") /obj/item/storage/firstaid/fire/PopulateContents() diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index e6fe6da34d..dfcac18d29 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -19,7 +19,7 @@ var/has_latches = TRUE /obj/item/storage/toolbox/Initialize() - ..() + . = ..() if(has_latches) if(prob(10)) latches = "double_latch" @@ -183,4 +183,4 @@ new/obj/item/stack/cable_coil/pink(src) new/obj/item/stack/cable_coil/orange(src) new/obj/item/stack/cable_coil/cyan(src) - new/obj/item/stack/cable_coil/white(src) + new/obj/item/stack/cable_coil/white(src) \ No newline at end of file diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 081cf186a3..225d634a7f 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -55,7 +55,7 @@ icon = 'icons/obj/smooth_structures/lattice_clockwork.dmi' /obj/structure/lattice/clockwork/Initialize(mapload) - ..() + . = ..() ratvar_act() /obj/structure/lattice/clockwork/ratvar_act() @@ -63,7 +63,7 @@ new /obj/structure/lattice/clockwork/large(loc) // deletes old one /obj/structure/lattice/clockwork/large/Initialize(mapload) - ..() + . = ..() icon = 'icons/obj/smooth_structures/lattice_clockwork_large.dmi' pixel_x = -9 pixel_y = -9 @@ -101,7 +101,7 @@ icon = 'icons/obj/smooth_structures/catwalk_clockwork.dmi' /obj/structure/lattice/catwalk/clockwork/Initialize(mapload) - ..() + . = ..() new /obj/effect/temp_visual/ratvar/floor/catwalk(loc) new /obj/effect/temp_visual/ratvar/beam/catwalk(loc) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 17f7f3f493..116ced183f 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -34,8 +34,8 @@ smooth = SMOOTH_TRUE canSmoothWith = list(/obj/structure/table, /obj/structure/table/reinforced) -/obj/structure/table/New() - ..() +/obj/structure/table/Initialize() + . = ..() for(var/obj/structure/table/T in src.loc) if(T != src) qdel(T) diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm index d82428ad98..8e6ba993cb 100644 --- a/code/game/objects/structures/traps.dm +++ b/code/game/objects/structures/traps.dm @@ -16,7 +16,7 @@ var/datum/effect_system/spark_spread/spark_system /obj/structure/trap/Initialize(mapload) - ..() + . = ..() spark_system = new spark_system.set_up(4,1,src) spark_system.attach(src) diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm index 2ea3ffe7fc..68e5e31e84 100644 --- a/code/game/turfs/closed.dm +++ b/code/game/turfs/closed.dm @@ -69,7 +69,7 @@ icon = 'icons/obj/smooth_structures/reinforced_window.dmi' /turf/closed/indestructible/fakeglass/Initialize() - ..() + . = ..() icon_state = null //set the icon state to null, so our base state isn't visible underlays += mutable_appearance('icons/obj/structures.dmi', "grille") //add a grille underlay underlays += mutable_appearance('icons/turf/floors.dmi', "plating") //add the plating underlay, below the grille diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index df3d2aba86..02206646d2 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -21,7 +21,7 @@ broken_states = list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5") if (!burnt_states) burnt_states = list() - ..() + . = ..() //This is so damaged or burnt tiles or platings don't get remembered as the default tile var/static/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","damaged4", "damaged5","panelscorched","floorscorched1","floorscorched2","platingdmg1","platingdmg2", "foam_plating", diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index 59e7bed8ca..a24642c735 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -71,7 +71,7 @@ var/turfverb = "uproot" /turf/open/floor/grass/Initialize() - ..() + . = ..() update_icon() /turf/open/floor/grass/attackby(obj/item/C, mob/user, params) @@ -109,7 +109,7 @@ slowdown = 0 /turf/open/floor/grass/snow/basalt/Initialize() - ..() + . = ..() if(prob(15)) icon_state = "basalt[rand(0, 12)]" set_basalt_light(src) @@ -126,7 +126,7 @@ slowdown = 0 /turf/open/floor/grass/fakebasalt/Initialize() - ..() + . = ..() if(prob(15)) icon_state = "basalt[rand(0, 12)]" set_basalt_light(src) @@ -144,7 +144,7 @@ flags_1 = NONE /turf/open/floor/carpet/Initialize() - ..() + . = ..() update_icon() /turf/open/floor/carpet/update_icon() @@ -205,7 +205,7 @@ plane = PLANE_SPACE /turf/open/floor/fakespace/Initialize() - ..() + . = ..() icon_state = SPACE_ICON_STATE /turf/open/floor/fakespace/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) diff --git a/code/game/turfs/simulated/floor/light_floor.dm b/code/game/turfs/simulated/floor/light_floor.dm index 542a0ed81d..247382d03c 100644 --- a/code/game/turfs/simulated/floor/light_floor.dm +++ b/code/game/turfs/simulated/floor/light_floor.dm @@ -13,7 +13,7 @@ /turf/open/floor/light/Initialize() - ..() + . = ..() update_icon() /turf/open/floor/light/break_tile() diff --git a/code/game/turfs/simulated/floor/mineral_floor.dm b/code/game/turfs/simulated/floor/mineral_floor.dm index c28232410d..6f863d4bd0 100644 --- a/code/game/turfs/simulated/floor/mineral_floor.dm +++ b/code/game/turfs/simulated/floor/mineral_floor.dm @@ -18,7 +18,7 @@ /turf/open/floor/mineral/Initialize() broken_states = list("[initial(icon_state)]_dam") - ..() + . = ..() if (!icons) icons = list() @@ -221,7 +221,7 @@ icons = list("alienpod1", "alienpod2", "alienpod3", "alienpod4", "alienpod5", "alienpod6", "alienpod7", "alienpod8", "alienpod9") /turf/open/floor/mineral/abductor/Initialize() - ..() + . = ..() icon_state = "alienpod[rand(1,9)]" /turf/open/floor/mineral/abductor/break_tile() diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm index 1461abfcaf..3656e146a6 100644 --- a/code/game/turfs/simulated/floor/misc_floor.dm +++ b/code/game/turfs/simulated/floor/misc_floor.dm @@ -20,7 +20,7 @@ /turf/open/floor/circuit/Initialize() SSmapping.nuke_tiles += src update_icon() - ..() + . = ..() /turf/open/floor/circuit/Destroy() SSmapping.nuke_tiles -= src @@ -145,7 +145,7 @@ var/obj/effect/clockwork/overlay/floor/realappearence /turf/open/floor/clockwork/Initialize() - ..() + . = ..() new /obj/effect/temp_visual/ratvar/floor(src) new /obj/effect/temp_visual/ratvar/beam(src) realappearence = new /obj/effect/clockwork/overlay/floor(src) diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index 3617759e99..8ad6657784 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -17,7 +17,7 @@ broken_states = list("platingdmg1", "platingdmg2", "platingdmg3") if (!burnt_states) burnt_states = list("panelscorched") - ..() + . = ..() icon_plating = icon_state /turf/open/floor/plating/update_icon() diff --git a/code/game/turfs/simulated/floor/reinf_floor.dm b/code/game/turfs/simulated/floor/reinf_floor.dm index eaf0e512f7..04c97aa7d5 100644 --- a/code/game/turfs/simulated/floor/reinf_floor.dm +++ b/code/game/turfs/simulated/floor/reinf_floor.dm @@ -108,7 +108,7 @@ var/obj/effect/clockwork/overlay/floor/bloodcult/realappearence /turf/open/floor/engine/cult/Initialize() - ..() + . = ..() new /obj/effect/temp_visual/cult/turf/floor(src) realappearence = new /obj/effect/clockwork/overlay/floor/bloodcult(src) realappearence.linked = src diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm index 9e0d57d782..630ded7daa 100644 --- a/code/game/turfs/simulated/minerals.dm +++ b/code/game/turfs/simulated/minerals.dm @@ -30,7 +30,7 @@ pixel_y = -4 pixel_x = -4 icon = smooth_icon - ..() + . = ..() if (mineralType && mineralAmt && spread && spreadChance) for(var/dir in GLOB.cardinals) if(prob(spreadChance)) @@ -153,7 +153,7 @@ /turf/closed/mineral/gibtonite = 4, /turf/open/floor/plating/asteroid/airless/cave = 2, /turf/closed/mineral/bscrystal = 1) if (display_icon_state) icon_state = display_icon_state - ..() + . = ..() if (prob(mineralChance)) var/path = pickweight(mineralSpawnChanceList) var/turf/T = ChangeTurf(path,FALSE,FALSE,TRUE) @@ -393,7 +393,7 @@ /turf/closed/mineral/gibtonite/Initialize() det_time = rand(8,10) //So you don't know exactly when the hot potato will explode - ..() + . = ..() /turf/closed/mineral/gibtonite/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/device/mining_scanner) || istype(I, /obj/item/device/t_scanner/adv_mining_scanner) && stage == 1) diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm index f11735d676..cf611560c3 100644 --- a/code/game/turfs/space/transit.dm +++ b/code/game/turfs/space/transit.dm @@ -73,7 +73,7 @@ /turf/open/space/transit/Initialize() - ..() + . = ..() update_icon() for(var/atom/movable/AM in src) throw_atom(AM) diff --git a/code/modules/events/holiday/xmas.dm b/code/modules/events/holiday/xmas.dm index c5a9c1a142..bc2b3c2666 100644 --- a/code/modules/events/holiday/xmas.dm +++ b/code/modules/events/holiday/xmas.dm @@ -88,7 +88,7 @@ ..() if(FESTIVE_SEASON in SSevents.holidays) new tree(get_turf(src)) - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/landmark/xmastree/rdrod name = "festivus pole spawner" diff --git a/code/modules/events/wizard/magicarp.dm b/code/modules/events/wizard/magicarp.dm index 3d0461d3cf..cc632d9c87 100644 --- a/code/modules/events/wizard/magicarp.dm +++ b/code/modules/events/wizard/magicarp.dm @@ -43,7 +43,7 @@ /mob/living/simple_animal/hostile/carp/ranged/Initialize() projectiletype = pick(allowed_projectile_types) - ..() + . = ..() /mob/living/simple_animal/hostile/carp/ranged/chaos name = "chaos magicarp" diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 11eca212ae..17d626b3a0 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -14,8 +14,8 @@ name = "bookcase" icon = 'icons/obj/library.dmi' icon_state = "bookempty" - anchored = FALSE - density = TRUE + anchored = FALSE + density = TRUE opacity = 0 resistance_flags = FLAMMABLE max_integrity = 200 @@ -25,12 +25,12 @@ /obj/structure/bookcase/Initialize(mapload) - ..() + . = ..() if(!mapload) return state = 2 icon_state = "book-0" - anchored = TRUE + anchored = TRUE for(var/obj/item/I in loc) if(istype(I, /obj/item/book)) I.loc = src @@ -44,7 +44,7 @@ playsound(loc, I.usesound, 100, 1) if(do_after(user, 20*I.toolspeed, target = src)) to_chat(user, "You wrench the frame into place.") - anchored = TRUE + anchored = TRUE state = 1 if(istype(I, /obj/item/crowbar)) playsound(loc, I.usesound, 100, 1) @@ -63,7 +63,7 @@ if(istype(I, /obj/item/wrench)) playsound(loc, I.usesound, 100, 1) to_chat(user, "You unwrench the frame.") - anchored = FALSE + anchored = FALSE state = 0 if(2) @@ -317,4 +317,4 @@ to_chat(user, "Computer has been associated with this unit.") else to_chat(user, "No associated computer found. Only local scans will function properly.") - to_chat(user, "\n") + to_chat(user, "\n") \ No newline at end of file diff --git a/code/modules/library/random_books.dm b/code/modules/library/random_books.dm index 3c44dc28ea..769c9ac66b 100644 --- a/code/modules/library/random_books.dm +++ b/code/modules/library/random_books.dm @@ -1,18 +1,18 @@ /obj/item/book/manual/random/Initialize() - . = ..() + ..() var/static/banned_books = list(/obj/item/book/manual/random, /obj/item/book/manual/nuclear, /obj/item/book/manual/wiki) var/newtype = pick(subtypesof(/obj/item/book/manual) - banned_books) new newtype(loc) - qdel(src) + return INITIALIZE_HINT_QDEL /obj/item/book/random var/amount = 1 var/category = null /obj/item/book/random/Initialize() - . = ..() + ..() create_random_books(amount, src.loc, TRUE, category) - qdel(src) + return INITIALIZE_HINT_QDEL /obj/item/book/random/triple amount = 3 diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index 48ce6e5e7b..170cf57d95 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -40,7 +40,7 @@ create_internal_organs() - ..() + . = ..() /mob/living/carbon/alien/create_internal_organs() internal_organs += new /obj/item/organ/brain/alien diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm index 9e79ec1259..b18aaacfeb 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm @@ -8,7 +8,7 @@ /mob/living/carbon/alien/humanoid/drone/Initialize() AddAbility(new/obj/effect/proc_holder/alien/evolve(null)) - ..() + . = ..() /mob/living/carbon/alien/humanoid/drone/create_internal_organs() diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm index 71619ff9a4..404d285b25 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm @@ -13,7 +13,7 @@ AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/repulse/xeno(src)) AddAbility(new /obj/effect/proc_holder/alien/royal/praetorian/evolve()) - ..() + . = ..() /mob/living/carbon/alien/humanoid/royal/praetorian/create_internal_organs() internal_organs += new /obj/item/organ/alien/plasmavessel/large @@ -48,4 +48,4 @@ return 1 else to_chat(user, "We already have an alive queen.") - return 0 + return 0 \ No newline at end of file diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm index 2988e9b3bf..c0577c0d61 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm @@ -8,7 +8,7 @@ /mob/living/carbon/alien/humanoid/sentinel/Initialize() AddAbility(new /obj/effect/proc_holder/alien/sneak) - ..() + . = ..() /mob/living/carbon/alien/humanoid/sentinel/create_internal_organs() internal_organs += new /obj/item/organ/alien/plasmavessel @@ -18,4 +18,4 @@ /mob/living/carbon/alien/humanoid/sentinel/movement_delay() - . = ..() + . = ..() \ No newline at end of file diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index ed4a20a91a..0a325521b0 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -18,12 +18,13 @@ var/drooling = 0 //For Neruotoxic spit overlays bodyparts = list(/obj/item/bodypart/chest/alien, /obj/item/bodypart/head/alien, /obj/item/bodypart/l_arm/alien, /obj/item/bodypart/r_arm/alien, /obj/item/bodypart/r_leg/alien, /obj/item/bodypart/l_leg/alien) + devourable = TRUE //This is fine right now, if we're adding organ specific damage this needs to be updated /mob/living/carbon/alien/humanoid/Initialize() AddAbility(new/obj/effect/proc_holder/alien/regurgitate(null)) - ..() + . = ..() /mob/living/carbon/alien/humanoid/movement_delay() . = ..() @@ -42,7 +43,7 @@
"} for(var/i in 1 to held_items.len) var/obj/item/I = get_item_for_held_index(i) - dat += "
[get_held_index_name(i)]:[(I && !(I.flags_1 & ABSTRACT_1)) ? I : "Empty"]" + dat += "
[get_held_index_name(i)]:[(I && !(I.flags_1 & ABSTRACT_1)) ? I : "Empty"]" dat += "
Empty Pouches" if(handcuffed) @@ -120,4 +121,4 @@ /mob/living/carbon/alien/humanoid/check_breath(datum/gas_mixture/breath) if(breath && breath.total_moles() > 0 && !sneaking) playsound(get_turf(src), pick('sound/voice/lowHiss2.ogg', 'sound/voice/lowHiss3.ogg', 'sound/voice/lowHiss4.ogg'), 50, 0, -5) - ..() + ..() \ No newline at end of file diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm index 61c78c87a8..101f1495e2 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -4,7 +4,7 @@ icon_state = "larva0" pass_flags = PASSTABLE | PASSMOB mob_size = MOB_SIZE_SMALL - density = FALSE + density = FALSE maxHealth = 25 health = 25 @@ -22,7 +22,7 @@ AddAbility(new/obj/effect/proc_holder/alien/hide(null)) AddAbility(new/obj/effect/proc_holder/alien/larva_evolve(null)) - ..() + . = ..() /mob/living/carbon/alien/larva/create_internal_organs() internal_organs += new /obj/item/organ/alien/plasmavessel/small/tiny @@ -65,4 +65,4 @@ /mob/living/carbon/alien/larva/stripPanelEquip(obj/item/what, mob/who) to_chat(src, "You don't have the dexterity to do this!") - return + return \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm index ba2a0f3702..8c5be75684 100644 --- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm +++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm @@ -60,7 +60,7 @@ cap_color = rgb(rand(0, 255), rand(0, 255), rand(0, 255)) UpdateMushroomCap() health = maxHealth - ..() + . = ..() /mob/living/simple_animal/hostile/mushroom/adjustHealth(amount, updating_health = TRUE, forced = FALSE) //Possibility to flee from a fight just to make it more visually interesting if(!retreat_distance && prob(33))