From 488207473998819b6c3996a2cfcb888e22fc0ffa Mon Sep 17 00:00:00 2001 From: Amunak Date: Thu, 18 Dec 2014 03:11:49 +0100 Subject: [PATCH] Code formatting, EOL at EOF fixes, refactoring --- code/game/objects/items/contraband.dm | 2 +- code/game/objects/items/devices/PDA/PDA.dm | 2 +- code/game/objects/items/devices/aicard.dm | 2 +- code/game/objects/items/devices/binoculars.dm | 2 +- .../objects/items/devices/chameleonproj.dm | 2 +- code/game/objects/items/devices/debugger.dm | 4 +- code/game/objects/items/devices/flashlight.dm | 2 +- .../objects/items/devices/lightreplacer.dm | 2 +- code/game/objects/items/devices/megaphone.dm | 2 +- code/game/objects/items/devices/modkit.dm | 2 +- code/game/objects/items/devices/multitool.dm | 2 +- code/game/objects/items/devices/powersink.dm | 2 +- .../objects/items/devices/radio/beacon.dm | 2 +- .../objects/items/devices/radio/headset.dm | 4 +- .../objects/items/devices/suit_cooling.dm | 2 +- .../objects/items/devices/taperecorder.dm | 2 +- .../objects/items/devices/traitordevices.dm | 5 -- .../objects/items/devices/transfer_valve.dm | 6 +- code/game/objects/items/devices/violin.dm | 2 +- code/game/objects/items/devices/whistle.dm | 2 +- code/game/objects/items/latexballoon.dm | 2 +- code/game/objects/items/shooting_range.dm | 2 +- code/game/objects/items/stacks/medical.dm | 2 +- code/game/objects/items/stacks/nanopaste.dm | 2 +- .../objects/items/stacks/sheets/leather.dm | 2 +- .../objects/items/stacks/sheets/mineral.dm | 2 +- .../items/stacks/sheets/sheet_types.dm | 2 +- .../objects/items/stacks/sheets/sheets.dm | 2 +- code/game/objects/items/stacks/stack.dm | 2 +- code/game/objects/items/stacks/tiles/light.dm | 2 +- code/game/objects/items/toys.dm | 6 +- code/game/objects/items/trash.dm | 77 +++++++++++-------- code/game/objects/items/weapons/RCD.dm | 4 +- code/game/objects/items/weapons/RSF.dm | 2 +- .../game/objects/items/weapons/clown_items.dm | 2 +- code/game/objects/items/weapons/dice.dm | 2 +- .../objects/items/weapons/extinguisher.dm | 2 +- .../objects/items/weapons/flamethrower.dm | 2 +- .../objects/items/weapons/gift_wrappaper.dm | 2 +- .../items/weapons/grenades/emgrenade.dm | 1 - .../items/weapons/grenades/flashbang.dm | 2 +- .../objects/items/weapons/grenades/grenade.dm | 2 +- .../items/weapons/grenades/spawnergrenade.dm | 2 +- code/game/objects/items/weapons/handcuffs.dm | 2 +- .../objects/items/weapons/implants/implant.dm | 2 +- .../items/weapons/implants/implantfreedom.dm | 2 - .../items/weapons/implants/implantuplink.dm | 2 +- code/game/objects/items/weapons/melee/misc.dm | 2 +- code/game/objects/items/weapons/paiwire.dm | 2 +- code/game/objects/items/weapons/scrolls.dm | 2 +- code/game/objects/items/weapons/shards.dm | 2 +- .../objects/items/weapons/storage/backpack.dm | 2 +- .../objects/items/weapons/storage/fancy.dm | 2 +- .../objects/items/weapons/storage/internal.dm | 2 +- .../objects/items/weapons/storage/storage.dm | 2 +- .../objects/items/weapons/storage/toolbox.dm | 2 +- .../items/weapons/storage/uplink_kits.dm | 2 +- .../objects/items/weapons/storage/wallets.dm | 2 +- .../items/weapons/surgery_limbattachment.dm | 2 +- .../objects/items/weapons/swords_axes_etc.dm | 1 - code/game/objects/items/weapons/syndie.dm | 2 +- .../objects/items/weapons/table_rack_parts.dm | 2 +- .../objects/items/weapons/tanks/jetpack.dm | 2 +- code/game/objects/items/weapons/tape.dm | 2 +- .../objects/items/weapons/teleportation.dm | 2 - code/game/objects/items/weapons/tools.dm | 8 +- code/game/objects/items/weapons/twohanded.dm | 1 - code/game/objects/items/weapons/weaponry.dm | 2 +- code/game/objects/items/weapons/wires.dm | 2 - code/game/objects/random/random.dm | 2 +- code/game/objects/structures/barsign.dm | 2 +- code/game/objects/structures/bedsheet_bin.dm | 4 +- code/game/objects/structures/coathanger.dm | 2 +- .../structures/crates_lockers/closets.dm | 2 +- .../crates_lockers/closets/coffin.dm | 2 +- .../crates_lockers/closets/crittercrate.dm | 2 +- .../crates_lockers/closets/fireaxe.dm | 2 +- .../crates_lockers/closets/fitness.dm | 2 +- .../crates_lockers/closets/gimmick.dm | 1 - .../crates_lockers/closets/job_closets.dm | 2 +- .../crates_lockers/closets/l3closet.dm | 2 +- .../crates_lockers/closets/malfunction.dm | 3 +- .../crates_lockers/closets/secure/bar.dm | 2 +- .../crates_lockers/closets/secure/cargo.dm | 2 +- .../crates_lockers/closets/secure/freezer.dm | 8 -- .../closets/secure/guncabinet.dm | 2 +- .../closets/secure/hydroponics.dm | 2 +- .../crates_lockers/closets/secure/personal.dm | 4 +- .../closets/secure/scientist.dm | 2 +- .../closets/secure/secure_closets.dm | 2 +- .../crates_lockers/closets/syndicate.dm | 2 +- .../crates_lockers/closets/utility_closets.dm | 2 +- .../crates_lockers/closets/wardrobe.dm | 2 +- .../structures/crates_lockers/crates.dm | 2 +- .../structures/crates_lockers/largecrate.dm | 2 +- code/game/objects/structures/curtains.dm | 2 +- code/game/objects/structures/displaycase.dm | 2 - code/game/objects/structures/door_assembly.dm | 33 ++++---- code/game/objects/structures/electricchair.dm | 2 +- code/game/objects/structures/false_walls.dm | 1 - code/game/objects/structures/flora.dm | 2 +- code/game/objects/structures/girders.dm | 2 +- code/game/objects/structures/grille.dm | 4 +- code/game/objects/structures/janicart.dm | 2 +- code/game/objects/structures/kitchen_spike.dm | 2 +- code/game/objects/structures/ladders.dm | 2 +- code/game/objects/structures/lamarr_cage.dm | 2 +- code/game/objects/structures/lattice.dm | 2 +- code/game/objects/structures/mineral_doors.dm | 1 - code/game/objects/structures/mirror.dm | 2 +- code/game/objects/structures/mop_bucket.dm | 2 +- code/game/objects/structures/morgue.dm | 1 - code/game/objects/structures/safe.dm | 2 +- .../structures/stool_bed_chair_nest/chairs.dm | 2 +- .../stool_bed_chair_nest/wheelchair.dm | 2 +- code/game/objects/structures/tables_racks.dm | 2 +- .../game/objects/structures/tank_dispenser.dm | 2 +- code/game/objects/structures/target_stake.dm | 2 +- code/modules/mob/living/carbon/brain/MMI.dm | 2 +- code/modules/projectiles/guns/alien.dm | 4 +- code/modules/projectiles/guns/energy.dm | 2 +- code/modules/projectiles/guns/energy/laser.dm | 4 +- code/modules/projectiles/guns/energy/pulse.dm | 3 +- code/modules/projectiles/guns/energy/stun.dm | 9 --- code/modules/projectiles/guns/projectile.dm | 3 +- .../projectiles/guns/projectile/automatic.dm | 3 +- .../projectiles/guns/projectile/crossbow.dm | 7 +- .../projectiles/guns/projectile/launcher.dm | 3 +- .../projectiles/guns/projectile/pistol.dm | 2 +- .../projectiles/guns/projectile/pneumatic.dm | 5 +- .../projectiles/guns/projectile/revolver.dm | 9 +-- .../projectiles/guns/projectile/rocket.dm | 5 +- .../projectiles/guns/projectile/shotgun.dm | 2 +- code/modules/projectiles/projectile/beams.dm | 2 +- code/modules/projectiles/projectile/change.dm | 1 - code/modules/projectiles/projectile/energy.dm | 1 - code/modules/projectiles/projectile/force.dm | 2 +- 137 files changed, 197 insertions(+), 243 deletions(-) diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm index 5a61859e41..5441f83cca 100644 --- a/code/game/objects/items/contraband.dm +++ b/code/game/objects/items/contraband.dm @@ -27,4 +27,4 @@ new /obj/item/weapon/reagent_containers/pill/zoom( src ) new /obj/item/weapon/reagent_containers/pill/zoom( src ) new /obj/item/weapon/reagent_containers/pill/zoom( src ) - new /obj/item/weapon/reagent_containers/pill/zoom( src ) \ No newline at end of file + new /obj/item/weapon/reagent_containers/pill/zoom( src ) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 7a8b8efc63..16bde74e69 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -1414,4 +1414,4 @@ var/global/list/obj/item/device/pda/PDAs = list() // Pass along the pulse to atoms in contents, largely added so pAIs are vulnerable to EMP /obj/item/device/pda/emp_act(severity) for(var/atom/A in src) - A.emp_act(severity) \ No newline at end of file + A.emp_act(severity) diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index 7767ecd307..f1f5b9502a 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -173,4 +173,4 @@ var/obj/item/rig_module/module = src.loc.loc if(!module.holder || !direction) return - module.holder.forced_move(direction)*/ \ No newline at end of file + module.holder.forced_move(direction)*/ diff --git a/code/game/objects/items/devices/binoculars.dm b/code/game/objects/items/devices/binoculars.dm index e1c7b18a72..0cafa7679c 100644 --- a/code/game/objects/items/devices/binoculars.dm +++ b/code/game/objects/items/devices/binoculars.dm @@ -15,4 +15,4 @@ /obj/item/device/binoculars/attack_self(mob/user) - zoom() \ No newline at end of file + zoom() diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 23ae4724bc..978cfdb304 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -142,4 +142,4 @@ /obj/effect/dummy/chameleon/Del() master.disrupt(0) - ..() \ No newline at end of file + ..() diff --git a/code/game/objects/items/devices/debugger.dm b/code/game/objects/items/devices/debugger.dm index 3e952671a0..3168e00feb 100644 --- a/code/game/objects/items/devices/debugger.dm +++ b/code/game/objects/items/devices/debugger.dm @@ -5,9 +5,9 @@ */ /obj/item/device/debugger - icon = 'icons/obj/hacktool.dmi' name = "debugger" desc = "Used to debug electronic equipment." + icon = 'icons/obj/hacktool.dmi' icon_state = "hacktool-g" flags = FPRINT | TABLEPASS| CONDUCT force = 5.0 @@ -43,4 +43,4 @@ user << "\red There is a software error with the device." else user << "\blue The device's software appears to be fine." - return 1 \ No newline at end of file + return 1 diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 14f22059ad..35ff3b720a 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -223,4 +223,4 @@ icon_state = initial(icon_state) /obj/item/device/flashlight/slime/attack_self(mob/user) - return //Bio-luminescence does not toggle. \ No newline at end of file + return //Bio-luminescence does not toggle. diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index ff9ffbcda3..c6238f2648 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -191,4 +191,4 @@ #undef LIGHT_OK #undef LIGHT_EMPTY #undef LIGHT_BROKEN -#undef LIGHT_BURNED \ No newline at end of file +#undef LIGHT_BURNED diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 371fe3b8c4..db79c6390b 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -52,4 +52,4 @@ emagged = 1 insults = rand(1, 3)//to prevent dickflooding return - return \ No newline at end of file + return diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm index e038d13760..8788eaf0f2 100644 --- a/code/game/objects/items/devices/modkit.dm +++ b/code/game/objects/items/devices/modkit.dm @@ -69,4 +69,4 @@ /obj/item/device/modkit/tajaran name = "tajaran hardsuit modification kit" desc = "A kit containing all the needed tools and parts to modify a hardsuit for another user. This one looks like it's meant for Tajaran." - target_species = "Tajara" \ No newline at end of file + target_species = "Tajara" diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 2a5df89510..6378f8823f 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -19,4 +19,4 @@ matter = list("metal" = 50,"glass" = 20) origin_tech = "magnets=1;engineering=1" - var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage \ No newline at end of file + var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index d328169d1e..e8ca9c3929 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -1,8 +1,8 @@ // Powersink - used to drain station power /obj/item/device/powersink - desc = "A nulling power sink which drains energy from electrical systems." name = "power sink" + desc = "A nulling power sink which drains energy from electrical systems." icon_state = "powersink0" item_state = "electronic" w_class = 4.0 diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index de084253bf..ef332fa336 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -46,4 +46,4 @@ new /obj/machinery/power/singularity_beacon/syndicate( user.loc ) playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) del(src) - return \ No newline at end of file + return diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 3e57d9d03c..bfc9e8f69b 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -31,7 +31,7 @@ return user << "The following channels are built-in:" - user << radio_desc + user << radio_desc /obj/item/device/radio/headset/handle_message_mode(mob/living/M as mob, message, channel) if (channel == "special") @@ -61,7 +61,7 @@ /obj/item/device/radio/headset/binary origin_tech = "syndicate=3" - ks1type = /obj/item/device/encryptionkey/binary + ks1type = /obj/item/device/encryptionkey/binary /obj/item/device/radio/headset/headset_sec name = "security radio headset" diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index 21ed5cf2aa..f32b5256b5 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -182,4 +182,4 @@ if (cell) user << "The charge meter reads [round(cell.percent())]%." else - user << "It doesn't have a power cell installed." \ No newline at end of file + user << "It doesn't have a power cell installed." diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 88f5ad1830..f5e43436b9 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -1,6 +1,6 @@ /obj/item/device/taperecorder - desc = "A device that can record up to an hour of dialogue and play it back. It automatically translates the content in playback." name = "universal recorder" + desc = "A device that can record up to an hour of dialogue and play it back. It automatically translates the content in playback." icon_state = "taperecorderidle" item_state = "analyzer" w_class = 2.0 diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 33149b06a4..52e5e220f2 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -29,7 +29,6 @@ effective or pretty fucking useless. var/times_used = 0 //Number of times it's been used. var/max_uses = 2 - /obj/item/device/batterer/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0) if(!user) return if(times_used >= max_uses) @@ -55,7 +54,3 @@ effective or pretty fucking useless. times_used += 1 if(times_used >= max_uses) icon_state = "battererburnt" - - - - diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 8cace9a223..36c3b3d11f 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -1,8 +1,8 @@ /obj/item/device/transfer_valve - icon = 'icons/obj/assemblies.dmi' name = "tank transfer valve" - icon_state = "valve_1" desc = "Regulates the transfer of air between two tanks" + icon = 'icons/obj/assemblies.dmi' + icon_state = "valve_1" var/obj/item/weapon/tank/tank_one var/obj/item/weapon/tank/tank_two var/obj/item/device/attached_device @@ -210,4 +210,4 @@ // this doesn't do anything but the timer etc. expects it to be here // eventually maybe have it update icon to show state (timer, prox etc.) like old bombs /obj/item/device/transfer_valve/proc/c_state() - return \ No newline at end of file + return diff --git a/code/game/objects/items/devices/violin.dm b/code/game/objects/items/devices/violin.dm index 63f7828fc8..e116689c9a 100644 --- a/code/game/objects/items/devices/violin.dm +++ b/code/game/objects/items/devices/violin.dm @@ -390,4 +390,4 @@ for(var/mob/M in viewers(1, loc)) if((M.client && M.machine == src)) attack_self(M) - return \ No newline at end of file + return diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm index 3100b91434..befba4b133 100644 --- a/code/game/objects/items/devices/whistle.dm +++ b/code/game/objects/items/devices/whistle.dm @@ -35,4 +35,4 @@ emagged = 1 insults = rand(1, 3)//to prevent dickflooding return - return \ No newline at end of file + return diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm index db77317ead..e341a8747f 100644 --- a/code/game/objects/items/latexballoon.dm +++ b/code/game/objects/items/latexballoon.dm @@ -45,4 +45,4 @@ /obj/item/latexballon/attackby(obj/item/W as obj, mob/user as mob) if (can_puncture(W)) - burst() \ No newline at end of file + burst() diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index 2f0b67d31d..1d92cb9a81 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -178,4 +178,4 @@ b2y1 = pixel_y + pick(1,1,1,1,2,2,3,3,4) b2y2 = pixel_y - pick(1,1,1,1,2,2,3,3,4) - Target.bulletholes.Add(src) \ No newline at end of file + Target.bulletholes.Add(src) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index eeca2089ee..c87b57b043 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -259,4 +259,4 @@ return affecting.status |= ORGAN_SPLINTED use(1) - return \ No newline at end of file + return diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm index db0ab6b088..798c6c0511 100644 --- a/code/game/objects/items/stacks/nanopaste.dm +++ b/code/game/objects/items/stacks/nanopaste.dm @@ -42,4 +42,4 @@ if (do_surgery(H,user,src)) return else - user << "Nothing to fix in here." \ No newline at end of file + user << "Nothing to fix in here." diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 72339452e7..a3e7ed53e2 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -133,4 +133,4 @@ var/obj/item/stack/sheet/leather/HS = new(src.loc) HS.amount = 1 wetness = initial(wetness) - src.use(1) \ No newline at end of file + src.use(1) diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 530c9b5b88..f3b8face4e 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -200,4 +200,4 @@ obj/item/stack/sheet/mineral/iron/New() sheettype = "osmium" origin_tech = "materials=5" color = "#9999FF" - perunit = 2000 \ No newline at end of file + perunit = 2000 diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index de2973fc79..907bbdf249 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -200,4 +200,4 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( \ /obj/item/stack/sheet/cardboard/New(var/loc, var/amount=null) recipes = cardboard_recipes - return ..() \ No newline at end of file + return ..() diff --git a/code/game/objects/items/stacks/sheets/sheets.dm b/code/game/objects/items/stacks/sheets/sheets.dm index fdcc6747b6..b140b4e6fd 100644 --- a/code/game/objects/items/stacks/sheets/sheets.dm +++ b/code/game/objects/items/stacks/sheets/sheets.dm @@ -23,4 +23,4 @@ else for (var/obj/item/stack/sheet/stack in locate(src.x,src.y,src.z)) S.add(stack,user) - ..()*/ \ No newline at end of file + ..()*/ diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index c3fa049b17..e14c7f2b1e 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -265,4 +265,4 @@ New(title, recipes, req_amount = 1) src.title = title src.recipes = recipes - src.req_amount = req_amount \ No newline at end of file + src.req_amount = req_amount diff --git a/code/game/objects/items/stacks/tiles/light.dm b/code/game/objects/items/stacks/tiles/light.dm index e869c8d0ee..f346d216a7 100644 --- a/code/game/objects/items/stacks/tiles/light.dm +++ b/code/game/objects/items/stacks/tiles/light.dm @@ -33,4 +33,4 @@ new/obj/item/stack/light_w(user.loc) if(amount <= 0) user.drop_from_inventory(src) - del(src) \ No newline at end of file + del(src) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 7ca0d4b223..837824bf39 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -113,7 +113,7 @@ * Fake singularity */ /obj/item/toy/spinningtoy - name = "Gravitational Singularity" + name = "gravitational singularity" desc = "\"Singulo\" brand spinning toy." icon = 'icons/obj/singularity.dmi' icon_state = "singularity_s1" @@ -420,7 +420,7 @@ * Water flower */ /obj/item/toy/waterflower - name = "Water Flower" + name = "water flower" desc = "A seemingly innocent sunflower...with a twist." icon = 'icons/obj/harvest.dmi' icon_state = "sunflower" @@ -645,4 +645,4 @@ item_state = "inflatable" flags = FPRINT | TABLEPASS icon = 'icons/obj/clothing/belts.dmi' - slot_flags = SLOT_BELT \ No newline at end of file + slot_flags = SLOT_BELT diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 756812ccb1..fb86d964c6 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -2,56 +2,71 @@ //TODO: Make this an item var or something... //Added by Jack Rost -/obj/item/trash - icon = 'icons/obj/trash.dmi' +obj/item/trash + icon = 'iconsobj/trash.dmi' w_class = 2.0 desc = "This is rubbish." - raisins - name = "4no raisins" + +obj/item/trash/raisins + name = "\improper 4no raisins" icon_state= "4no_raisins" - candy - name = "Candy" + +obj/item/trash/candy + name = "candy" icon_state= "candy" - cheesie - name = "Cheesie honkers" + +obj/item/trash/cheesie + name = "\improper Cheesie Honkers" icon_state = "cheesie_honkers" - chips - name = "Chips" + +obj/item/trash/chips + name = "chips" icon_state = "chips" - popcorn - name = "Popcorn" + +obj/item/trash/popcorn + name = "popcorn" icon_state = "popcorn" - sosjerky + +obj/item/trash/sosjerky name = "Scaredy's Private Reserve Beef Jerky" icon_state = "sosjerky" - syndi_cakes - name = "Syndi cakes" + +obj/item/trash/syndi_cakes + name = "syndi cakes" icon_state = "syndi_cakes" - waffles - name = "Waffles" + +obj/item/trash/waffles + name = "waffles" icon_state = "waffles" - plate - name = "Plate" + +obj/item/trash/plate + name = "plate" icon_state = "plate" - snack_bowl - name = "Snack bowl" + +obj/item/trash/snack_bowl + name = "snack bowl" icon_state = "snack_bowl" - pistachios - name = "Pistachios pack" + +obj/item/trash/pistachios + name = "pistachios pack" icon_state = "pistachios_pack" - semki - name = "Semki pack" + +obj/item/trash/semki + name = "semki pack" icon_state = "semki_pack" - tray - name = "Tray" + +obj/item/trash/tray + name = "tray" icon_state = "tray" - candle + +obj/item/trash/candle name = "candle" - icon = 'icons/obj/candle.dmi' + icon = 'iconsobj/candle.dmi' icon_state = "candle4" - liquidfood + +obj/item/trash/liquidfood name = "\improper \"LiquidFood\" ration" icon_state = "liquidfood" -/obj/item/trash/attack(mob/M as mob, mob/living/user as mob) +obj/item/trash/attack(mob/M as mob, mob/living/user as mob) return diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index d08377a704..fb79d5307f 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -1,6 +1,6 @@ //Contains the rapid construction device. /obj/item/weapon/rcd - name = "rapid-construction-device (RCD)" + name = "rapid construction device (RCD)" desc = "A device used to rapidly build walls and floors." icon = 'icons/obj/items.dmi' icon_state = "rcd" @@ -174,4 +174,4 @@ return 0 /obj/item/weapon/rcd/mounted/attackby() - return \ No newline at end of file + return diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index 45e66d80be..f9f32bbeb1 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -112,4 +112,4 @@ RSF R.cell.use(used_energy) else stored_matter-- - user << "The RSF now holds [stored_matter]/30 fabrication-units." \ No newline at end of file + user << "The RSF now holds [stored_matter]/30 fabrication-units." diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index 3ae5094dd0..fe6e94ad07 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -65,4 +65,4 @@ src.add_fingerprint(user) spawn(20) spam_flag = 0 - return \ No newline at end of file + return diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index 72c4589343..c0db7773a8 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -26,4 +26,4 @@ icon_state = "[name][result]" user.visible_message("[user] has thrown [src]. It lands on [result]. [comment]", \ "You throw [src]. It lands on a [result]. [comment]", \ - "You hear [src] landing on a [result]. [comment]") \ No newline at end of file + "You hear [src] landing on a [result]. [comment]") diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index 0a0545b513..364fe8e747 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -144,4 +144,4 @@ step(user, user.inertia_dir) else return ..() - return \ No newline at end of file + return diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index e16b9dd38c..3830f105fd 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -218,4 +218,4 @@ igniter.secured = 0 status = 1 update_icon() - return \ No newline at end of file + return diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index 9b5007166d..e96d036721 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -187,4 +187,4 @@ else user << "\blue You need more paper." else - user << "They are moving around too much. A straightjacket would help." \ No newline at end of file + user << "They are moving around too much. A straightjacket would help." diff --git a/code/game/objects/items/weapons/grenades/emgrenade.dm b/code/game/objects/items/weapons/grenades/emgrenade.dm index 9edf68a60a..3446fa46c3 100644 --- a/code/game/objects/items/weapons/grenades/emgrenade.dm +++ b/code/game/objects/items/weapons/grenades/emgrenade.dm @@ -9,4 +9,3 @@ if(empulse(src, 4, 10)) del(src) return - diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index f5ad4fa9fd..f9120d5491 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -180,4 +180,4 @@ var/dettime = rand(15,60) spawn(dettime) prime() - ..() \ No newline at end of file + ..() diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 46854c6a2a..d1fb667e99 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -108,4 +108,4 @@ /obj/item/weapon/grenade/attack_hand() walk(src, null, null) ..() - return \ No newline at end of file + return diff --git a/code/game/objects/items/weapons/grenades/spawnergrenade.dm b/code/game/objects/items/weapons/grenades/spawnergrenade.dm index 31b06ef5b7..8b6b6e938d 100644 --- a/code/game/objects/items/weapons/grenades/spawnergrenade.dm +++ b/code/game/objects/items/weapons/grenades/spawnergrenade.dm @@ -41,4 +41,4 @@ name = "carp delivery grenade" spawner_type = /mob/living/simple_animal/hostile/carp deliveryamt = 5 - origin_tech = "materials=3;magnets=4;syndicate=4" \ No newline at end of file + origin_tech = "materials=3;magnets=4;syndicate=4" diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 531c8fa7ee..a1ea44daa9 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -166,4 +166,4 @@ var/last_chew = 0 if(!C) return if(p_loc == user.loc && p_loc_m == C.loc) C.handcuffed = new /obj/item/weapon/handcuffs(C) - C.update_inv_handcuffed() \ No newline at end of file + C.update_inv_handcuffed() diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 89e265aed8..c45ed4eac8 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -498,4 +498,4 @@ the implant may become unstable and either pre-maturely inject the subject or si return 1 islegal() - return 0 \ No newline at end of file + return 0 diff --git a/code/game/objects/items/weapons/implants/implantfreedom.dm b/code/game/objects/items/weapons/implants/implantfreedom.dm index 58d73d835a..d7be368665 100644 --- a/code/game/objects/items/weapons/implants/implantfreedom.dm +++ b/code/game/objects/items/weapons/implants/implantfreedom.dm @@ -67,5 +67,3 @@ mechanisms
life can drive down to only 1 use.
No Implant Specifics"} return dat - - diff --git a/code/game/objects/items/weapons/implants/implantuplink.dm b/code/game/objects/items/weapons/implants/implantuplink.dm index 2cba026e32..0469cd56d5 100644 --- a/code/game/objects/items/weapons/implants/implantuplink.dm +++ b/code/game/objects/items/weapons/implants/implantuplink.dm @@ -20,4 +20,4 @@ /obj/item/weapon/implant/uplink/trigger(emote, mob/source as mob) if(hidden_uplink && usr == source) // Let's not have another people activate our uplink hidden_uplink.check_trigger(source, emote, activation_emote) - return \ No newline at end of file + return diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 3b3e611575..36dbc26537 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -13,4 +13,4 @@ suicide_act(mob/user) viewers(user) << "\red [user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide." - return (OXYLOSS) \ No newline at end of file + return (OXYLOSS) diff --git a/code/game/objects/items/weapons/paiwire.dm b/code/game/objects/items/weapons/paiwire.dm index 83bc76517a..990453f423 100644 --- a/code/game/objects/items/weapons/paiwire.dm +++ b/code/game/objects/items/weapons/paiwire.dm @@ -8,4 +8,4 @@ user.visible_message("[user] dumbly fumbles to find a place on [M] to plug in [src].", "There aren't any ports on [M] that match the jack belonging to [src].") /obj/item/weapon/pai_cable/attack(obj/machinery/M as obj, mob/user as mob) - src.plugin(M, user) \ No newline at end of file + src.plugin(M, user) diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm index fbaab9a301..e9aa6f3ca6 100644 --- a/code/game/objects/items/weapons/scrolls.dm +++ b/code/game/objects/items/weapons/scrolls.dm @@ -87,4 +87,4 @@ user.loc = pick(L) smoke.start() - src.uses -= 1 \ No newline at end of file + src.uses -= 1 diff --git a/code/game/objects/items/weapons/shards.dm b/code/game/objects/items/weapons/shards.dm index 0ecbe900d2..8bd126584c 100644 --- a/code/game/objects/items/weapons/shards.dm +++ b/code/game/objects/items/weapons/shards.dm @@ -111,4 +111,4 @@ src.pixel_x = rand(-5, 5) src.pixel_y = rand(-5, 5) else - return \ No newline at end of file + return diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 972c639f74..0304aac95e 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -252,4 +252,4 @@ /obj/item/weapon/storage/backpack/ert/medical name = "emergency response team medical backpack" desc = "A spacious backpack with lots of pockets, worn by medical members of a Nanotrasen Emergency Response Team." - icon_state = "ert_medical" \ No newline at end of file + icon_state = "ert_medical" diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 82d3f78b0e..64d8e89bb7 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -281,4 +281,4 @@ /obj/item/weapon/storage/lockbox/vials/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() - update_icon() \ No newline at end of file + update_icon() diff --git a/code/game/objects/items/weapons/storage/internal.dm b/code/game/objects/items/weapons/storage/internal.dm index 67205c7619..082002a5b9 100644 --- a/code/game/objects/items/weapons/storage/internal.dm +++ b/code/game/objects/items/weapons/storage/internal.dm @@ -82,4 +82,4 @@ return 1 /obj/item/weapon/storage/internal/Adjacent(var/atom/neighbor) - return master_item.Adjacent(neighbor) \ No newline at end of file + return master_item.Adjacent(neighbor) diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 12078e0add..2e1d4d2a4c 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -492,4 +492,4 @@ if (!cur_atom) return -1 //inside something with a null loc. - return depth \ No newline at end of file + return depth diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index 2c25e8adac..b6b11af106 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -83,4 +83,4 @@ new /obj/item/weapon/crowbar(src) new /obj/item/stack/cable_coil(src,30,color) new /obj/item/weapon/wirecutters(src) - new /obj/item/device/multitool(src) \ No newline at end of file + new /obj/item/device/multitool(src) diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index d3726f823f..2605dca5b3 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -139,4 +139,4 @@ new /obj/item/clothing/mask/chameleon(src) new /obj/item/clothing/glasses/chameleon(src) new /obj/item/weapon/gun/projectile/chameleon(src) - new /obj/item/ammo_magazine/chameleon(src) \ No newline at end of file + new /obj/item/ammo_magazine/chameleon(src) diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index 8f6579c830..505263cf46 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -88,4 +88,4 @@ if(item2_type) new item2_type(src) if(item3_type) - new item3_type(src) \ No newline at end of file + new item3_type(src) diff --git a/code/game/objects/items/weapons/surgery_limbattachment.dm b/code/game/objects/items/weapons/surgery_limbattachment.dm index 04f0ac5db7..e5a65ba9c7 100644 --- a/code/game/objects/items/weapons/surgery_limbattachment.dm +++ b/code/game/objects/items/weapons/surgery_limbattachment.dm @@ -68,4 +68,4 @@ del(src) return 1 - return 0 \ No newline at end of file + return 0 diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index 3a0f29a3da..34516e875f 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -134,4 +134,3 @@ return else return ..() - diff --git a/code/game/objects/items/weapons/syndie.dm b/code/game/objects/items/weapons/syndie.dm index 4593bf932f..e205f20bb0 100644 --- a/code/game/objects/items/weapons/syndie.dm +++ b/code/game/objects/items/weapons/syndie.dm @@ -81,4 +81,4 @@ if("Close the lighter.") src.icon_state = "c-4detonator_0" user << "You close the lighter." - pr_open = 0 \ No newline at end of file + pr_open = 0 diff --git a/code/game/objects/items/weapons/table_rack_parts.dm b/code/game/objects/items/weapons/table_rack_parts.dm index 50a2c8a2e4..1082723b24 100644 --- a/code/game/objects/items/weapons/table_rack_parts.dm +++ b/code/game/objects/items/weapons/table_rack_parts.dm @@ -121,4 +121,4 @@ R.add_fingerprint(user) user.drop_item() del(src) - return \ No newline at end of file + return diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index 07dc6638a9..422af1d652 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -144,4 +144,4 @@ if(allgases >= 0.005) return 1 del(G) - return \ No newline at end of file + return diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm index 0514e7d1d2..2d82cacaad 100644 --- a/code/game/objects/items/weapons/tape.dm +++ b/code/game/objects/items/weapons/tape.dm @@ -87,4 +87,4 @@ if(dir_offset & NORTH) pixel_y += 32 else if(dir_offset & SOUTH) - pixel_y -= 32 \ No newline at end of file + pixel_y -= 32 diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index 8472723f48..e04a5f0888 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -172,5 +172,3 @@ Frequency: P.creator = src src.add_fingerprint(user) return - - diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 214044a88e..a0ea6d9712 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -394,20 +394,20 @@ /obj/item/weapon/weldingtool/largetank - name = "Industrial Welding Tool" + name = "industrial welding tool" max_fuel = 40 matter = list("metal" = 70, "glass" = 60) origin_tech = "engineering=2" /obj/item/weapon/weldingtool/hugetank - name = "Upgraded Welding Tool" + name = "upgraded welding tool" max_fuel = 80 w_class = 3.0 matter = list("metal" = 70, "glass" = 120) origin_tech = "engineering=3" /obj/item/weapon/weldingtool/experimental - name = "Experimental Welding Tool" + name = "experimental welding tool" max_fuel = 40 w_class = 3.0 matter = list("metal" = 70, "glass" = 120) @@ -518,4 +518,4 @@ var/resolved = target.attackby(tool,user) if(!resolved && tool && target) tool.afterattack(target,user,1) - return 1 \ No newline at end of file + return 1 diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 70485e67a2..0c32f4c022 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -198,4 +198,3 @@ /obj/item/weapon/twohanded/spear/update_icon() icon_state = "spearglass[wielded]" return - diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 405e41aab2..a584f3db4b 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -482,4 +482,4 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob) /obj/effect/energy_net/attackby(obj/item/weapon/W as obj, mob/user as mob) health -= W.force healthcheck() - ..() \ No newline at end of file + ..() diff --git a/code/game/objects/items/weapons/wires.dm b/code/game/objects/items/weapons/wires.dm index 284be5284c..df2033f887 100644 --- a/code/game/objects/items/weapons/wires.dm +++ b/code/game/objects/items/weapons/wires.dm @@ -16,5 +16,3 @@ else user << "\blue You are not using this to lay wire..." return - - diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index 9a0a0d4fe0..53f4cc0903 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -103,4 +103,4 @@ prob(2);/obj/random/toolbox,\ prob(2);/obj/item/weapon/storage/belt/utility,\ prob(5);/obj/random/tool,\ - prob(2);/obj/item/weapon/tape_roll) \ No newline at end of file + prob(2);/obj/item/weapon/tape_roll) diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm index 8ef3fd463d..68681f081a 100644 --- a/code/game/objects/structures/barsign.dm +++ b/code/game/objects/structures/barsign.dm @@ -21,4 +21,4 @@ else sign_type = replacetext(lowertext(sign_type), " ", "") // lowercase, strip spaces - along with choices for user options, avoids huge if-else-else src.ChangeSign(sign_type) - user << "You change the barsign." \ No newline at end of file + user << "You change the barsign." diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 8a3cccae46..d838d41e5b 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -93,8 +93,6 @@ LINEN BINS item_color = "brown" - - /obj/structure/bedsheetbin name = "linen bin" desc = "A linen bin. It looks rather cosy." @@ -183,4 +181,4 @@ LINEN BINS hidden = null - add_fingerprint(user) \ No newline at end of file + add_fingerprint(user) diff --git a/code/game/objects/structures/coathanger.dm b/code/game/objects/structures/coathanger.dm index 0d09d57c64..155c1a575d 100644 --- a/code/game/objects/structures/coathanger.dm +++ b/code/game/objects/structures/coathanger.dm @@ -50,4 +50,4 @@ if (istype(coat, /obj/item/clothing/suit/storage/toggle/labcoat/cmo)) overlays += image(icon, icon_state = "coat_cmo") if (istype(coat, /obj/item/clothing/suit/storage/det_suit)) - overlays += image(icon, icon_state = "coat_det") \ No newline at end of file + overlays += image(icon, icon_state = "coat_det") diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 8ff522a858..a929ff7201 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -305,4 +305,4 @@ visible_message("[user] [attack_message] the [src]!") dump_contents() spawn(1) del(src) - return 1 \ No newline at end of file + return 1 diff --git a/code/game/objects/structures/crates_lockers/closets/coffin.dm b/code/game/objects/structures/crates_lockers/closets/coffin.dm index 256f72522e..67de5d38b9 100644 --- a/code/game/objects/structures/crates_lockers/closets/coffin.dm +++ b/code/game/objects/structures/crates_lockers/closets/coffin.dm @@ -9,4 +9,4 @@ if(!opened) icon_state = icon_closed else - icon_state = icon_opened \ No newline at end of file + icon_state = icon_opened diff --git a/code/game/objects/structures/crates_lockers/closets/crittercrate.dm b/code/game/objects/structures/crates_lockers/closets/crittercrate.dm index d3ab79e768..3546cd52e7 100644 --- a/code/game/objects/structures/crates_lockers/closets/crittercrate.dm +++ b/code/game/objects/structures/crates_lockers/closets/crittercrate.dm @@ -3,4 +3,4 @@ desc = "A crate which can sustain life for a while." icon_state = "critter" icon_opened = "critteropen" - icon_closed = "critter" \ No newline at end of file + icon_closed = "critter" diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm index 178172c440..0728a9befa 100644 --- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm +++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm @@ -207,4 +207,4 @@ return close() - return \ No newline at end of file + return diff --git a/code/game/objects/structures/crates_lockers/closets/fitness.dm b/code/game/objects/structures/crates_lockers/closets/fitness.dm index 6536e065e5..05e7968a93 100644 --- a/code/game/objects/structures/crates_lockers/closets/fitness.dm +++ b/code/game/objects/structures/crates_lockers/closets/fitness.dm @@ -71,4 +71,4 @@ new /obj/item/weapon/gun/energy/laser/bluetag(src) new /obj/item/weapon/gun/energy/laser/bluetag(src) new /obj/item/clothing/suit/bluetag(src) - new /obj/item/clothing/suit/bluetag(src) \ No newline at end of file + new /obj/item/clothing/suit/bluetag(src) diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm index 62412f1093..1a62db2dfb 100644 --- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm +++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm @@ -134,4 +134,3 @@ new /obj/item/clothing/head/helmet/thunderdome(src) new /obj/item/clothing/head/helmet/thunderdome(src) new /obj/item/clothing/head/helmet/thunderdome(src) - diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 824e52d8bc..7113c1b45a 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -97,4 +97,4 @@ new /obj/item/clothing/under/lawyer/purpsuit(src) new /obj/item/clothing/suit/storage/lawyer/purpjacket(src) new /obj/item/clothing/shoes/brown(src) - new /obj/item/clothing/shoes/black(src) \ No newline at end of file + new /obj/item/clothing/shoes/black(src) diff --git a/code/game/objects/structures/crates_lockers/closets/l3closet.dm b/code/game/objects/structures/crates_lockers/closets/l3closet.dm index a6890430ef..bb5fe26e4f 100644 --- a/code/game/objects/structures/crates_lockers/closets/l3closet.dm +++ b/code/game/objects/structures/crates_lockers/closets/l3closet.dm @@ -70,4 +70,4 @@ ..() contents = list() new /obj/item/clothing/suit/bio_suit/scientist( src ) - new /obj/item/clothing/head/bio_hood/scientist( src ) \ No newline at end of file + new /obj/item/clothing/head/bio_hood/scientist( src ) diff --git a/code/game/objects/structures/crates_lockers/closets/malfunction.dm b/code/game/objects/structures/crates_lockers/closets/malfunction.dm index 02b81a13e0..bd17ba9841 100644 --- a/code/game/objects/structures/crates_lockers/closets/malfunction.dm +++ b/code/game/objects/structures/crates_lockers/closets/malfunction.dm @@ -1,4 +1,3 @@ - /obj/structure/closet/malf/suits desc = "It's a storage unit for operational gear." icon_state = "syndicate" @@ -13,4 +12,4 @@ new /obj/item/clothing/suit/space/void(src) new /obj/item/weapon/crowbar(src) new /obj/item/weapon/cell(src) - new /obj/item/device/multitool(src) \ No newline at end of file + new /obj/item/device/multitool(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm index 7f8192156d..96a7e8131a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm @@ -33,4 +33,4 @@ else icon_state = icon_closed else - icon_state = icon_opened \ No newline at end of file + icon_state = icon_opened diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index 6859800f78..a28e629a98 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -40,4 +40,4 @@ new /obj/item/clothing/mask/gas(src) new /obj/item/clothing/glasses/meson(src) new /obj/item/clothing/head/soft(src) - return \ No newline at end of file + return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index 13711ca6f6..0513efd943 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -91,11 +91,3 @@ for(var/i = 0, i < 6, i++) new /obj/item/weapon/spacecash/c200(src) return - - - - - - - - diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm index 8fb8b0c92c..969185741d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm @@ -50,4 +50,4 @@ else if (locked) overlays += icon(src.icon,"locked") else - overlays += icon(src.icon,"open") \ No newline at end of file + overlays += icon(src.icon,"open") diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm index 5ad3d8c6e0..2a1547e4ba 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm @@ -24,4 +24,4 @@ new /obj/item/weapon/minihoe(src) new /obj/item/weapon/hatchet(src) // new /obj/item/weapon/bee_net(src) //No more bees, March 2014 - return \ No newline at end of file + return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index 867dc9cd91..8fc77c5b92 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -1,6 +1,6 @@ /obj/structure/closet/secure_closet/personal - desc = "It's a secure locker for personnel. The first card swiped gains control." name = "personal closet" + desc = "It's a secure locker for personnel. The first card swiped gains control." req_access = list(access_all_personal_lockers) var/registered_name = null @@ -120,4 +120,4 @@ src.icon_state = src.icon_locked src.registered_name = null src.desc = "It's a secure locker for personnel. The first card swiped gains control." - return \ No newline at end of file + return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index 2cef42a82b..0578b79356 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -48,4 +48,4 @@ new /obj/item/weapon/tank/air(src) new /obj/item/clothing/mask/gas(src) new /obj/item/device/flash(src) - return \ No newline at end of file + return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index 479fdcb262..09810842d4 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -128,4 +128,4 @@ if(welded) overlays += "welded" else - icon_state = icon_opened \ No newline at end of file + icon_state = icon_opened diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index 3e95b5837d..2f6b66e5ce 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -144,4 +144,4 @@ var/obj/item/stack/R = new res(src) R.amount = R.max_amount - return \ No newline at end of file + return diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index 090b2c8145..fd548974af 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -230,4 +230,4 @@ if(!opened) icon_state = icon_closed else - icon_state = icon_opened \ No newline at end of file + icon_state = icon_opened diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 1df0557097..d2d26ec0b5 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -420,4 +420,4 @@ new /obj/item/clothing/under/suit_jacket/female(src) new /obj/item/clothing/under/suit_jacket/really_black(src) new /obj/item/clothing/under/suit_jacket/red(src) - new /obj/item/clothing/under/scratch(src) \ No newline at end of file + new /obj/item/clothing/under/scratch(src) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 998328a1bf..3f6f321129 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -486,4 +486,4 @@ // new /obj/item/weapon/weedspray(src) // new /obj/item/weapon/pestspray(src) // new /obj/item/weapon/pestspray(src) -// new /obj/item/weapon/pestspray(src) \ No newline at end of file +// new /obj/item/weapon/pestspray(src) diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index 9f7795b988..e9fdd40966 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -77,4 +77,4 @@ ME.attach(H) ME = new /obj/item/mecha_parts/mecha_equipment/tool/passenger ME.attach(H) - ..() \ No newline at end of file + ..() diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm index e48e8419d2..741dc371db 100644 --- a/code/game/objects/structures/curtains.dm +++ b/code/game/objects/structures/curtains.dm @@ -1,6 +1,6 @@ /obj/structure/curtain - icon = 'icons/obj/curtain.dmi' name = "curtain" + icon = 'icons/obj/curtain.dmi' icon_state = "closed" layer = MOB_LAYER + 0.1 opacity = 1 diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index f30e0e2545..0ab10debe9 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -92,5 +92,3 @@ src.health -= 2 healthcheck() return - - diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 9fbf63ba18..b53f086291 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -1,7 +1,6 @@ obj/structure/door_assembly - icon = 'icons/obj/doors/door_assembly.dmi' - name = "airlock assembly" + icon = 'icons/obj/doors/door_assembly.dmi' icon_state = "door_as_0" anchored = 0 density = 1 @@ -17,91 +16,91 @@ obj/structure/door_assembly New() update_state() - door_assembly_com +obj/structure/door_assembly/door_assembly_com base_icon_state = "com" base_name = "Command Airlock" glass_type = "/glass_command" airlock_type = "/command" - door_assembly_sec +obj/structure/door_assembly/door_assembly_sec base_icon_state = "sec" base_name = "Security Airlock" glass_type = "/glass_security" airlock_type = "/security" - door_assembly_eng +obj/structure/door_assembly/door_assembly_eng base_icon_state = "eng" base_name = "Engineering Airlock" glass_type = "/glass_engineering" airlock_type = "/engineering" - door_assembly_min +obj/structure/door_assembly/door_assembly_min base_icon_state = "min" base_name = "Mining Airlock" glass_type = "/glass_mining" airlock_type = "/mining" - door_assembly_atmo +obj/structure/door_assembly/door_assembly_atmo base_icon_state = "atmo" base_name = "Atmospherics Airlock" glass_type = "/glass_atmos" airlock_type = "/atmos" - door_assembly_research +obj/structure/door_assembly/door_assembly_research base_icon_state = "res" base_name = "Research Airlock" glass_type = "/glass_research" airlock_type = "/research" - door_assembly_science +obj/structure/door_assembly/door_assembly_science base_icon_state = "sci" base_name = "Science Airlock" glass_type = "/glass_science" airlock_type = "/science" - door_assembly_med +obj/structure/door_assembly/door_assembly_med base_icon_state = "med" base_name = "Medical Airlock" glass_type = "/glass_medical" airlock_type = "/medical" - door_assembly_mai +obj/structure/door_assembly/door_assembly_mai base_icon_state = "mai" base_name = "Maintenance Airlock" airlock_type = "/maintenance" glass = -1 - door_assembly_ext +obj/structure/door_assembly/door_assembly_ext base_icon_state = "ext" base_name = "External Airlock" airlock_type = "/external" glass = -1 - door_assembly_fre +obj/structure/door_assembly/door_assembly_fre base_icon_state = "fre" base_name = "Freezer Airlock" airlock_type = "/freezer" glass = -1 - door_assembly_hatch +obj/structure/door_assembly/door_assembly_hatch base_icon_state = "hatch" base_name = "Airtight Hatch" airlock_type = "/hatch" glass = -1 - door_assembly_mhatch +obj/structure/door_assembly/door_assembly_mhatch base_icon_state = "mhatch" base_name = "Maintenance Hatch" airlock_type = "/maintenance_hatch" glass = -1 - door_assembly_highsecurity // Borrowing this until WJohnston makes sprites for the assembly +obj/structure/door_assembly/door_assembly_highsecurity // Borrowing this until WJohnston makes sprites for the assembly base_icon_state = "highsec" base_name = "High Security Airlock" airlock_type = "/highsecurity" glass = -1 - multi_tile +obj/structure/door_assembly/multi_tile icon = 'icons/obj/doors/door_assembly2x1.dmi' dir = EAST var/width = 1 diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm index 28d9ebc623..da68071090 100644 --- a/code/game/objects/structures/electricchair.dm +++ b/code/game/objects/structures/electricchair.dm @@ -74,4 +74,4 @@ A.power_light = light A.updateicon() - return \ No newline at end of file + return diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 014ecae9ac..f68c7ae7cb 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -331,4 +331,3 @@ desc = "A wall with sandstone plating." icon_state = "" mineral = "sandstone" -//------------wtf?------------end \ No newline at end of file diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 85de4b62f5..71a87b18b4 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -193,4 +193,4 @@ /obj/structure/flora/ausbushes/fullgrass/New() ..() - icon_state = "fullgrass_[rand(1, 3)]" \ No newline at end of file + icon_state = "fullgrass_[rand(1, 3)]" diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index e3ae4353dd..5e0edbef0a 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -268,4 +268,4 @@ del(src) return else - return \ No newline at end of file + return diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 304710b578..9bb1cec396 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -1,6 +1,6 @@ /obj/structure/grille - desc = "A flimsy lattice of metal rods, with screws to secure it to the floor." name = "grille" + desc = "A flimsy lattice of metal rods, with screws to secure it to the floor." icon = 'icons/obj/structures.dmi' icon_state = "grille" density = 1 @@ -189,4 +189,4 @@ visible_message("[user] [attack_verb] the [src]!") health -= damage spawn(1) healthcheck() - return 1 + return 1 diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 535b73d3b5..0b542dd2bb 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -299,4 +299,4 @@ desc = "A keyring with a small steel key, and a pink fob reading \"Pussy Wagon\"." icon = 'icons/obj/vehicles.dmi' icon_state = "keys" - w_class = 1 \ No newline at end of file + w_class = 1 diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index 40becb871f..f480cdd977 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -75,4 +75,4 @@ new /obj/item/weapon/reagent_containers/food/snacks/xenomeat(src.loc) usr << "You remove the last piece of meat from the alien!" src.icon_state = "spike" - src.occupied = 0 \ No newline at end of file + src.occupied = 0 diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm index cce8a064c0..fc57ac4f8e 100644 --- a/code/game/objects/structures/ladders.dm +++ b/code/game/objects/structures/ladders.dm @@ -67,4 +67,4 @@ add_fingerprint(user) /obj/structure/ladder/attackby(obj/item/weapon/W, mob/user as mob) - return attack_hand(user) \ No newline at end of file + return attack_hand(user) diff --git a/code/game/objects/structures/lamarr_cage.dm b/code/game/objects/structures/lamarr_cage.dm index 4598e29f1a..6bbb8cfa24 100644 --- a/code/game/objects/structures/lamarr_cage.dm +++ b/code/game/objects/structures/lamarr_cage.dm @@ -98,4 +98,4 @@ gender = FEMALE /obj/item/clothing/mask/facehugger/lamarr/New()//to prevent deleting it if aliums are disabled - return \ No newline at end of file + return diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 672011cef9..a32af450d5 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -1,6 +1,6 @@ /obj/structure/lattice - desc = "A lightweight support lattice." name = "lattice" + desc = "A lightweight support lattice." icon = 'icons/obj/structures.dmi' icon_state = "latticefull" density = 0 diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index ff37b0bfb2..47d9f7289b 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -284,4 +284,3 @@ CheckHardness() playsound(loc, 'sound/effects/attackblob.ogg', 100, 1) ..() - diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index c2ac05c3c0..58e1a81b97 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -100,4 +100,4 @@ shatter() else user.visible_message("[user] hits [src] and bounces off!") - return 1 \ No newline at end of file + return 1 diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index d64e2d6ade..06aae9557b 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -24,4 +24,4 @@ else reagents.trans_to(I, 5) user << "You wet [I] in [src]." - playsound(loc, 'sound/effects/slosh.ogg', 25, 1) \ No newline at end of file + playsound(loc, 'sound/effects/slosh.ogg', 25, 1) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index e1c8427ecf..0b0c063af2 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -388,4 +388,3 @@ else usr << "\red Access denied." return - diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index 00946b8678..a219268d04 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -188,4 +188,4 @@ obj/structure/safe/meteorhit(obj/O as obj) /obj/structure/safe/floor/hide(var/intact) - invisibility = intact ? 101 : 0 \ No newline at end of file + invisibility = intact ? 101 : 0 diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 0e8e7d5850..16d84f6aad 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -175,4 +175,4 @@ icon_state = "officechair_white" /obj/structure/stool/bed/chair/office/dark - icon_state = "officechair_dark" \ No newline at end of file + icon_state = "officechair_dark" diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm index 0ed780ebdd..59a819b8b9 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm @@ -189,4 +189,4 @@ if(M == pulling) pulling = null usr.pulledby = null - ..() \ No newline at end of file + ..() diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 2dc9ae8057..983c2d61ad 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -584,4 +584,4 @@ return user.drop_item() if(W && W.loc) W.loc = src.loc - return \ No newline at end of file + return diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index 68ecbe0d87..4cea8bffc1 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -116,4 +116,4 @@ else usr << browse(null, "window=dispenser") return - return \ No newline at end of file + return diff --git a/code/game/objects/structures/target_stake.dm b/code/game/objects/structures/target_stake.dm index 2a8d7719b2..bf80024a5e 100644 --- a/code/game/objects/structures/target_stake.dm +++ b/code/game/objects/structures/target_stake.dm @@ -49,4 +49,4 @@ pinned_target.loc = get_turf(user) user << "You take the target out of the stake." - pinned_target = null \ No newline at end of file + pinned_target = null diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index bd02ce1b36..61a655cc32 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -165,4 +165,4 @@ brainmob.emp_damage += rand(10,20) if(3) brainmob.emp_damage += rand(0,10) - ..() \ No newline at end of file + ..() diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm index a755f33cff..fb678d9b4d 100644 --- a/code/modules/projectiles/guns/alien.dm +++ b/code/modules/projectiles/guns/alien.dm @@ -1,6 +1,5 @@ //Vox pinning weapon. /obj/item/weapon/gun/launcher/spikethrower - name = "Vox spike thrower" desc = "A vicious alien projectile weapon. Parts of it quiver gelatinously, as though the thing is insectile and alive." @@ -65,7 +64,6 @@ //This gun only functions for armalis. The on-sprite is too huge to render properly on other sprites. /obj/item/weapon/gun/energy/noisecannon - name = "alien heavy cannon" desc = "It's some kind of enormous alien weapon, as long as a man is tall." @@ -119,4 +117,4 @@ /obj/item/projectile/energy/sonic/proc/split() //TODO: create two more projectiles to either side of this one, fire at targets to the side of target turf. - return \ No newline at end of file + return diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index fb506def21..8a38a0325d 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -1,7 +1,7 @@ /obj/item/weapon/gun/energy - icon_state = "energy" name = "energy gun" desc = "A basic energy-based gun." + icon_state = "energy" fire_sound = 'sound/weapons/Taser.ogg' var/obj/item/weapon/cell/power_supply //What type of power cell this uses diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 9493dc0e14..394ac3a8f6 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -1,6 +1,6 @@ /obj/item/weapon/gun/energy/laser name = "laser carbine" - desc = "a basic weapon designed kill with concentrated energy bolts" + desc = "A basic weapon designed to kill with concentrated energy bolts." icon_state = "laser" item_state = "laser" fire_sound = 'sound/weapons/Laser.ogg' @@ -186,4 +186,4 @@ obj/item/weapon/gun/energy/laser/retro if(!power_supply) return 0 power_supply.give(100) update_icon() - return 1 \ No newline at end of file + return 1 diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm index b4ba69a5a0..55302d5c44 100644 --- a/code/modules/projectiles/guns/energy/pulse.dm +++ b/code/modules/projectiles/guns/energy/pulse.dm @@ -64,5 +64,4 @@ icon_state = "m1911-p" cell_type = "/obj/item/weapon/cell/infinite" - isHandgun() - return 1 \ No newline at end of file + isHandgun() return 1 diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index 38a78c31b8..91b64a1de4 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -1,4 +1,3 @@ - /obj/item/weapon/gun/energy/taser name = "taser gun" desc = "A small, low capacity gun used for non-lethal takedowns." @@ -10,12 +9,6 @@ cell_type = "/obj/item/weapon/cell/crap" /obj/item/weapon/gun/energy/taser/cyborg - name = "taser gun" - desc = "A small, low capacity gun used for non-lethal takedowns." - icon_state = "taser" - fire_sound = 'sound/weapons/Taser.ogg' - charge_cost = 100 - projectile_type = "/obj/item/projectile/beam/stun" cell_type = "/obj/item/weapon/cell/secborg" var/charge_tick = 0 var/recharge_time = 10 //Time it takes for shots to recharge (in ticks) @@ -107,5 +100,3 @@ force = 10 matter = list("metal" = 200000) projectile_type = "/obj/item/projectile/energy/bolt/large" - - diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index 372bcd4cf2..4d7195b6a5 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -3,8 +3,8 @@ #define MAGAZINE 2 /obj/item/weapon/gun/projectile - desc = "A classic revolver. Uses 357 ammo" name = "revolver" + desc = "A classic revolver. Uses 357 ammo" icon_state = "revolver" caliber = "357" origin_tech = "combat=2;materials=2" @@ -118,4 +118,3 @@ if(istype(AC)) bullets += 1 return bullets - diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 4cbb7ec2f8..ee0d8a6427 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -143,4 +143,5 @@ However, it looks like subsequent guns that use removable magazines don't take that into account and just get around simulating a removable magazine by adding the casings into the loaded list and spawning an empty magazine when the gun is out of rounds. Which means you can't eject magazines with rounds in them. The below is a very - rough and poor attempt at making that happen. -Ausops */ \ No newline at end of file + rough and poor attempt at making that happen. -Ausops */ + \ No newline at end of file diff --git a/code/modules/projectiles/guns/projectile/crossbow.dm b/code/modules/projectiles/guns/projectile/crossbow.dm index e7bc073f0a..0f5cdbb2c8 100644 --- a/code/modules/projectiles/guns/projectile/crossbow.dm +++ b/code/modules/projectiles/guns/projectile/crossbow.dm @@ -1,7 +1,6 @@ //AMMUNITION /obj/item/weapon/arrow - name = "bolt" desc = "It's got a tip for you - get the point?" icon = 'icons/obj/weapons.dmi' @@ -28,7 +27,6 @@ item_state = "bolt" /obj/item/weapon/arrow/quill - name = "vox quill" desc = "A wickedly barbed quill from some bizarre animal." icon = 'icons/obj/weapons.dmi' @@ -37,7 +35,6 @@ throwforce = 5 /obj/item/weapon/arrow/rod - name = "metal rod" desc = "Don't cry for me, Orithena." icon_state = "metal-rod" @@ -50,7 +47,6 @@ src.Del() /obj/item/weapon/gun/launcher/crossbow - name = "powered crossbow" desc = "A 2557AD twist on an old classic. Pick up that can." icon_state = "crossbow" @@ -173,7 +169,6 @@ ..() /obj/item/weapon/gun/launcher/crossbow/proc/superheat_rod(var/mob/user) - if(!user || !cell || !in_chamber) return if(cell.charge < 500) return if(in_chamber.throwforce >= 15) return @@ -262,4 +257,4 @@ del(src) return else - ..() \ No newline at end of file + ..() diff --git a/code/modules/projectiles/guns/projectile/launcher.dm b/code/modules/projectiles/guns/projectile/launcher.dm index 5f9d9fdfde..ee0da727c7 100644 --- a/code/modules/projectiles/guns/projectile/launcher.dm +++ b/code/modules/projectiles/guns/projectile/launcher.dm @@ -1,5 +1,4 @@ /obj/item/weapon/gun/launcher - name = "launcher" desc = "A device that launches things." icon = 'icons/obj/weapons.dmi' @@ -87,4 +86,4 @@ return 1 /obj/item/weapon/gun/launcher/attack_self(mob/living/user as mob) - return \ No newline at end of file + return diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index c7748091e9..b963924614 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -149,4 +149,4 @@ desc = "a silencer" icon = 'icons/obj/gun.dmi' icon_state = "silencer" - w_class = 2 \ No newline at end of file + w_class = 2 diff --git a/code/modules/projectiles/guns/projectile/pneumatic.dm b/code/modules/projectiles/guns/projectile/pneumatic.dm index feb32d15bd..2a6e519d0d 100644 --- a/code/modules/projectiles/guns/projectile/pneumatic.dm +++ b/code/modules/projectiles/guns/projectile/pneumatic.dm @@ -27,7 +27,6 @@ tank_container.tag = "gas_tank_holder" /obj/item/weapon/gun/launcher/pneumatic/verb/set_pressure() //set amount of tank pressure. - set name = "Set Valve Pressure" set category = "Object" set src in range(0) @@ -37,7 +36,6 @@ usr << "You dial the pressure valve to [pressure_setting]%." /obj/item/weapon/gun/launcher/pneumatic/verb/eject_tank() //Remove the tank. - set name = "Eject Tank" set category = "Object" set src in range(0) @@ -79,7 +77,6 @@ user << "That won't fit into the hopper." /obj/item/weapon/gun/launcher/pneumatic/attack_self(mob/user as mob) - if(contents.len > 0) var/obj/item/removing = contents[contents.len] if(removing == in_chamber) @@ -210,4 +207,4 @@ del(src) return else - ..() \ No newline at end of file + ..() diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 8e98125977..f1eac3e858 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -1,6 +1,6 @@ /obj/item/weapon/gun/projectile/detective - desc = "A cheap Martian knock-off of a Smith & Wesson Model 10. Uses .38-Special rounds." name = "revolver" + desc = "A cheap Martian knock-off of a Smith & Wesson Model 10. Uses .38-Special rounds." icon_state = "detective" max_shells = 6 caliber = "38" @@ -71,8 +71,8 @@ /obj/item/weapon/gun/projectile/detective/semiauto - desc = "A cheap Martian knock-off of a Colt M1911. Uses less-than-lethal .45 rounds." name = "\improper Colt M1911" + desc = "A cheap Martian knock-off of a Colt M1911. Uses less-than-lethal .45 rounds." icon_state = "colt" max_shells = 7 caliber = ".45" @@ -113,7 +113,6 @@ update_icon() /obj/item/weapon/gun/projectile/russian/proc/Spin() - for(var/obj/item/ammo_casing/AC in loaded) del(AC) loaded = list() @@ -126,7 +125,6 @@ /obj/item/weapon/gun/projectile/russian/attackby(var/obj/item/A as obj, mob/user as mob) - if(!A) return var/num_loaded = 0 @@ -155,13 +153,11 @@ return /obj/item/weapon/gun/projectile/russian/attack_self(mob/user as mob) - user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.") if(getAmmo() > 0) Spin() /obj/item/weapon/gun/projectile/russian/attack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj) - if(!loaded.len) user.visible_message("\red *click*", "\red *click*") playsound(user, 'sound/weapons/empty.ogg', 100, 1) @@ -186,4 +182,3 @@ user.apply_damage(300, BRUTE, affecting, sharp=1) // You are dead, dead, dead. return ..() - diff --git a/code/modules/projectiles/guns/projectile/rocket.dm b/code/modules/projectiles/guns/projectile/rocket.dm index 8183de4d4e..ea88e7956a 100644 --- a/code/modules/projectiles/guns/projectile/rocket.dm +++ b/code/modules/projectiles/guns/projectile/rocket.dm @@ -1,5 +1,4 @@ /obj/item/weapon/gun/rocketlauncher - var/projectile name = "rocket launcher" desc = "MAGGOT." icon_state = "rocket" @@ -11,7 +10,7 @@ flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY slot_flags = 0 origin_tech = "combat=8;materials=5" - projectile = /obj/item/missile + var/projectile = /obj/item/missile var/missile_speed = 2 var/missile_range = 30 var/max_rockets = 1 @@ -49,4 +48,4 @@ del(I) return else - usr << "\red [src] is empty." \ No newline at end of file + usr << "\red [src] is empty." diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index aef481cc0e..9c30e31102 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -134,4 +134,4 @@ slot_flags |= SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) name = "sawn-off shotgun" desc = "Omar's coming!" - user << "You shorten the barrel of \the [src]!" \ No newline at end of file + user << "You shorten the barrel of \the [src]!" diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 84c9347ed0..b811eb9281 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -170,4 +170,4 @@ var/list/beam_master = list() icon_state = "stun" nodamage = 1 agony = 40 - damage_type = HALLOSS \ No newline at end of file + damage_type = HALLOSS diff --git a/code/modules/projectiles/projectile/change.dm b/code/modules/projectiles/projectile/change.dm index 90157efd62..215c117342 100644 --- a/code/modules/projectiles/projectile/change.dm +++ b/code/modules/projectiles/projectile/change.dm @@ -85,4 +85,3 @@ del(M) return new_mob - diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index 00fd886f3d..b94bda70ad 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -65,4 +65,3 @@ damage = 20 damage_type = TOX irradiate = 20 - diff --git a/code/modules/projectiles/projectile/force.dm b/code/modules/projectiles/projectile/force.dm index a0f1da84b5..4dffe4ce89 100644 --- a/code/modules/projectiles/projectile/force.dm +++ b/code/modules/projectiles/projectile/force.dm @@ -25,4 +25,4 @@ throwdir = get_dir(src,target) M.throw_at(get_edge_target_turf(M, throwdir),15,1) return ..() -*/ \ No newline at end of file +*/