diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 8d663fd4da4..71e7cac7587 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -744,7 +744,8 @@ Returns 1 if the chain up to the area contains the given typepath atoms += A return atoms -/datum/coords //Simple datum for storing coordinates. +/// Simple datum for storing coordinates. +/datum/coords var/x_pos var/y_pos var/z_pos diff --git a/code/controllers/failsafe.dm b/code/controllers/failsafe.dm index 8df9f1958dc..a1d096a2474 100644 --- a/code/controllers/failsafe.dm +++ b/code/controllers/failsafe.dm @@ -6,7 +6,8 @@ GLOBAL_REAL(Failsafe, /datum/controller/failsafe) -/datum/controller/failsafe // This thing pretty much just keeps poking the master controller +/// This thing pretty much just keeps poking the master controller +/datum/controller/failsafe name = "Failsafe" // The length of time to check on the MC (in deciseconds). diff --git a/code/datums/diseases/advance/symptoms/dizzy.dm b/code/datums/diseases/advance/symptoms/dizzy.dm index f5190f322b5..ede04d3da1f 100644 --- a/code/datums/diseases/advance/symptoms/dizzy.dm +++ b/code/datums/diseases/advance/symptoms/dizzy.dm @@ -15,7 +15,8 @@ Bonus ////////////////////////////////////// */ -/datum/symptom/dizzy // Not the egg +/// Not the egg +/datum/symptom/dizzy name = "Dizziness" stealth = 2 diff --git a/code/datums/keybindings/mob_keybinds.dm b/code/datums/keybindings/mob_keybinds.dm index c2f782dd024..d2b3d2c9034 100644 --- a/code/datums/keybindings/mob_keybinds.dm +++ b/code/datums/keybindings/mob_keybinds.dm @@ -225,7 +225,8 @@ name = "Target Left Foot" body_part = BODY_ZONE_PRECISE_L_FOOT -/datum/keybinding/mob/trigger_action_button // Don't add a name to this, shouldn't show up in the prefs menu +/// Don't add a name to this, shouldn't show up in the prefs menu +/datum/keybinding/mob/trigger_action_button var/datum/action/linked_action var/binded_to // these are expected to actually get deleted at some point, to prevent hard deletes we need to know where to remove them from the clients list diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index ba7b8a63b5b..611b449b7e5 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -950,7 +950,8 @@ back = /obj/item/mod/control/pre_equipped/traitor shoes = /obj/item/clothing/shoes/magboots/syndie -/datum/outfit/admin/modsuit/wizard // Technically not a MODsuit, we'll bundle it up in here for the future when it does become one +/// Technically not a MODsuit, we'll bundle it up in here for the future when it does become one +/datum/outfit/admin/modsuit/wizard name = "Hardsuit - Wizard" suit = /obj/item/clothing/suit/space/hardsuit/wizard shoes = /obj/item/clothing/shoes/magboots/wizard @@ -980,7 +981,8 @@ name = "Tournament Standard Green" uniform = /obj/item/clothing/under/color/green -/datum/outfit/admin/tournament/tournament_gangster //gangster are supposed to fight each other. --rastaf0 +/// gangster are supposed to fight each other. --rastaf0 +/datum/outfit/admin/tournament/tournament_gangster name = "Tournament Gangster" uniform = /obj/item/clothing/under/rank/security/detective @@ -991,7 +993,8 @@ l_pocket = /obj/item/ammo_box/a357 r_hand = /obj/item/gun/projectile/automatic/proto -/datum/outfit/admin/tournament/tournament_chef //Steven Seagal FTW +/// Steven Seagal FTW +/datum/outfit/admin/tournament/tournament_chef name = "Tournament Chef" uniform = /obj/item/clothing/under/rank/civilian/chef diff --git a/code/datums/outfits/outfit_debug.dm b/code/datums/outfits/outfit_debug.dm index e992aed1af2..0f5235bf52c 100644 --- a/code/datums/outfits/outfit_debug.dm +++ b/code/datums/outfits/outfit_debug.dm @@ -49,7 +49,8 @@ name = "AVD-CNED bowman headset" ks2type = /obj/item/encryptionkey/syndicate/all_channels -/obj/item/encryptionkey/syndicate/all_channels // has to be a subtype and stuff +/// has to be a subtype and stuff +/obj/item/encryptionkey/syndicate/all_channels name = "AVD-CNED Encryption Key" desc = "Lets you listen to everything. Use in hand to toggle voice changing. Alt-click to change your fake name." icon_state = "com_cypherkey" diff --git a/code/datums/pipe_datums.dm b/code/datums/pipe_datums.dm index 41adb4a1882..1870faf9ef5 100644 --- a/code/datums/pipe_datums.dm +++ b/code/datums/pipe_datums.dm @@ -27,7 +27,8 @@ GLOBAL_LIST_EMPTY(rpd_pipe_list) //Some pipes we don't want to be dispensable pipe_icon = "simple" rpd_dispensable = TRUE -/datum/pipes/atmospheric/bent //Why is this not atmospheric/simple/bent you ask? Because otherwise the ordering of the pipes in the UI menu gets weird +/// Why is this not atmospheric/simple/bent you ask? Because otherwise the ordering of the pipes in the UI menu gets weird +/datum/pipes/atmospheric/bent pipe_name = "bent pipe" pipe_id = PIPE_SIMPLE_BENT orientations = 4 diff --git a/code/datums/position_point_vector.dm b/code/datums/position_point_vector.dm index 1cad3b52899..433aafeaa18 100644 --- a/code/datums/position_point_vector.dm +++ b/code/datums/position_point_vector.dm @@ -214,7 +214,8 @@ v.increment(multiplier * amount) return v -/datum/point_precise/vector/processed //pixel_speed is per decisecond. +/// pixel_speed is per decisecond. +/datum/point_precise/vector/processed var/last_process = 0 var/last_move = 0 var/paused = FALSE diff --git a/code/datums/spells/bloodcrawl.dm b/code/datums/spells/bloodcrawl.dm index 6d00e58ba67..ac39f6b0387 100644 --- a/code/datums/spells/bloodcrawl.dm +++ b/code/datums/spells/bloodcrawl.dm @@ -55,7 +55,8 @@ icon = 'icons/effects/blood.dmi' flags = NODROP|ABSTRACT -/obj/effect/dummy/slaughter //Can't use the wizard one, blocked by jaunt/slow +/// Can't use the wizard one, blocked by jaunt/slow +/obj/effect/dummy/slaughter name = "odd blood" icon = 'icons/effects/effects.dmi' icon_state = "nothing" diff --git a/code/datums/spells/conjure.dm b/code/datums/spells/conjure.dm index ab1d191f658..380c178688c 100644 --- a/code/datums/spells/conjure.dm +++ b/code/datums/spells/conjure.dm @@ -57,7 +57,8 @@ return what_conjure_summoned -/obj/effect/proc_holder/spell/aoe/conjure/summonEdSwarm //test purposes +/// test purposes +/obj/effect/proc_holder/spell/aoe/conjure/summonEdSwarm name = "Dispense Wizard Justice" desc = "This spell dispenses wizard justice." summon_type = list(/mob/living/simple_animal/bot/ed209) diff --git a/code/datums/station_traits/postive_traits.dm b/code/datums/station_traits/postive_traits.dm index 963d4291e3c..6b161fa8662 100644 --- a/code/datums/station_traits/postive_traits.dm +++ b/code/datums/station_traits/postive_traits.dm @@ -154,7 +154,8 @@ implant_to_give.implant(spawned, spawned, TRUE, TRUE) -/datum/station_trait/cybernetic_revolution //NOTE: THIS MAKES EMP MUCH MORE EXPENSIVE. +/// NOTE: THIS MAKES EMP MUCH MORE EXPENSIVE. +/datum/station_trait/cybernetic_revolution name = "Cybernetic Revolution" trait_type = STATION_TRAIT_POSITIVE show_in_report = TRUE diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index add7fffaa65..327a8e4b3f6 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -1,6 +1,7 @@ //OTHER DEBUFFS -/datum/status_effect/his_wrath //does minor damage over time unless holding His Grace +/// does minor damage over time unless holding His Grace +/datum/status_effect/his_wrath id = "his_wrath" duration = -1 tick_interval = 4 @@ -23,7 +24,8 @@ owner.adjustFireLoss(0.1) owner.adjustToxLoss(0.2) -/datum/status_effect/cultghost //is a cult ghost and can't use manifest runes, can see ghosts and dies if too far from summoner +/// is a cult ghost and can't use manifest runes, can see ghosts and dies if too far from summoner +/datum/status_effect/cultghost id = "cult_ghost" duration = -1 alert_type = null @@ -699,7 +701,8 @@ . = ..() REMOVE_TRAIT(owner, TRAIT_MUTE, id) -/datum/status_effect/transient/silence/absolute // this one will mute all emote sounds including gasps +/// this one will mute all emote sounds including gasps +/datum/status_effect/transient/silence/absolute id = "abssilenced" /datum/status_effect/transient/deaf diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm index 50ddee96a03..1a0339564de 100644 --- a/code/datums/status_effects/neutral.dm +++ b/code/datums/status_effects/neutral.dm @@ -1,6 +1,7 @@ //entirely neutral or internal status effects go here -/datum/status_effect/crusher_damage //tracks the damage dealt to this mob by kinetic crushers +/// tracks the damage dealt to this mob by kinetic crushers +/datum/status_effect/crusher_damage id = "crusher_damage" duration = -1 status_type = STATUS_EFFECT_UNIQUE diff --git a/code/datums/uplink_items/uplink_traitor.dm b/code/datums/uplink_items/uplink_traitor.dm index 7f437119a8b..e13bdf4b7b8 100644 --- a/code/datums/uplink_items/uplink_traitor.dm +++ b/code/datums/uplink_items/uplink_traitor.dm @@ -476,7 +476,8 @@ surplus = 50 excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) -/datum/uplink_item/stealthy_weapons/combat_minus // Nukies get combat gloves plus instead +/// Nukies get combat gloves plus instead +/datum/uplink_item/stealthy_weapons/combat_minus name = "Experimental Krav Gloves" desc = "Experimental gloves with installed nanochips that teach you Krav Maga when worn, great as a cheap backup weapon. Warning, the nanochips will override any other fighting styles such as CQC. Do not look as fly as the Warden's" reference = "CGM" @@ -484,7 +485,8 @@ cost = 50 excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) -/datum/uplink_item/device_tools/thermal_drill // Nukies get Diamond Tipped Thermal Safe Drill instead +/// Nukies get Diamond Tipped Thermal Safe Drill instead +/datum/uplink_item/device_tools/thermal_drill name = "Amplifying Thermal Safe Drill" desc = "A tungsten carbide thermal drill with magnetic clamps for the purpose of drilling hardened objects. Comes with built in security detection and nanite system, to keep you up if security comes a-knocking." reference = "DRL" @@ -516,7 +518,8 @@ surplus = 60 excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) -/datum/uplink_item/bio_chips/uplink // Nukies get Nuclear Uplink Bio-chip instead +/// Nukies get Nuclear Uplink Bio-chip instead +/datum/uplink_item/bio_chips/uplink name = "Uplink Bio-chip" desc = "A bio-chip injected into the body, and later activated manually to open an uplink with 50 telecrystals. The ability for an agent to open an uplink after their possessions have been stripped from them makes this implant excellent for escaping confinement." reference = "UI" diff --git a/code/game/area/areas/mining_areas.dm b/code/game/area/areas/mining_areas.dm index e1370070513..aa4802ffabb 100644 --- a/code/game/area/areas/mining_areas.dm +++ b/code/game/area/areas/mining_areas.dm @@ -77,7 +77,8 @@ name = "Mining Station Cafeteria" icon_state = "mining_living" -/area/lavaland/surface/outdoors/outpost/catwalk //subtype of /surface so storms hit there +/// subtype of /surface so storms hit there +/area/lavaland/surface/outdoors/outpost/catwalk name = "Mining Station Catwalk" icon_state = "mining" @@ -89,7 +90,8 @@ name = "Mining Station Custodial Storage" icon_state = "janitor" -/area/mine/outpost/engineering // basically engi and atmos combined. I'm keeping it as "engineering" code wise, but "Life Support" sounds cooler in-game +/// basically engi and atmos combined. I'm keeping it as "engineering" code wise, but "Life Support" sounds cooler in-game +/area/mine/outpost/engineering name = "Mining Station Life Support" icon_state = "engi" @@ -184,10 +186,12 @@ name = "Lavaland Wastes" outdoors = TRUE -/area/lavaland/surface/outdoors/unexplored //monsters and ruins spawn here +/// monsters and ruins spawn here +/area/lavaland/surface/outdoors/unexplored icon_state = "unexplored" -/area/lavaland/surface/outdoors/unexplored/danger //megafauna will also spawn here +/// megafauna will also spawn here +/area/lavaland/surface/outdoors/unexplored/danger icon_state = "danger" /area/lavaland/surface/outdoors/explored diff --git a/code/game/area/asteroid_areas.dm b/code/game/area/asteroid_areas.dm index f8fd94b3d09..770be127199 100644 --- a/code/game/area/asteroid_areas.dm +++ b/code/game/area/asteroid_areas.dm @@ -1,6 +1,7 @@ // Asteroids -/area/asteroid // -- TLE +/// -- TLE +/area/asteroid name = "\improper Asteroid" icon_state = "asteroid" requires_power = FALSE @@ -11,7 +12,8 @@ min_ambience_cooldown = 70 SECONDS max_ambience_cooldown = 220 SECONDS -/area/asteroid/cave // -- TLE +/// -- TLE +/area/asteroid/cave name = "\improper Asteroid - Underground" icon_state = "cave" requires_power = FALSE diff --git a/code/game/area/misc_areas.dm b/code/game/area/misc_areas.dm index 329e031f390..b2c9fdaba23 100644 --- a/code/game/area/misc_areas.dm +++ b/code/game/area/misc_areas.dm @@ -3,7 +3,8 @@ name = "Unknown" icon_state = "storage" -/area/start // will be unused once kurper gets his login interface patch done +/// will be unused once kurper gets his login interface patch done +/area/start name = "start area" icon_state = "start" requires_power = FALSE diff --git a/code/game/area/shuttle_areas.dm b/code/game/area/shuttle_areas.dm index efd45956d8e..e6f576975cb 100644 --- a/code/game/area/shuttle_areas.dm +++ b/code/game/area/shuttle_areas.dm @@ -89,7 +89,8 @@ /area/shuttle/escape_pod3/transit icon_state = "shuttle" -/area/shuttle/escape_pod5 //Pod 4 was lost to meteors +/// Pod 4 was lost to meteors +/area/shuttle/escape_pod5 name = "\improper Escape Pod Five" nad_allowed = TRUE diff --git a/code/game/area/ss13_areas/maintenance_areas.dm b/code/game/area/ss13_areas/maintenance_areas.dm index fbd3195e3f6..5cdf15bb5ee 100644 --- a/code/game/area/ss13_areas/maintenance_areas.dm +++ b/code/game/area/ss13_areas/maintenance_areas.dm @@ -165,7 +165,8 @@ name = "\improper Fore Starboard Solar Maintenance" icon_state = "FSctrl" -/area/station/maintenance/assembly_line //Derelict Assembly Line +/// Derelict Assembly Line +/area/station/maintenance/assembly_line name = "\improper Assembly Line" icon_state = "ass_line" apc_starts_off = TRUE diff --git a/code/game/gamemodes/cult/blood_magic.dm b/code/game/gamemodes/cult/blood_magic.dm index 274916d4937..d3ebeea3c5e 100644 --- a/code/game/gamemodes/cult/blood_magic.dm +++ b/code/game/gamemodes/cult/blood_magic.dm @@ -1,4 +1,5 @@ -/datum/action/innate/cult/blood_magic //Blood magic handles the creation of blood spells (formerly talismans) +/// Blood magic handles the creation of blood spells (formerly talismans) +/datum/action/innate/cult/blood_magic name = "Prepare Blood Magic" button_icon_state = "carve" desc = "Prepare blood magic by carving runes into your flesh. This is easier with an empowering rune." @@ -85,7 +86,8 @@ if(nullify_spell) qdel(nullify_spell) -/datum/action/innate/cult/blood_spell //The next generation of talismans, handles storage/creation of blood magic +/// The next generation of talismans, handles storage/creation of blood magic +/datum/action/innate/cult/blood_spell name = "Blood Magic" button_icon_state = "telerune" desc = "Fear the Old Blood." @@ -608,7 +610,8 @@ to_chat(user, "[C] is already bound.") -/obj/item/restraints/handcuffs/energy/cult //For the shackling spell +/// For the shackling spell +/obj/item/restraints/handcuffs/energy/cult name = "shadow shackles" desc = "Shackles that bind the wrists with sinister magic." trashtype = /obj/item/restraints/handcuffs/energy/used diff --git a/code/game/gamemodes/cult/cult_objectives.dm b/code/game/gamemodes/cult/cult_objectives.dm index fe5816e1654..6afc676e3ee 100644 --- a/code/game/gamemodes/cult/cult_objectives.dm +++ b/code/game/gamemodes/cult/cult_objectives.dm @@ -1,4 +1,5 @@ -/datum/cult_objectives //Replace with team antag datum objectives from tg once ported +/// Replace with team antag datum objectives from tg once ported +/datum/cult_objectives var/cult_status = NARSIE_IS_ASLEEP var/list/presummon_objs = list() var/datum/objective/eldergod/obj_summon = new @@ -117,7 +118,8 @@ //Objectives -/datum/objective/servecult //Given to cultists on conversion/roundstart +/// Given to cultists on conversion/roundstart +/datum/objective/servecult explanation_text = "Assist your fellow cultists and Tear the Veil! (Use the Study Veil action to check your progress.)" completed = TRUE needs_target = FALSE diff --git a/code/game/gamemodes/miniantags/abduction/gland.dm b/code/game/gamemodes/miniantags/abduction/gland.dm index b8c75eb8bd3..fe9fc6505d8 100644 --- a/code/game/gamemodes/miniantags/abduction/gland.dm +++ b/code/game/gamemodes/miniantags/abduction/gland.dm @@ -226,7 +226,8 @@ return A -/obj/item/organ/internal/heart/gland/emp //TODO : Replace with something more interesting +/// TODO : Replace with something more interesting +/obj/item/organ/internal/heart/gland/emp origin_tech = "materials=4;biotech=4;magnets=6;abductor=3" cooldown_low = 800 cooldown_high = 1200 diff --git a/code/game/gamemodes/miniantags/demons/slaughter demon/slaughter.dm b/code/game/gamemodes/miniantags/demons/slaughter demon/slaughter.dm index 594ede9117e..11a5d6500d1 100644 --- a/code/game/gamemodes/miniantags/demons/slaughter demon/slaughter.dm +++ b/code/game/gamemodes/miniantags/demons/slaughter demon/slaughter.dm @@ -86,7 +86,8 @@ health = 170 // Cult slaughter demon -/mob/living/simple_animal/demon/slaughter/cult //Summoned as part of the cult objective "Bring the Slaughter" +/// Summoned as part of the cult objective "Bring the Slaughter" +/mob/living/simple_animal/demon/slaughter/cult name = "harbinger of the slaughter" real_name = "harbinger of the Slaughter" desc = "An awful creature from beyond the realms of madness." diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index e588523a1ca..7453324b3da 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -266,7 +266,8 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) return TRUE -/datum/objective/debrain //I want braaaainssss +/// I want braaaainssss +/datum/objective/debrain name = "Debrain" martyr_compatible = FALSE @@ -297,7 +298,8 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) return FALSE -/datum/objective/protect //The opposite of killing a dude. +/// The opposite of killing a dude. +/datum/objective/protect name = "Protect" martyr_compatible = TRUE @@ -318,7 +320,8 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) return TRUE return FALSE -/datum/objective/protect/mindslave //subytpe for mindslave implants +/// subytpe for mindslave implants +/datum/objective/protect/mindslave needs_target = FALSE // To be clear, this objective should have a target, but it will always be manually set to the mindslaver through the mindslave antag datum. // This objective should only be given to a single owner. We can use `owner` and not `get_owners()`. diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 2b50fb1de97..8f7dae1400f 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -702,7 +702,8 @@ GLOBAL_LIST_EMPTY(multiverse) /obj/item/multisword/pure_evil probability_evil = 100 -/obj/item/multisword/pike //If We are to be used and spent, let it be for a noble purpose. +/// If We are to be used and spent, let it be for a noble purpose. +/obj/item/multisword/pike name = "phantom pike" desc = "A fishing pike that appears to be imbued with a peculiar energy." icon = 'icons/obj/items.dmi' diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm index a38bde82f0c..3015fcaf27e 100644 --- a/code/game/machinery/Beacon.dm +++ b/code/game/machinery/Beacon.dm @@ -81,7 +81,8 @@ mycomputer.mybeacon = null return ..() -/obj/machinery/bluespace_beacon/syndicate/infiltrator //beacon guaranteed offline at roundstart for infiltrator base +/// beacon guaranteed offline at roundstart for infiltrator base +/obj/machinery/bluespace_beacon/syndicate/infiltrator cc_beacon = TRUE /obj/machinery/bluespace_beacon/syndicate/infiltrator/Initialize(mapload) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 6f72fe49a2f..dcd66b06fba 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -405,7 +405,8 @@ ..() return TRUE -/obj/machinery/camera/portable //Cameras which are placed inside of things, such as helmets. +/// Cameras which are placed inside of things, such as helmets. +/obj/machinery/camera/portable start_active = TRUE // theres no real way to reactivate these, so never break them when they init var/turf/prev_turf diff --git a/code/game/machinery/computer/medical_records.dm b/code/game/machinery/computer/medical_records.dm index 52192563971..f9e35d1fcb1 100644 --- a/code/game/machinery/computer/medical_records.dm +++ b/code/game/machinery/computer/medical_records.dm @@ -7,7 +7,8 @@ #define FIELD(N, V, E) list(field = N, value = V, edit = E) #define MED_FIELD(N, V, E, LB) list(field = N, value = V, edit = E, line_break = LB) -/obj/machinery/computer/med_data //TODO:SANITY +/// TODO:SANITY +/obj/machinery/computer/med_data name = "medical records console" desc = "This can be used to check medical records." icon_keyboard = "med_key" diff --git a/code/game/machinery/computer/power_monitor_console.dm b/code/game/machinery/computer/power_monitor_console.dm index 1d9d6be8cf5..d257ca45704 100644 --- a/code/game/machinery/computer/power_monitor_console.dm +++ b/code/game/machinery/computer/power_monitor_console.dm @@ -24,7 +24,8 @@ /// The history list itself of the power var/list/history = list() -/obj/machinery/computer/monitor/secret //Hides the power monitor (such as ones on ruins & CentCom) from PDA's to prevent metagaming. +/// Hides the power monitor (such as ones on ruins & CentCom) from PDA's to prevent metagaming. +/obj/machinery/computer/monitor/secret name = "outdated power monitoring console" desc = "It monitors power levels across the local powernet." circuit = /obj/item/circuitboard/powermonitor/secret diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 558c13a5bef..e4d89c6f738 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -1,4 +1,5 @@ -/obj/machinery/constructable_frame //Made into a seperate type to make future revisions easier. +/// Made into a seperate type to make future revisions easier. +/obj/machinery/constructable_frame name = "machine frame" icon = 'icons/obj/stock_parts.dmi' icon_state = "box_0" diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index da4fa0966ba..b997c99a49a 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -20,7 +20,8 @@ . = ..() update_icon() -/obj/machinery/flasher/portable //Portable version of the flasher. Only flashes when anchored +/// Portable version of the flasher. Only flashes when anchored +/obj/machinery/flasher/portable name = "portable flasher" desc = "A portable flashing device. Wrench to activate and deactivate. Cannot detect slow movements." icon_state = "pflash1" diff --git a/code/game/machinery/vendors/generic_vendors.dm b/code/game/machinery/vendors/generic_vendors.dm index 94ba7c4470f..1b9c93628a9 100644 --- a/code/game/machinery/vendors/generic_vendors.dm +++ b/code/game/machinery/vendors/generic_vendors.dm @@ -1231,7 +1231,8 @@ /obj/machinery/economy/vending/cigarette/syndicate/free prices = list() -/obj/machinery/economy/vending/cigarette/beach //Used in the lavaland_biodome_beach.dmm ruin +/// Used in the lavaland_biodome_beach.dmm ruin +/obj/machinery/economy/vending/cigarette/beach name = "\improper ShadyCigs Ultra" desc = "Now with extra premium products!" slogan_list = list("Turn on, tune in, drop out!", diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm index d0e24c093ba..2430888436c 100644 --- a/code/game/mecha/equipment/tools/other_tools.dm +++ b/code/game/mecha/equipment/tools/other_tools.dm @@ -102,7 +102,8 @@ //////////////////////////// ARMOR BOOSTER MODULES ////////////////////////////////////////////////////////// -/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster //what is that noise? A BAWWW from TK mutants. +/// what is that noise? A BAWWW from TK mutants. +/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster name = "armor booster module (Close combat weaponry)" desc = "Boosts exosuit armor against armed melee attacks. Requires energy to operate." icon_state = "mecha_abooster_ccw" diff --git a/code/game/mecha/paintkits.dm b/code/game/mecha/paintkits.dm index 1aef8ebf061..e7c67a54227 100644 --- a/code/game/mecha/paintkits.dm +++ b/code/game/mecha/paintkits.dm @@ -1,4 +1,5 @@ -/obj/item/paintkit //Please don't use this for anything, it's a base type for custom mech paintjobs. +/// Please don't use this for anything, it's a base type for custom mech paintjobs. +/obj/item/paintkit name = "mecha customisation kit" desc = "A generic kit containing all the needed tools and parts to turn a mech into another mech." icon = 'icons/obj/painting.dmi' diff --git a/code/game/objects/effects/decals/Cleanable/alien_blood.dm b/code/game/objects/effects/decals/Cleanable/alien_blood.dm index b13fb1ad8b3..2e02edee4a2 100644 --- a/code/game/objects/effects/decals/Cleanable/alien_blood.dm +++ b/code/game/objects/effects/decals/Cleanable/alien_blood.dm @@ -39,7 +39,8 @@ /obj/effect/decal/cleanable/blood/xtracks basecolor = "#05EE05" -/obj/effect/decal/cleanable/blood/slime // this is the alien blood file, slimes are aliens. +/// this is the alien blood file, slimes are aliens. +/obj/effect/decal/cleanable/blood/slime name = "slime jelly" desc = "It's a transparent semi-liquid from a slime or slime person. Don't lick it." basecolor = "#0b8f70" diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index c0213fe24e2..3c98c25dbb2 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -210,7 +210,8 @@ /obj/effect/decal/cleanable/blood/drip/can_bloodcrawl_in() return TRUE -/obj/effect/decal/cleanable/trail_holder //not a child of blood on purpose +/// not a child of blood on purpose +/obj/effect/decal/cleanable/trail_holder name = "blood" icon = 'icons/effects/effects.dmi' icon_state = "nothing" @@ -300,7 +301,8 @@ scoop_reagents = list("liquidgibs" = 5) -/obj/effect/decal/cleanable/blood/gibs/cleangibs //most ironic name ever... +/// most ironic name ever... +/obj/effect/decal/cleanable/blood/gibs/cleangibs scoop_reagents = null mergeable_decal = TRUE diff --git a/code/game/objects/effects/decals/Cleanable/misc_cleanables.dm b/code/game/objects/effects/decals/Cleanable/misc_cleanables.dm index 6e025ccb152..1d39a7cfd94 100644 --- a/code/game/objects/effects/decals/Cleanable/misc_cleanables.dm +++ b/code/game/objects/effects/decals/Cleanable/misc_cleanables.dm @@ -264,7 +264,8 @@ icon = 'icons/effects/tomatodecal.dmi' random_icon_states = list("smashed_egg1", "smashed_egg2", "smashed_egg3") -/obj/effect/decal/cleanable/pie_smudge //honk +/// honk +/obj/effect/decal/cleanable/pie_smudge name = "smashed pie" desc = "It's pie cream from a cream pie." density = FALSE @@ -307,7 +308,8 @@ reagents.add_reagent_list(scoop_reagents) no_scoop = FALSE -/obj/effect/decal/cleanable/confetti //PARTY TIME! +/// PARTY TIME! +/obj/effect/decal/cleanable/confetti name = "confetti" desc = "Party time!" gender = PLURAL diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index b08762c94cb..a127b327d13 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -11,7 +11,8 @@ invisibility = 101 GLOB.landmarks_list += src -/obj/effect/landmark/newplayer_start //There should only be one of these, in the lobby art area +/// There should only be one of these, in the lobby art area +/obj/effect/landmark/newplayer_start name = "start" INITIALIZE_IMMEDIATE(/obj/effect/landmark/newplayer_start) //Without this you spawn in the corner of the map and things break horribly diff --git a/code/game/objects/effects/spawners/airlock_spawner.dm b/code/game/objects/effects/spawners/airlock_spawner.dm index 4c868311746..a81fc5285fe 100644 --- a/code/game/objects/effects/spawners/airlock_spawner.dm +++ b/code/game/objects/effects/spawners/airlock_spawner.dm @@ -222,7 +222,8 @@ This spawner places pipe leading up to the interior door, you will need to finis interior_direction = WEST exterior_direction = EAST -/obj/effect/spawner/airlock/long //Long and thin +/// Long and thin +/obj/effect/spawner/airlock/long name = "long airlock spawner (interior north, exterior south)" icon_state = "1x2_N_to_S" tiles_in_y_direction = 2 @@ -250,7 +251,8 @@ This spawner places pipe leading up to the interior door, you will need to finis icon_state = "1x2_W_to_E" tiles_in_x_direction = 2 -/obj/effect/spawner/airlock/long/square //Square +/// Square +/obj/effect/spawner/airlock/long/square name = "square airlock spawner (interior north, exterior south)" icon_state = "2x2_N_to_S" tiles_in_x_direction = 2 diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 5ef0a837cad..a556d64132a 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -194,7 +194,8 @@ lootcount = 8 -/obj/effect/spawner/lootdrop/crate_spawner // for ruins +/// for ruins +/obj/effect/spawner/lootdrop/crate_spawner name = "lootcrate spawner" lootdoubles = FALSE loot = list( diff --git a/code/game/objects/effects/spawners/random_barrier.dm b/code/game/objects/effects/spawners/random_barrier.dm index 40897a60bcd..385b0c38ace 100644 --- a/code/game/objects/effects/spawners/random_barrier.dm +++ b/code/game/objects/effects/spawners/random_barrier.dm @@ -47,7 +47,8 @@ /obj/structure/barricade/wooden = 1, /obj/machinery/door/airlock/welded = 1) -/obj/effect/spawner/random_barrier/possibly_welded_airlock // these have no access restrictions, so for internal maintenance only +/// these have no access restrictions, so for internal maintenance only +/obj/effect/spawner/random_barrier/possibly_welded_airlock name = "possibly welded airlock" icon_state = "airlock" result = list( diff --git a/code/game/objects/effects/temporary_visuals/misc_visuals.dm b/code/game/objects/effects/temporary_visuals/misc_visuals.dm index 2e69b3713d9..334c9bfe64f 100644 --- a/code/game/objects/effects/temporary_visuals/misc_visuals.dm +++ b/code/game/objects/effects/temporary_visuals/misc_visuals.dm @@ -200,7 +200,8 @@ icon_state = "mummy_revive" duration = 20 -/obj/effect/temp_visual/heal //color is white by default, set to whatever is needed +/// color is white by default, set to whatever is needed +/obj/effect/temp_visual/heal name = "healing glow" icon_state = "heal" duration = 15 diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm index e9c21cd2107..18e3de3759e 100644 --- a/code/game/objects/items/cardboard_cutouts.dm +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -186,5 +186,6 @@ /obj/item/cardboard_cutout/setDir() dir = SOUTH -/obj/item/cardboard_cutout/adaptive //Purchased by Syndicate agents, these cutouts are indistinguishable from normal cutouts but aren't discolored when their appearance is changed +/// Purchased by Syndicate agents, these cutouts are indistinguishable from normal cutouts but aren't discolored when their appearance is changed +/obj/item/cardboard_cutout/adaptive deceptive = TRUE diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index dd3e7c82d2c..f5a857f86c5 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -265,4 +265,5 @@ implant = null return ..() -/obj/item/flash/synthetic //just a regular flash now +/// just a regular flash now +/obj/item/flash/synthetic diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 2aafdc9e9af..909451a633d 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -398,7 +398,8 @@ to_chat(user, "\The [src] needs time to recharge!") return -/obj/item/flashlight/spotlight //invisible lighting source +/// invisible lighting source +/obj/item/flashlight/spotlight name = "disco light" desc = "Groovy..." icon_state = null diff --git a/code/game/objects/items/devices/geiger_counter.dm b/code/game/objects/items/devices/geiger_counter.dm index 2515fbca7d8..cda7f5e34e3 100644 --- a/code/game/objects/items/devices/geiger_counter.dm +++ b/code/game/objects/items/devices/geiger_counter.dm @@ -4,7 +4,8 @@ #define RAD_LEVEL_VERY_HIGH 800 #define RAD_LEVEL_CRITICAL 1500 -/obj/item/geiger_counter //DISCLAIMER: I know nothing about how real-life Geiger counters work. This will not be realistic. ~Xhuis +/// DISCLAIMER: I know nothing about how real-life Geiger counters work. This will not be realistic. ~Xhuis +/obj/item/geiger_counter name = "\improper Geiger counter" desc = "A handheld device used for detecting and measuring radiation pulses." icon = 'icons/obj/device.dmi' diff --git a/code/game/objects/items/devices/painter/window_painter.dm b/code/game/objects/items/devices/painter/window_painter.dm index 83edd17bd7d..92671f7fc71 100644 --- a/code/game/objects/items/devices/painter/window_painter.dm +++ b/code/game/objects/items/devices/painter/window_painter.dm @@ -1,4 +1,5 @@ -/datum/painter/pipe/window // Yes, this is a pipe painter subtype. +/// Yes, this is a pipe painter subtype. +/datum/painter/pipe/window module_name = "window painter" module_state = "window_painter" var/static/list/paintable_windows = list( diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index c6c5facc872..6e66f17366b 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -30,7 +30,8 @@ /obj/item/radio/beacon/send_hear() return null -/obj/item/radio/beacon/bacon //Probably a better way of doing this, I'm lazy. +/// Probably a better way of doing this, I'm lazy. +/obj/item/radio/beacon/bacon /obj/item/radio/beacon/bacon/proc/digest_delay() QDEL_IN(src, 600) diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index 8c4bec0239a..14a3daf131d 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -180,7 +180,8 @@ name = "Centcom Radio Encryption Key" channels = list("Response Team" = 1, "Special Ops" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1, "Procedure" = 1) -/obj/item/encryptionkey/heads/ai_integrated //ported from bay, this goes 'inside' the AI. +/// ported from bay, this goes 'inside' the AI. +/obj/item/encryptionkey/heads/ai_integrated name = "AI Integrated Encryption Key" desc = "Integrated encryption key" icon_state = "cap_cypherkey" diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index b7be5686210..6914b911553 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -101,7 +101,8 @@ instant = TRUE // Work instantly if there are no comms freqlock = TRUE -/obj/item/radio/headset/syndicate/alt //undisguised bowman with flash protection +/// undisguised bowman with flash protection +/obj/item/radio/headset/syndicate/alt name = "syndicate headset" desc = "A syndicate headset that can be used to hear all radio frequencies. Protects ears from flashbangs." flags = EARBANGPROTECT @@ -367,7 +368,8 @@ requires_tcomms = FALSE instant = TRUE -/obj/item/radio/headset/heads/ai_integrated //No need to care about icons, it should be hidden inside the AI anyway. +/// No need to care about icons, it should be hidden inside the AI anyway. +/obj/item/radio/headset/heads/ai_integrated name = "\improper AI subspace transceiver" desc = "Integrated AI radio transceiver." icon = 'icons/obj/robot_component.dmi' diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 34f767302c7..f91e4b8d75b 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -60,7 +60,8 @@ GLOBAL_LIST_INIT(lizard_recipes, list( recipes = GLOB.lizard_recipes return ..() -/obj/item/stack/sheet/fur //basic fur sheets +/// basic fur sheets +/obj/item/stack/sheet/fur name = "pile of fur" desc = "Vulp remains." singular_name = "fur piece" diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index c62f88f218d..c6818200998 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -425,7 +425,8 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( else . = ..() -/obj/item/stack/sheet/cardboard //BubbleWrap +/// BubbleWrap +/obj/item/stack/sheet/cardboard name = "cardboard" desc = "Large sheets of card, like boxes folded flat." singular_name = "cardboard sheet" diff --git a/code/game/objects/items/theft_items.dm b/code/game/objects/items/theft_items.dm index 53522602e8d..f033792ae27 100644 --- a/code/game/objects/items/theft_items.dm +++ b/code/game/objects/items/theft_items.dm @@ -39,7 +39,8 @@ user.visible_message("[user] is rubbing [src] against [user.p_themselves()]! It looks like [user.p_theyre()] trying to commit suicide!") return TOXLOSS -/obj/item/nuke_core/plutonium //The steal objective, so it doesnt mess with the SM sliver on pinpointers and objectives +/// The steal objective, so it doesnt mess with the SM sliver on pinpointers and objectives +/obj/item/nuke_core/plutonium //nuke core box, for carrying the core /obj/item/nuke_core_container diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 6095e7c92ad..244d9cd9555 100755 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -202,7 +202,8 @@ AI MODULES target.add_supplied_law(9, law) /****************** New Freeform ******************/ -/obj/item/aiModule/freeform // Slightly more dynamic freeform module -- TLE +/// Slightly more dynamic freeform module -- TLE +/obj/item/aiModule/freeform name = "\improper Freeform AI module" var/newFreeFormLaw = "" var/lawpos = 15 @@ -260,7 +261,8 @@ AI MODULES return FALSE /******************** Purge ********************/ -/obj/item/aiModule/purge // -- TLE +/// -- TLE +/obj/item/aiModule/purge name = "\improper Purge AI module" desc = "A 'purge' AI Module: 'Purges all laws.'" icon_state = "standard_high" @@ -276,7 +278,8 @@ AI MODULES target.clear_inherent_laws() /******************** Asimov ********************/ -/obj/item/aiModule/asimov // -- TLE +/// -- TLE +/obj/item/aiModule/asimov name = "\improper Asimov core AI module" desc = "An 'Asimov' Core AI Module: 'Reconfigures the AI's core laws.'" icon_state = "green_high" @@ -284,7 +287,8 @@ AI MODULES laws = new /datum/ai_laws/asimov /******************** Crewsimov ********************/ -/obj/item/aiModule/crewsimov // -- TLE +/// -- TLE +/obj/item/aiModule/crewsimov name = "\improper Crewsimov core AI module" desc = "An 'Crewsimov' Core AI Module: 'Reconfigures the AI's core laws.'" icon_state = "green_low" @@ -306,7 +310,8 @@ AI MODULES laws = new /datum/ai_laws/quarantine /******************** Nanotrasen ********************/ -/obj/item/aiModule/nanotrasen // -- TLE +/// -- TLE +/obj/item/aiModule/nanotrasen name = "\improper NT Default Core AI Module" desc = "An 'NT Default' Core AI Module: 'Reconfigures the AI's core laws.'" icon_state = "blue_low" @@ -329,7 +334,8 @@ AI MODULES laws = new /datum/ai_laws/drone /******************** Robocop ********************/ -/obj/item/aiModule/robocop // -- TLE +/// -- TLE +/obj/item/aiModule/robocop name = "\improper Robocop core AI module" desc = "A 'Robocop' Core AI Module: 'Reconfigures the AI's core three laws.'" icon_state = "red_medium" @@ -337,7 +343,8 @@ AI MODULES laws = new /datum/ai_laws/robocop() /****************** P.A.L.A.D.I.N. **************/ -/obj/item/aiModule/paladin // -- NEO +/// -- NEO +/obj/item/aiModule/paladin name = "\improper P.A.L.A.D.I.N. core AI module" desc = "A P.A.L.A.D.I.N. Core AI Module: 'Reconfigures the AI's core laws.'" icon_state = "red_medium" @@ -345,7 +352,8 @@ AI MODULES laws = new /datum/ai_laws/paladin /****************** T.Y.R.A.N.T. *****************/ -/obj/item/aiModule/tyrant // -- Darem +/// -- Darem +/obj/item/aiModule/tyrant name = "\improper T.Y.R.A.N.T. core AI module" desc = "A T.Y.R.A.N.T. Core AI Module: 'Reconfigures the AI's core laws.'" icon_state = "red_high" @@ -353,7 +361,8 @@ AI MODULES laws = new /datum/ai_laws/tyrant() /******************** Antimov ********************/ -/obj/item/aiModule/antimov // -- TLE +/// -- TLE +/obj/item/aiModule/antimov name = "\improper Antimov core AI module" desc = "An 'Antimov' Core AI Module: 'Reconfigures the AI's core laws.'" icon_state = "red_high" @@ -404,7 +413,8 @@ AI MODULES laws = new /datum/ai_laws/peacekeeper() /******************** Freeform Core ******************/ -/obj/item/aiModule/freeformcore // Slightly more dynamic freeform module -- TLE +/// Slightly more dynamic freeform module -- TLE +/obj/item/aiModule/freeformcore name = "\improper Freeform core AI module" var/newFreeFormLaw = "" desc = "A 'freeform' Core AI module: ''" @@ -432,7 +442,8 @@ AI MODULES ..() /******************** Hacked AI Module ******************/ -/obj/item/aiModule/syndicate // Slightly more dynamic freeform module -- TLE +/// Slightly more dynamic freeform module -- TLE +/obj/item/aiModule/syndicate name = "hacked AI module" var/newFreeFormLaw = "" desc = "A hacked AI law module: ''" @@ -464,7 +475,8 @@ AI MODULES ..() /******************* Ion Module *******************/ -/obj/item/aiModule/toyAI // -- Incoming //No actual reason to inherit from ion boards here, either. *sigh* ~Miauw +/// -- Incoming //No actual reason to inherit from ion boards here, either. *sigh* ~Miauw +/obj/item/aiModule/toyAI name = "toy AI" desc = "A little toy model AI core with real law uploading action!" //Note: subtle tell icon = 'icons/obj/toy.dmi' diff --git a/code/game/objects/items/weapons/bio_chips/bio_chip_gorilla_rampage.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_gorilla_rampage.dm index 5fae9d5d602..49024f6d2f4 100644 --- a/code/game/objects/items/weapons/bio_chips/bio_chip_gorilla_rampage.dm +++ b/code/game/objects/items/weapons/bio_chips/bio_chip_gorilla_rampage.dm @@ -1,4 +1,5 @@ -/obj/item/bio_chip/gorilla_rampage //Dumb path but easier to search for admins +/// Dumb path but easier to search for admins +/obj/item/bio_chip/gorilla_rampage name = "magillitis serum bio-chip" desc = "An experimental biochip which causes irreversable rapid muscular growth in Hominidae. Side-affects may include hypertrichosis, violent outbursts, and an unending affinity for bananas." icon_state = "gorilla_rampage" diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index 998dd526021..e7af1f12ae1 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -1,4 +1,5 @@ -/obj/item/storage/bag/dice //Thankfully no longer a pill bottle. +/// Thankfully no longer a pill bottle. +/obj/item/storage/bag/dice name = "bag of dice" desc = "Contains all the luck you'll ever need." icon = 'icons/obj/dice.dmi' @@ -32,7 +33,8 @@ user.visible_message("[user] is gambling with death! It looks like [user.p_theyre()] trying to commit suicide!") return (OXYLOSS) -/obj/item/dice //depreciated d6, use /obj/item/dice/d6 if you actually want a d6 +/// depreciated d6, use /obj/item/dice/d6 if you actually want a d6 +/obj/item/dice name = "die" desc = "A die with six sides. Basic and serviceable." icon = 'icons/obj/dice.dmi' diff --git a/code/game/objects/items/weapons/garrote.dm b/code/game/objects/items/weapons/garrote.dm index 1d1570344a2..d88385b56ae 100644 --- a/code/game/objects/items/weapons/garrote.dm +++ b/code/game/objects/items/weapons/garrote.dm @@ -4,7 +4,8 @@ * Improvised garrotes */ -/obj/item/garrote // 12TC traitor item +/// 12TC traitor item +/obj/item/garrote name = "fiber wire" desc = "A length of razor-thin wire with an elegant wooden handle on either end.
You suspect you'd have to be behind the target to use this weapon effectively." icon_state = "garrot_wrap" @@ -27,7 +28,8 @@ else icon_state = "garrot_[improvised ? "I_" : ""][HAS_TRAIT(src, TRAIT_WIELDED) ? "un" : ""]wrap" -/obj/item/garrote/improvised // Made via tablecrafting +/// Made via tablecrafting +/obj/item/garrote/improvised name = "garrote" desc = "A length of cable with a shoddily-carved wooden handle tied to either end.
You suspect you'd have to be behind the target to use this weapon effectively." icon_state = "garrot_I_wrap" diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 5b8cebe360d..2201e9c6493 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -366,14 +366,16 @@ else return ..() -/obj/item/grenade/chem_grenade/cryo // Intended for rare cryogenic mixes. Cools the area moderately upon detonation. +/// Intended for rare cryogenic mixes. Cools the area moderately upon detonation. +/obj/item/grenade/chem_grenade/cryo name = "cryo grenade" desc = "A custom made cryogenic grenade. It rapidly cools its contents upon detonation." icon_state = "cryog" affected_area = 2 ignition_temp = -100 -/obj/item/grenade/chem_grenade/pyro // Intended for pyrotechnical mixes. Produces a small fire upon detonation, igniting potentially flammable mixtures. +/// Intended for pyrotechnical mixes. Produces a small fire upon detonation, igniting potentially flammable mixtures. +/obj/item/grenade/chem_grenade/pyro name = "pyro grenade" desc = "A custom made pyrotechnical grenade. It heats up and ignites its contents upon detonation." icon_state = "pyrog" @@ -381,7 +383,8 @@ affected_area = 3 ignition_temp = 500 // This is enough to expose a hotspot. -/obj/item/grenade/chem_grenade/adv_release // Intended for weaker, but longer lasting effects. Could have some interesting uses. +/// Intended for weaker, but longer lasting effects. Could have some interesting uses. +/obj/item/grenade/chem_grenade/adv_release name = "advanced release grenade" desc = "A custom made advanced release grenade. It is able to be detonated more than once. Can be configured using a multitool." icon_state = "timeg" diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 3f7f3250b34..c66d56f2eaa 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -103,10 +103,12 @@ var/mob/living/L = AM L.adjustFireLoss(sanctify_force) // Bonus fire damage for sanctified (ERT) versions of nullrod -/obj/item/nullrod/fluff // fluff subtype to be used for all donator nullrods +/// fluff subtype to be used for all donator nullrods +/obj/item/nullrod/fluff reskin_selectable = FALSE -/obj/item/nullrod/ert // ERT subtype, applies sanctified property to any derived rod +/// ERT subtype, applies sanctified property to any derived rod +/obj/item/nullrod/ert name = "inquisitor null rod" reskin_selectable = FALSE sanctify_force = 10 @@ -471,7 +473,8 @@ user.faction |= "carp" used_blessing = TRUE -/obj/item/nullrod/claymore/bostaff //May as well make it a "claymore" and inherit the blocking +/// May as well make it a "claymore" and inherit the blocking +/obj/item/nullrod/claymore/bostaff name = "monk's staff" desc = "A long, tall staff made of polished wood. Traditionally used in ancient old-Earth martial arts, now used to harass the clown." icon_state = "bostaff0" diff --git a/code/game/objects/items/weapons/legcuffs.dm b/code/game/objects/items/weapons/legcuffs.dm index d3a3350cf9f..31c817cc067 100644 --- a/code/game/objects/items/weapons/legcuffs.dm +++ b/code/game/objects/items/weapons/legcuffs.dm @@ -273,7 +273,8 @@ if(!reuseable) flags |= DROPDEL -/obj/item/restraints/legcuffs/bola/tactical //traitor variant +/// traitor variant +/obj/item/restraints/legcuffs/bola/tactical name = "reinforced bola" desc = "A strong bola, made with a long steel chain. It looks heavy, enough so that it could trip somebody." icon_state = "bola_r" @@ -282,7 +283,8 @@ origin_tech = "engineering=4;combat=3" knockdown_duration = 2 SECONDS -/obj/item/restraints/legcuffs/bola/energy //For Security +/// For Security +/obj/item/restraints/legcuffs/bola/energy name = "energy bola" desc = "A specialized hard-light bola designed to ensnare fleeing criminals and aid in arrests." icon_state = "ebola" diff --git a/code/game/objects/items/weapons/melee/energy_melee_weapons.dm b/code/game/objects/items/weapons/melee/energy_melee_weapons.dm index 2086e1677e0..f07c624b1d0 100644 --- a/code/game/objects/items/weapons/melee/energy_melee_weapons.dm +++ b/code/game/objects/items/weapons/melee/energy_melee_weapons.dm @@ -159,7 +159,8 @@ ..() return -/obj/item/melee/energy/sword/cyborg/saw //Used by medical Syndicate cyborgs +/// Used by medical Syndicate cyborgs +/obj/item/melee/energy/sword/cyborg/saw name = "energy saw" desc = "For heavy duty cutting. It has a carbon-fiber blade in addition to a toggleable hard-light edge to dramatically increase sharpness." force_on = 30 diff --git a/code/game/objects/items/weapons/pneumaticCannon.dm b/code/game/objects/items/weapons/pneumaticCannon.dm index bb7afcb6919..fd54057f187 100644 --- a/code/game/objects/items/weapons/pneumaticCannon.dm +++ b/code/game/objects/items/weapons/pneumaticCannon.dm @@ -173,7 +173,8 @@ requires_tank = FALSE max_weight_class = INFINITY -/obj/item/pneumatic_cannon/ghetto //Obtainable by improvised methods; more gas per use, less capacity, but smaller +/// Obtainable by improvised methods; more gas per use, less capacity, but smaller +/obj/item/pneumatic_cannon/ghetto name = "improvised pneumatic cannon" desc = "A gas-powered, object-firing cannon made out of common parts." force = 5 diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index c5fdde6e1ad..5f362b5ffe3 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -600,7 +600,8 @@ new /obj/item/clothing/mask/muzzle(src) new /obj/item/reagent_containers/glass/bottle/reagent/hydrocodone(src) -/obj/item/storage/backpack/duffel/syndie/med/surgery_fake //for maint spawns +/// for maint spawns +/obj/item/storage/backpack/duffel/syndie/med/surgery_fake name = "surgery duffelbag" desc = "A suspicious looking duffelbag for holding surgery tools." diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 11c745f7e72..7bc630ed97e 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -182,7 +182,8 @@ name = "cyborg mining satchel" flags = NODROP -/obj/item/storage/bag/ore/holding //miners, your messiah has arrived +/// miners, your messiah has arrived +/obj/item/storage/bag/ore/holding name = "mining satchel of holding" desc = "A revolution in convenience, this satchel allows for infinite ore storage. It's been outfitted with anti-malfunction safety measures." storage_slots = INFINITY @@ -244,7 +245,8 @@ // Because it stacks stacks, this doesn't operate normally. // However, making it a storage/bag allows us to reuse existing code in some places. -Sayu -/obj/item/storage/bag/sheetsnatcher // what is this even used for +/// what is this even used for +/obj/item/storage/bag/sheetsnatcher icon = 'icons/obj/mining.dmi' icon_state = "sheetsnatcher" name = "Sheet Snatcher" diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 7079b62de98..a51a93e365f 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -148,7 +148,8 @@ update_icon() //much roomier now that we've managed to remove two tools -/obj/item/storage/belt/utility/syndi_researcher // A cool looking belt thats essentially a syndicate toolbox +/// A cool looking belt thats essentially a syndicate toolbox +/obj/item/storage/belt/utility/syndi_researcher desc = "A belt for holding tools, but with style." icon_state = "assaultbelt" item_state = "assault" @@ -438,7 +439,8 @@ new /obj/item/grenade/chem_grenade/facid(src) //1 new /obj/item/grenade/chem_grenade/saringas(src) //1 -/obj/item/storage/belt/grenade/tactical // Traitor bundle version +/// Traitor bundle version +/obj/item/storage/belt/grenade/tactical name = "tactical grenadier belt" storage_slots = 20 // Not as many slots as the nukie one max_combined_w_class = 40 diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 43e323d9830..69816d0a405 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -1126,7 +1126,8 @@ /obj/item/storage/box/stockparts display_contents_with_number = TRUE -/obj/item/storage/box/stockparts/basic //for ruins where it's a bad idea to give access to an autolathe/protolathe, but still want to make stock parts accessible +/// for ruins where it's a bad idea to give access to an autolathe/protolathe, but still want to make stock parts accessible +/obj/item/storage/box/stockparts/basic name = "box of stock parts" desc = "Contains a variety of basic stock parts." diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 1607d8a1ad0..f098364adca 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -2,10 +2,12 @@ desc = "A sleek, sturdy box." icon_state = "doom_box" -/obj/item/storage/box/syndie_kit/bundle // Traitor bundles +/// Traitor bundles +/obj/item/storage/box/syndie_kit/bundle var/list/items = list() -/obj/item/storage/box/syndie_kit/bundle/spy // 172TC +/// 172TC +/obj/item/storage/box/syndie_kit/bundle/spy name = "Spy Bundle" desc = "Complete your objectives quietly with this compilation of stealthy items." items = list( @@ -23,7 +25,8 @@ /obj/item/door_remote/omni/access_tuner, // 30 TC /obj/item/encryptionkey/syndicate) // 10TC -/obj/item/storage/box/syndie_kit/bundle/agent13 // 159 +/// 159 +/obj/item/storage/box/syndie_kit/bundle/agent13 name = "Agent 13 Bundle" desc = "Find and eliminate your targets quietly and effectively with this kit." items = list( @@ -41,7 +44,8 @@ /obj/item/coin/gold, // 0TC /obj/item/encryptionkey/syndicate) // 10TC -/obj/item/storage/box/syndie_kit/bundle/thief // 160TC +/// 160TC +/obj/item/storage/box/syndie_kit/bundle/thief name = "Thief Bundle" desc = "Steal from friends, enemies, and interstellar megacorporations alike!" items = list( @@ -53,7 +57,8 @@ /obj/item/storage/backpack/satchel_flat, // 10TC /obj/item/encryptionkey/syndicate) // 10TC -/obj/item/storage/box/syndie_kit/bundle/bond // 137TC +/// 137TC +/obj/item/storage/box/syndie_kit/bundle/bond name = "Agent 007 Bundle" desc = "Shake your Martini and stir up trouble with this bundle of lethal equipment mixed with a spritz of gadgetry to keep things interesting." items = list( @@ -72,7 +77,8 @@ /obj/item/storage/box/syndie_kit/pen_bomb, // 30 TC /obj/item/CQC_manual) // 13TC -/obj/item/storage/box/syndie_kit/bundle/infiltrator // 155TC + RCD & Mesons Autoimplanter +/// 155TC + RCD & Mesons Autoimplanter +/obj/item/storage/box/syndie_kit/bundle/infiltrator name = "Infiltration Bundle" desc = "Use your teleporter, krav maga and other support tools to jump right into your desired location, quickly leaving as though you were never there." items = list( @@ -85,7 +91,8 @@ /obj/item/autosurgeon/organ/syndicate/meson_eyes, // 0TC /obj/item/encryptionkey/syndicate) // 2TC -/obj/item/storage/box/syndie_kit/bundle/payday // 175TC +/// 175TC +/obj/item/storage/box/syndie_kit/bundle/payday name = "Heist Bundle" desc = "Alright guys, today we're performing a heist on a space station owned by a greedy corporation. Drain the vault of all its worth so we can get that pay dirt!11" items = list( @@ -104,7 +111,8 @@ /obj/item/bio_chip_implanter/freedom/prototype, // 10 TC /obj/item/encryptionkey/syndicate) // 10TC -/obj/item/storage/box/syndie_kit/bundle/implant // 200TC +/// 200TC +/obj/item/storage/box/syndie_kit/bundle/implant name = "Bio-chip Bundle" desc = "A few useful bio-chips to give you some options for when you inevitably get captured by the Security." items = list( @@ -116,7 +124,8 @@ /obj/item/bio_chip_implanter/storage, // 40TC /obj/item/encryptionkey/syndicate) // 10TC -/obj/item/storage/box/syndie_kit/bundle/hacker // 180TC +/// 180TC +/obj/item/storage/box/syndie_kit/bundle/hacker name = "Hacker Bundle" desc = "A kit with everything you need to hack into and disrupt the Station, AI, its cyborgs and the Security team. HACK THE PLANET!" items = list( @@ -135,7 +144,8 @@ /obj/item/clothing/gloves/combat, // accounted in belt + toolbox /obj/item/flashlight/emp) // 4TC -/obj/item/storage/box/syndie_kit/bundle/darklord // 168TC + Telekinesis +/// 168TC + Telekinesis +/obj/item/storage/box/syndie_kit/bundle/darklord name = "Dark Lord Bundle" desc = "Turn your anger into hate and your hate into suffering with a mix of energy swords and magical powers. DO IT." items = list( @@ -150,7 +160,8 @@ /obj/item/clothing/shoes/chameleon/noslip, // 10TC /obj/item/encryptionkey/syndicate) // 10TC -/obj/item/storage/box/syndie_kit/bundle/professional // 164TC +/// 164TC +/obj/item/storage/box/syndie_kit/bundle/professional name = "Sniper Bundle" desc = "Suit up and handle yourself like a professional with a long-distance sniper rifle, additional .50 standard and penetrator rounds and thermal glasses to easily scope out your target." items = list( @@ -164,7 +175,8 @@ /obj/item/clothing/suit/storage/iaa/blackjacket/armored, // 3TC /obj/item/encryptionkey/syndicate) // 15TC -/obj/item/storage/box/syndie_kit/bundle/grenadier // 133TC + Tactical Grenadier Belt +/// 133TC + Tactical Grenadier Belt +/obj/item/storage/box/syndie_kit/bundle/grenadier name = "Grenade Bundle" desc = "A variety of grenades and pyrotechnics to ensure you can blast your way through any situation. " items = list( @@ -180,7 +192,8 @@ /obj/item/storage/box/syndie_kit/frag_grenades, // One box, as a treat /obj/item/encryptionkey/syndicate) // 10TC -/obj/item/storage/box/syndie_kit/bundle/metroid // 115TC + modules + laser gun +/// 115TC + modules + laser gun +/obj/item/storage/box/syndie_kit/bundle/metroid name = "Modsuit Bundle" desc = "Don the equipment of an intergalactic bounty hunter and blast your way through the station!" items = list( diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index d8e18e42e5f..5e76d2e44f9 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -1,7 +1,8 @@ /* * Fireaxe */ -/obj/item/fireaxe // DEM AXES MAN, marker -Agouri +/// DEM AXES MAN, marker -Agouri +/obj/item/fireaxe base_icon_state = "fireaxe" lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons_righthand.dmi' @@ -41,7 +42,8 @@ var/obj/structure/W = A W.obj_destruction("fireaxe") -/obj/item/fireaxe/boneaxe // Blatant imitation of the fireaxe, but made out of bone. +/// Blatant imitation of the fireaxe, but made out of bone. +/obj/item/fireaxe/boneaxe icon_state = "bone_axe0" base_icon_state = "bone_axe" name = "bone axe" @@ -306,7 +308,8 @@ explosive.prime() qdel(src) -/obj/item/spear/bonespear //Blatant imitation of spear, but made out of bone. Not valid for explosive modification. +/// Blatant imitation of spear, but made out of bone. Not valid for explosive modification. +/obj/item/spear/bonespear name = "bone spear" desc = "A haphazardly-constructed yet still deadly weapon. The pinnacle of modern technology." base_icon_state = "bone_spear" @@ -1017,7 +1020,8 @@ #undef BROOM_PUSH_LIMIT -/obj/item/supermatter_halberd //Supermatter Halberd, used by Oblivion Enforcers +/// Supermatter Halberd, used by Oblivion Enforcers +/obj/item/supermatter_halberd name = "supermatter halberd" desc = "The revered weapon of Oblivion Enforcers, used to enforce the Order's will." lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi' diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm index d34c9007ffb..66c122013ab 100644 --- a/code/game/objects/structures/barsign.dm +++ b/code/game/objects/structures/barsign.dm @@ -1,4 +1,5 @@ -/obj/structure/sign/barsign // All Signs are 64 by 32 pixels, they take two tiles +/// All Signs are 64 by 32 pixels, they take two tiles +/obj/structure/sign/barsign name = "Bar Sign" desc = "A bar sign with no writing on it." icon = 'icons/obj/barsigns.dmi' diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm index 28d421596d6..2ac142b2c3c 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm @@ -33,7 +33,8 @@ new /obj/item/storage/bag/mail(src) new /obj/item/melee/knuckleduster/nanotrasen(src) -/obj/structure/closet/secure_closet/quartermaster/lavaland //used in mining outpost +/// used in mining outpost +/obj/structure/closet/secure_closet/quartermaster/lavaland name = "quartermaster's secondary locker" /obj/structure/closet/secure_closet/quartermaster/lavaland/populate_contents() diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm index 38240e16315..5dffb626cf7 100644 --- a/code/game/objects/structures/crates_lockers/closets/statue.dm +++ b/code/game/objects/structures/crates_lockers/closets/statue.dm @@ -1,4 +1,5 @@ -/obj/structure/closet/statue //this type path is a crime, ponies what the fuck +/// this type path is a crime, ponies what the fuck +/obj/structure/closet/statue name = "statue" desc = "An incredibly lifelike marble carving" icon = 'icons/obj/statue.dmi' diff --git a/code/game/objects/structures/fluff.dm b/code/game/objects/structures/fluff.dm index 2e75b13bd15..f816563f3a9 100644 --- a/code/game/objects/structures/fluff.dm +++ b/code/game/objects/structures/fluff.dm @@ -22,14 +22,16 @@ return return ..() -/obj/structure/fluff/empty_terrarium //Empty terrariums are created when a preserved terrarium in a lavaland seed vault is activated. +/// Empty terrariums are created when a preserved terrarium in a lavaland seed vault is activated. +/obj/structure/fluff/empty_terrarium name = "empty terrarium" desc = "An ancient machine that seems to be used for storing plant matter. Its hatch is ajar." icon = 'icons/obj/lavaland/spawners.dmi' icon_state = "terrarium_open" density = TRUE -/obj/structure/fluff/empty_sleeper //Empty sleepers are created by a good few ghost roles in lavaland. +/// Empty sleepers are created by a good few ghost roles in lavaland. +/obj/structure/fluff/empty_sleeper name = "empty sleeper" desc = "An open sleeper. It looks as though it would be awaiting another patient, were it not broken." icon = 'icons/obj/cryogenic2.dmi' @@ -44,13 +46,15 @@ /obj/structure/fluff/empty_sleeper/syndicate icon_state = "sleeper_s-open" -/obj/structure/fluff/empty_cryostasis_sleeper //Empty cryostasis sleepers are created when a malfunctioning cryostasis sleeper in a lavaland shelter is activated +/// Empty cryostasis sleepers are created when a malfunctioning cryostasis sleeper in a lavaland shelter is activated +/obj/structure/fluff/empty_cryostasis_sleeper name = "empty cryostasis sleeper" desc = "Although comfortable, this sleeper won't function as anything but a bed ever again." icon = 'icons/obj/lavaland/spawners.dmi' icon_state = "cryostasis_sleeper_open" -/obj/structure/fluff/drake_statue //Ash drake status spawn on either side of the necropolis gate in lavaland. +/// Ash drake status spawn on either side of the necropolis gate in lavaland. +/obj/structure/fluff/drake_statue name = "drake statue" desc = "A towering basalt sculpture of a proud and regal drake. Its eyes are six glowing gemstones." icon = 'icons/effects/64x64.dmi' @@ -60,7 +64,8 @@ deconstructible = FALSE layer = EDGED_TURF_LAYER -/obj/structure/fluff/drake_statue/falling //A variety of statue in disrepair; parts are broken off and a gemstone is missing +/// A variety of statue in disrepair; parts are broken off and a gemstone is missing +/obj/structure/fluff/drake_statue/falling desc = "A towering basalt sculpture of a drake. Cracks run down its surface and parts of it have fallen off." icon_state = "drake_statue_falling" diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 6effd6dd37e..fbc538af4a1 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -277,7 +277,8 @@ C.add_queued_power_demand(C.get_queued_available_power() * 0.0375) // you can gain up to 3.5 via the 4x upgrades power is halved by the pole so thats 2x then 1X then .5X for 3.5x the 3 bounces shock. return ..() -/obj/structure/grille/broken // Pre-broken grilles for map placement +/// Pre-broken grilles for map placement +/obj/structure/grille/broken icon_state = "brokengrille" density = FALSE obj_integrity = 20 diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index 9d2860fd774..d01c09a789b 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -96,7 +96,8 @@ R.add_fingerprint(user) qdel(src) -/obj/structure/inflatable/door //Based on mineral door code +/// Based on mineral door code +/obj/structure/inflatable/door name = "inflatable door" icon_state = "door_closed" torn = /obj/item/inflatable/door/torn diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index 126142a7e6f..d3399770979 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -94,7 +94,8 @@ new /obj/item/stack/sheet/plastic/five(loc) qdel(src) -/obj/structure/plasticflaps/mining //A specific type for mining that doesn't allow airflow because of them damn crates +/// A specific type for mining that doesn't allow airflow because of them damn crates +/obj/structure/plasticflaps/mining name = "airtight plastic flaps" desc = "Heavy duty, airtight, plastic flaps." diff --git a/code/game/objects/structures/railings.dm b/code/game/objects/structures/railings.dm index 266460cc6a9..ff67ffde85a 100644 --- a/code/game/objects/structures/railings.dm +++ b/code/game/objects/structures/railings.dm @@ -15,12 +15,14 @@ /obj/structure/railing/get_climb_text() return "You can Click-Drag yourself to [src] to climb over it after a short delay." -/obj/structure/railing/corner //aesthetic corner sharp edges hurt oof ouch +/// aesthetic corner sharp edges hurt oof ouch +/obj/structure/railing/corner icon_state = "railing_corner" density = FALSE climbable = FALSE -/obj/structure/railing/cap //aestetic "end" for railing +/// aestetic "end" for railing +/obj/structure/railing/cap icon_state = "railing_cap" density = FALSE climbable = FALSE diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index c62d9d426ac..f6ece981b4c 100644 --- a/code/game/objects/structures/statues.dm +++ b/code/game/objects/structures/statues.dm @@ -264,7 +264,8 @@ desc = "A cheap statue of sandstone for a greyshirt." icon_state = "assist" -/obj/structure/statue/sandstone/venus //call me when we add marble i guess +/// call me when we add marble i guess +/obj/structure/statue/sandstone/venus name = "statue of a pure maiden" desc = "An ancient marble statue. The subject is depicted with a floor-length braid and is wielding a toolbox. By Jove, it's easily the most gorgeous depiction of a woman you've ever seen. The artist must truly be a master of his craft. Shame about the broken arm, though." icon = 'icons/obj/statuelarge.dmi' 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 125a515a2f2..6f01518ae99 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -1,4 +1,5 @@ -/obj/structure/chair // fuck you Pete +/// fuck you Pete +/obj/structure/chair name = "chair" desc = "You sit in this. Either by will or force." icon = 'icons/obj/chairs.dmi' diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index fce002c46a5..950a932c405 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -621,7 +621,8 @@ if(!total_override) ..() -/obj/structure/table/wood/poker //No specialties, Just a mapping object. +/// No specialties, Just a mapping object. +/obj/structure/table/wood/poker name = "gambling table" desc = "A seedy table for seedy dealings in seedy places." icon = 'icons/obj/smooth_structures/tables/poker_table.dmi' diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index f22e746da5c..284b39dd50f 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -610,7 +610,8 @@ can_rotate = 0 -/obj/structure/sink/puddle //splishy splashy ^_^ +/// splishy splashy ^_^ +/obj/structure/sink/puddle name = "puddle" desc = "A puddle of clean water. Looks refreshing." icon_state = "puddle" diff --git a/code/game/turfs/simulated/floor/asteroid_floors.dm b/code/game/turfs/simulated/floor/asteroid_floors.dm index dd869e06ae0..bb56be30dff 100644 --- a/code/game/turfs/simulated/floor/asteroid_floors.dm +++ b/code/game/turfs/simulated/floor/asteroid_floors.dm @@ -110,7 +110,8 @@ floor_variance = 15 digResult = /obj/item/stack/ore/glass/basalt -/turf/simulated/floor/plating/asteroid/basalt/lava //lava underneath +/// lava underneath +/turf/simulated/floor/plating/asteroid/basalt/lava baseturf = /turf/simulated/floor/lava /turf/simulated/floor/plating/asteroid/basalt/airless @@ -185,7 +186,8 @@ GLOBAL_LIST_INIT(megafauna_spawn_list, list(/mob/living/simple_animal/hostile/me var/data_having_type = /turf/simulated/floor/plating/asteroid/airless/cave/has_data turf_type = /turf/simulated/floor/plating/asteroid/airless -/turf/simulated/floor/plating/asteroid/airless/cave/has_data //subtype for producing a tunnel with given data +/// subtype for producing a tunnel with given data +/turf/simulated/floor/plating/asteroid/airless/cave/has_data has_data = TRUE /turf/simulated/floor/plating/asteroid/airless/cave/volcanic @@ -201,7 +203,8 @@ GLOBAL_LIST_INIT(megafauna_spawn_list, list(/mob/living/simple_animal/hostile/me nitrogen = 23 temperature = 300 -/turf/simulated/floor/plating/asteroid/airless/cave/volcanic/has_data //subtype for producing a tunnel with given data +/// subtype for producing a tunnel with given data +/turf/simulated/floor/plating/asteroid/airless/cave/volcanic/has_data has_data = TRUE /turf/simulated/floor/plating/asteroid/airless/cave/Initialize(mapload) diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index a7c41e9edc8..17264977073 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -85,14 +85,16 @@ base_icon_state = "junglegrass" smoothing_groups = list(SMOOTH_GROUP_TURF, SMOOTH_GROUP_GRASS, SMOOTH_GROUP_JUNGLE_GRASS) -/turf/simulated/floor/grass/no_creep //This vairant shows up under normal turfs so fits in the regular 32x32 sprite +/// This vairant shows up under normal turfs so fits in the regular 32x32 sprite +/turf/simulated/floor/grass/no_creep smoothing_flags = null smoothing_groups = null canSmoothWith = null layer = GRASS_UNDER_LAYER transform = null -/turf/simulated/floor/grass/jungle/no_creep //This vairant shows up under normal turfs so fits in the regular 32x32 sprite +/// This vairant shows up under normal turfs so fits in the regular 32x32 sprite +/turf/simulated/floor/grass/jungle/no_creep smoothing_flags = null smoothing_groups = null canSmoothWith = null diff --git a/code/game/turfs/simulated/floor/indestructible.dm b/code/game/turfs/simulated/floor/indestructible.dm index a2343a5e061..2cccdda0274 100644 --- a/code/game/turfs/simulated/floor/indestructible.dm +++ b/code/game/turfs/simulated/floor/indestructible.dm @@ -63,7 +63,8 @@ nitrogen = MOLES_N2STANDARD temperature = T20C -/turf/simulated/floor/indestructible/boss //you put stone tiles on this and use it as a base +/// you put stone tiles on this and use it as a base +/turf/simulated/floor/indestructible/boss name = "necropolis floor" icon = 'icons/turf/floors/boss_floors.dmi' icon_state = "boss" diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm index 9f2a665bf04..8a1de89314e 100644 --- a/code/game/turfs/simulated/floor/misc_floor.dm +++ b/code/game/turfs/simulated/floor/misc_floor.dm @@ -91,7 +91,8 @@ clawfootstep = FOOTSTEP_WATER heavyfootstep = FOOTSTEP_WATER -/turf/simulated/floor/beach/water // TODO - Refactor water so they share the same parent type - Or alternatively component something like that +/// TODO - Refactor water so they share the same parent type - Or alternatively component something like that +/turf/simulated/floor/beach/water name = "water" icon_state = "water" mouse_opacity = MOUSE_OPACITY_TRANSPARENT diff --git a/code/game/turfs/simulated/floor/plasteel_floor.dm b/code/game/turfs/simulated/floor/plasteel_floor.dm index 96e24e507c0..2e8f6935c2c 100644 --- a/code/game/turfs/simulated/floor/plasteel_floor.dm +++ b/code/game/turfs/simulated/floor/plasteel_floor.dm @@ -19,7 +19,8 @@ . = ..() name = "floor" -/turf/simulated/floor/plasteel/airless/indestructible // For bomb testing range +/// For bomb testing range +/turf/simulated/floor/plasteel/airless/indestructible /turf/simulated/floor/plasteel/airless/indestructible/ex_act(severity) return diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm index c439a00b1b5..108f5a51d83 100644 --- a/code/game/turfs/simulated/minerals.dm +++ b/code/game/turfs/simulated/minerals.dm @@ -1,6 +1,7 @@ /**********************Mineral deposits**************************/ -/turf/simulated/mineral //wall piece +/// wall piece +/turf/simulated/mineral name = "rock" icon = 'icons/turf/walls/smoothrocks.dmi' icon_state = "smoothrocks-0" diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm index 09d0b7cc436..1dc17ad67d4 100644 --- a/code/game/turfs/simulated/walls_mineral.dm +++ b/code/game/turfs/simulated/walls_mineral.dm @@ -212,7 +212,8 @@ /////////////////////Titanium walls///////////////////// -/turf/simulated/wall/mineral/titanium //has to use this path due to how building walls works +/// has to use this path due to how building walls works +/turf/simulated/wall/mineral/titanium name = "wall" desc = "A light-weight titanium wall used in shuttles." icon = 'icons/turf/walls/plastinum_wall.dmi' diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm index eca15970870..9cbb8575579 100644 --- a/code/game/turfs/space/transit.dm +++ b/code/game/turfs/space/transit.dm @@ -6,7 +6,8 @@ /turf/space/transit/attackby(obj/O as obj, mob/user as mob, params) return -/turf/space/transit/north // moving to the north +/// moving to the north +/turf/space/transit/north pushdirection = SOUTH // south because the space tile is scrolling south @@ -56,7 +57,8 @@ /turf/space/transit/north/shuttlespace_ns15 icon_state = "speedspace_ns_15" -/turf/space/transit/east // moving to the east +/// moving to the east +/turf/space/transit/east pushdirection = WEST /turf/space/transit/east/shuttlespace_ew1 diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm index ea6345143af..b28f460e4f5 100644 --- a/code/modules/antagonists/_common/antag_spawner.dm +++ b/code/modules/antagonists/_common/antag_spawner.dm @@ -174,7 +174,8 @@ ///////////SLAUGHTER DEMON -/obj/item/antag_spawner/slaughter_demon //Warning edgiest item in the game +/// Warning edgiest item in the game +/obj/item/antag_spawner/slaughter_demon name = "vial of blood" desc = "A magically infused bottle of blood, distilled from countless murder victims. Used in unholy rituals to attract horrifying creatures." icon = 'icons/obj/wizard.dmi' diff --git a/code/modules/antagonists/changeling/powers/tiny_prick.dm b/code/modules/antagonists/changeling/powers/tiny_prick.dm index 504c568f8a3..39b34d94949 100644 --- a/code/modules/antagonists/changeling/powers/tiny_prick.dm +++ b/code/modules/antagonists/changeling/powers/tiny_prick.dm @@ -127,7 +127,8 @@ SSblackbox.record_feedback("nested tally", "changeling_powers", 1, list("[name]")) return TRUE -/datum/action/changeling/sting/cryo //Enable when mob cooling is fixed so that frostoil actually makes you cold, instead of mostly just hungry. +/// Enable when mob cooling is fixed so that frostoil actually makes you cold, instead of mostly just hungry. +/datum/action/changeling/sting/cryo name = "Cryogenic Sting" desc = "We silently sting our victim with a cocktail of chemicals that freezes them from the inside. Costs 15 chemicals." helptext = "Does not provide a warning to the victim, though they will likely realize they are suddenly freezing." diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm index 2dc8bd21e1d..42dc9c3fb25 100644 --- a/code/modules/atmospherics/environmental/LINDA_fire.dm +++ b/code/modules/atmospherics/environmental/LINDA_fire.dm @@ -188,7 +188,8 @@ /obj/effect/hotspot/singularity_pull() return -/obj/effect/hotspot/fake // Largely for the fireflash procs below +/// Largely for the fireflash procs below +/obj/effect/hotspot/fake fake = TRUE burn_time = 30 diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index 58c4b12f163..9623efed493 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -117,7 +117,8 @@ custom_name = TRUE req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_ENGINE) -/obj/machinery/alarm/syndicate //general syndicate access +/// general syndicate access +/obj/machinery/alarm/syndicate report_danger_level = FALSE remote_control = FALSE req_access = list(ACCESS_SYNDICATE) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm index 9e2adeec3fc..daa791d502c 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm @@ -73,7 +73,8 @@ open() to_chat(user, "You [open ? "open" : "close"] [src].") -/obj/machinery/atmospherics/binary/valve/digital // can be controlled by AI +/// can be controlled by AI +/obj/machinery/atmospherics/binary/valve/digital name = "digital valve" desc = "A digitally controlled valve." icon = 'icons/atmos/digital_valve.dmi' diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/tvalve.dm b/code/modules/atmospherics/machinery/components/trinary_devices/tvalve.dm index 5797b62cf21..27871d8613e 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/tvalve.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/tvalve.dm @@ -104,7 +104,8 @@ sleep(10) switch_side() -/obj/machinery/atmospherics/trinary/tvalve/digital // can be controlled by AI +/// can be controlled by AI +/obj/machinery/atmospherics/trinary/tvalve/digital name = "digital switching valve" desc = "A digitally controlled valve." icon = 'icons/atmos/digital_tvalve.dmi' diff --git a/code/modules/awaymissions/mission_code/beach.dm b/code/modules/awaymissions/mission_code/beach.dm index bec7c33ed3a..88e5426a374 100644 --- a/code/modules/awaymissions/mission_code/beach.dm +++ b/code/modules/awaymissions/mission_code/beach.dm @@ -55,7 +55,8 @@ . = ..() //adds some aesthetic randomness to the beach sand icon_state = pick("desert", "desert0", "desert1", "desert2", "desert3", "desert4") -/turf/simulated/floor/beach/away/sand/dense //for boundary "walls" +/// for boundary "walls" +/turf/simulated/floor/beach/away/sand/dense density = TRUE baseturf = /turf/simulated/floor/beach/away/sand/dense @@ -71,7 +72,8 @@ clawfootstep = FOOTSTEP_WATER heavyfootstep = FOOTSTEP_WATER -/turf/simulated/floor/beach/away/coastline/dense //for boundary "walls" +/// for boundary "walls" +/turf/simulated/floor/beach/away/coastline/dense density = TRUE baseturf = /turf/simulated/floor/beach/away/coastline/dense @@ -117,7 +119,8 @@ temperature = 300 planetary_atmos = TRUE -/turf/simulated/floor/beach/away/water/dense //for boundary "walls" +/// for boundary "walls" +/turf/simulated/floor/beach/away/water/dense density = TRUE baseturf = /turf/simulated/floor/beach/away/water/dense diff --git a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm index 1bd791fa8cb..03bde7c6b0e 100644 --- a/code/modules/clothing/glasses/engine_goggles.dm +++ b/code/modules/clothing/glasses/engine_goggles.dm @@ -101,7 +101,8 @@ user.update_inv_l_hand() user.update_inv_r_hand() -/obj/item/clothing/glasses/meson/engine/tray //atmos techs have lived far too long without tray goggles while those damned engineers get their dual-purpose gogles all to themselves +/// atmos techs have lived far too long without tray goggles while those damned engineers get their dual-purpose gogles all to themselves +/obj/item/clothing/glasses/meson/engine/tray name = "optical t-ray scanner" icon_state = "trayson-t-ray" item_state = "trayson-t-ray" diff --git a/code/modules/clothing/gloves/colored_gloves.dm b/code/modules/clothing/gloves/colored_gloves.dm index c2b8ea24035..59c567846ed 100644 --- a/code/modules/clothing/gloves/colored_gloves.dm +++ b/code/modules/clothing/gloves/colored_gloves.dm @@ -14,7 +14,8 @@ /obj/item/clothing/gloves/color/yellow/fake siemens_coefficient = 1 -/obj/item/clothing/gloves/color/fyellow //Cheap Chinese Crap +/// Cheap Chinese Crap +/obj/item/clothing/gloves/color/fyellow name = "budget insulated gloves" desc = "These gloves are cheap copies of the coveted gloves, no way this can end badly." icon_state = "yellow" diff --git a/code/modules/clothing/gloves/rings.dm b/code/modules/clothing/gloves/rings.dm index 1de30c936a8..ed180788bc9 100644 --- a/code/modules/clothing/gloves/rings.dm +++ b/code/modules/clothing/gloves/rings.dm @@ -44,7 +44,8 @@ material = "silver" ring_color = "silver" -/obj/item/clothing/gloves/ring/silver/blessed // todo +/// todo +/obj/item/clothing/gloves/ring/silver/blessed name = "blessed silver ring" /obj/item/clothing/gloves/ring/gold diff --git a/code/modules/clothing/head/beanie.dm b/code/modules/clothing/head/beanie.dm index 67dedaa6558..21e0bc2b4a7 100644 --- a/code/modules/clothing/head/beanie.dm +++ b/code/modules/clothing/head/beanie.dm @@ -3,7 +3,8 @@ //Plus a bobble hat, lets be inclusive!! -/obj/item/clothing/head/beanie //Default is white, this is meant to be seen +/// Default is white, this is meant to be seen +/obj/item/clothing/head/beanie name = "white beanie" desc = "A stylish beanie. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their heads." icon_state = "beanie" //Default white diff --git a/code/modules/clothing/head/misc_hats.dm b/code/modules/clothing/head/misc_hats.dm index 501bfcb60b9..2c7f0890a61 100644 --- a/code/modules/clothing/head/misc_hats.dm +++ b/code/modules/clothing/head/misc_hats.dm @@ -392,7 +392,8 @@ "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) -/obj/item/clothing/head/stalhelm //Why do these exist - Because they aren't specifically Nazi Germany +/// Why do these exist - Because they aren't specifically Nazi Germany +/obj/item/clothing/head/stalhelm name = "clown stalhelm" desc = "The typical clown soldier's helmet." icon_state = "stalhelm" @@ -415,7 +416,8 @@ flags = BLOCKHAIR flags_inv = HIDEEARS -/obj/item/clothing/head/beret/purple //Fluff? +/// Fluff? +/obj/item/clothing/head/beret/purple name = "Pierson Family Beret" desc = " A purple beret, with a small golden crescent moon sewn onto it." icon_state = "beret_purple" diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index ce849a5016f..25f49a27a8b 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -94,7 +94,8 @@ magboot_state = "syndiemag" origin_tech = "magnets=4;syndicate=2" -/obj/item/clothing/shoes/magboots/elite //For the Syndicate Strike Team/SolGov/Tactical Teams +/// For the Syndicate Strike Team/SolGov/Tactical Teams +/obj/item/clothing/shoes/magboots/elite name = "elite tactical magboots" desc = "Advanced magboots used by strike teams across the system. Allows for tactical insertion into low-gravity areas of operation." icon_state = "elitemag0" @@ -143,7 +144,8 @@ to_chat(user, "You switch on the waddle dampeners!") enabled_waddle = FALSE -/obj/item/clothing/shoes/magboots/wizard //bundled with the wiz hardsuit +/// bundled with the wiz hardsuit +/obj/item/clothing/shoes/magboots/wizard name = "boots of gripping" desc = "These magical boots, once activated, will stay gripped to any surface without slowing you down." icon_state = "wizmag0" diff --git a/code/modules/clothing/shoes/misc_shoes.dm b/code/modules/clothing/shoes/misc_shoes.dm index 86b85ccb40f..40e71c54356 100644 --- a/code/modules/clothing/shoes/misc_shoes.dm +++ b/code/modules/clothing/shoes/misc_shoes.dm @@ -3,7 +3,8 @@ icon_state = "mime" item_color = "mime" -/obj/item/clothing/shoes/combat //basic syndicate combat boots for nuke ops and mob corpses +/// basic syndicate combat boots for nuke ops and mob corpses +/obj/item/clothing/shoes/combat name = "combat boots" desc = "High speed, low drag combat boots." w_class = WEIGHT_CLASS_NORMAL @@ -14,7 +15,8 @@ strip_delay = 70 resistance_flags = NONE -/obj/item/clothing/shoes/combat/swat //overpowered gimmick boots +/// overpowered gimmick boots +/obj/item/clothing/shoes/combat/swat name = "\improper SWAT shoes" desc = "High speed, no drag combat boots." permeability_coefficient = 0.01 @@ -57,7 +59,8 @@ desc = "A pair of purple rubber boots, designed to prevent slipping on wet surfaces while also drying them." icon_state = "galoshes_dry" -/obj/item/clothing/shoes/galoshes/dry/lightweight /// for red janitor ert. +/// / for red janitor ert. +/obj/item/clothing/shoes/galoshes/dry/lightweight name = "lightweight absorbent galoshes" desc = "A pair of expensive looking lightweight rubber boots, designed to prevent slipping on wet surfaces while also drying them." slowdown = NONE diff --git a/code/modules/clothing/suits/armor_suits.dm b/code/modules/clothing/suits/armor_suits.dm index 47c2b602ff7..7250245bbeb 100644 --- a/code/modules/clothing/suits/armor_suits.dm +++ b/code/modules/clothing/suits/armor_suits.dm @@ -648,7 +648,8 @@ disable(rand(2, 5)) return TRUE -/obj/item/clothing/suit/armor/reactive/random //Spawner for random reactive armor +/// Spawner for random reactive armor +/obj/item/clothing/suit/armor/reactive/random name = "Random Reactive Armor" /obj/item/clothing/suit/armor/reactive/random/Initialize(mapload) diff --git a/code/modules/clothing/suits/misc_suits.dm b/code/modules/clothing/suits/misc_suits.dm index 1165ab50057..c7c3ed8b9d3 100644 --- a/code/modules/clothing/suits/misc_suits.dm +++ b/code/modules/clothing/suits/misc_suits.dm @@ -325,7 +325,8 @@ flags = BLOCKHAIR flags_inv = HIDEEARS -/obj/item/clothing/suit/hooded/bee_costume // It's Hip! +/// It's Hip! +/obj/item/clothing/suit/hooded/bee_costume name = "bee costume" desc = "Bee the true Queen!" icon_state = "bee" @@ -344,14 +345,16 @@ flags_inv = HIDEEARS sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi') -/obj/item/clothing/suit/bloated_human //OH MY GOD WHAT HAVE YOU DONE!?!?!? +/// OH MY GOD WHAT HAVE YOU DONE!?!?!? +/obj/item/clothing/suit/bloated_human name = "bloated human suit" desc = "A horribly bloated suit made from human skins." icon_state = "lingspacesuit" item_state = "lingspacesuit" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS -/obj/item/clothing/suit/draculacoat // Bleh! +/// Bleh! +/obj/item/clothing/suit/draculacoat name = "transylvanian coat" desc = "What is a spessman? A miserable little pile of secrets." icon_state = "draculacoat" diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 764ff21a70d..36482610261 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -133,7 +133,8 @@ icon_state = "horribletie" item_color = "horribletie" -/obj/item/clothing/accessory/waistcoat // No overlay +/// No overlay +/obj/item/clothing/accessory/waistcoat name = "waistcoat" desc = "For some classy, murderous fun." icon_state = "waistcoat" @@ -311,7 +312,8 @@ desc = "An award issued by the Quartermaster to supply staff dedicated to being effective." channel = "Supply" -/obj/item/clothing/accessory/medal/recruiter // Prize for the NT Recruiter emagged arcade +/// Prize for the NT Recruiter emagged arcade +/obj/item/clothing/accessory/medal/recruiter name = "nanotrasen recruiter medal" desc = "A prize for those who completed the company's most difficult training, use it to earn the respect of everyone in human resources." @@ -363,7 +365,8 @@ desc = "An award which represents magnificant contributions to the HRD-MDE project in the form of analysing Bubblegum, and the related blood space." channel = null -/obj/item/clothing/accessory/medal/gold/heroism/hardmode_full //Kill every hardmode boss. In a shift. Good luck. +/// Kill every hardmode boss. In a shift. Good luck. +/obj/item/clothing/accessory/medal/gold/heroism/hardmode_full name = "medal of incredible dedication" desc = "An extremely rare golden medal awarded only by CentComm. This medal was issued for miners who went above and beyond for the HRD-MDE project. Engraved on it is the phrase 'mori quam foedari'..." channel = null @@ -489,7 +492,8 @@ //SCARVES// /////////// -/obj/item/clothing/accessory/scarf // No overlay +/// No overlay +/obj/item/clothing/accessory/scarf name = "scarf" desc = "A stylish scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks." dog_fashion = /datum/dog_fashion/head diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 255e7432b88..33dc2ab3c39 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -125,7 +125,8 @@ item_state = "p_suit" item_color = "purple" -/obj/item/clothing/under/color/purple/sensor //for jani ert +/// for jani ert +/obj/item/clothing/under/color/purple/sensor sensor_mode = SENSOR_COORDS random_sensor = FALSE diff --git a/code/modules/clothing/under/costumes.dm b/code/modules/clothing/under/costumes.dm index 7a851e43839..775802ef24d 100644 --- a/code/modules/clothing/under/costumes.dm +++ b/code/modules/clothing/under/costumes.dm @@ -138,7 +138,8 @@ item_state = "psyamp" item_color = "psyamp" -/obj/item/clothing/under/psysuit //Don't modify the path, used by a fluff item +/// Don't modify the path, used by a fluff item +/obj/item/clothing/under/psysuit name = "dark undersuit" desc = "A thick, layered grey undersuit lined with power cables. Feels a little like wearing an electrical storm." icon_state = "psysuit" diff --git a/code/modules/clothing/under/jobs/medical_jumpsuits.dm b/code/modules/clothing/under/jobs/medical_jumpsuits.dm index 8dedff438e1..7a8258f77c0 100644 --- a/code/modules/clothing/under/jobs/medical_jumpsuits.dm +++ b/code/modules/clothing/under/jobs/medical_jumpsuits.dm @@ -149,7 +149,8 @@ item_state = "psychturtle" item_color = "psychturtle" -/obj/item/clothing/under/rank/medical/gown //Seems like it should be here for organisational purposes +/// Seems like it should be here for organisational purposes +/obj/item/clothing/under/rank/medical/gown name = "medical gown" desc = "a flimsy examination gown, the back ties never close." icon_state = "medicalgown" diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index 27a767271d6..e178aa0c44e 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -818,7 +818,8 @@ category = CAT_PRIMAL alert_admins_on_craft = TRUE -/datum/crafting_recipe/rake //Category resorting incoming +/// Category resorting incoming +/datum/crafting_recipe/rake name = "Rake" time = 30 reqs = list(/obj/item/stack/sheet/wood = 5) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index afa07900913..690d19e6303 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -16,7 +16,8 @@ /obj/item/fluff var/used = FALSE -/obj/item/fluff/tattoo_gun // Generic tattoo gun, make subtypes for different folks +/// Generic tattoo gun, make subtypes for different folks +/obj/item/fluff/tattoo_gun name = "disposable tattoo pen" desc = "A cheap plastic tattoo application pen." icon = 'icons/obj/custom_items.dmi' @@ -112,7 +113,8 @@ else to_chat(user, "[src] is out of ink!") -/obj/item/fluff/bird_painter // BirdtTalon: Kahkiri +/// BirdtTalon: Kahkiri +/obj/item/fluff/bird_painter name = "Orb of Onyx" desc = "It is imbued with such dark power as to corrupt the very appearance of those who gaze into its depths." icon_state = "bird_orb" @@ -126,7 +128,8 @@ to_chat(user, "You use [src] on yourself.") qdel(src) -/obj/item/claymore/fluff // MrBarrelrolll: Maximus Greenwood +/// MrBarrelrolll: Maximus Greenwood +/obj/item/claymore/fluff name = "Greenwood's Blade" desc = "A replica claymore with strange markings scratched into the blade." force = 5 @@ -135,7 +138,8 @@ /obj/item/claymore/fluff/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) return 0 -/obj/item/fluff/rsik_katana //Xydonus: Rsik Ugsharki Atan +/// Xydonus: Rsik Ugsharki Atan +/obj/item/fluff/rsik_katana name = "ceremonial katana" desc = "A shimmering ceremonial golden katana, for the most discerning class of ninja. Looks expensive, and fragile." icon = 'icons/obj/custom_items.dmi' @@ -156,31 +160,36 @@ user.visible_message("[user] tries to stab [src] into [user.p_their()] stomach! Except [src] shatters! [user.p_they(TRUE)] look[user.p_s()] as if [user.p_they()] might die from the shame.") return BRUTELOSS -/obj/item/crowbar/fluff/zelda_creedy_1 // Zomgponies: Griffin Rowley +/// Zomgponies: Griffin Rowley +/obj/item/crowbar/fluff/zelda_creedy_1 name = "Zelda's Crowbar" desc = "A pink crowbar that has an engraving that reads, 'To Zelda. Love always, Dawn'" icon = 'icons/obj/custom_items.dmi' icon_state = "zeldacrowbar" item_state = "crowbar" -/obj/item/clothing/glasses/monocle/fluff/trubus //Trubus: Wolf O'Shaw +/// Trubus: Wolf O'Shaw +/obj/item/clothing/glasses/monocle/fluff/trubus name = "Gold Thermal Eyepatch" desc = "Wolf's non-functional thermal eyepatch." icon = 'icons/obj/custom_items.dmi' icon_state = "wolf_eyepatch" -/obj/item/clothing/glasses/meson/fluff/book_berner_1 // Adrkiller59: Adam Cooper +/// Adrkiller59: Adam Cooper +/obj/item/clothing/glasses/meson/fluff/book_berner_1 name = "bespectacled mesonic surveyors" desc = "One of the older meson scanner models retrofitted to perform like its modern counterparts." icon = 'icons/obj/custom_items.dmi' icon_state = "book_berner_1" -/obj/item/clothing/glasses/sunglasses_fake/fluff/kaki //Rapidvalj: Kakicharakiti +/// Rapidvalj: Kakicharakiti +/obj/item/clothing/glasses/sunglasses_fake/fluff/kaki name = "broken thermonocle" desc = "A weathered Vox thermonocle, doesn't seem to work anymore." icon_state = "thermoncle" -/obj/item/fluff/rapid_wheelchair_kit //Rapidvalj: Hakikarahiti +/// Rapidvalj: Hakikarahiti +/obj/item/fluff/rapid_wheelchair_kit name = "wheelchair conversion kit" desc = "An assorted set of exchangable parts for a wheelchair." icon_state = "modkit" @@ -208,31 +217,36 @@ desc = "A custom made zippo lighter." icon = 'icons/obj/custom_items.dmi' -/obj/item/lighter/zippo/fluff/purple // GodOfOreos: Jason Conrad +/// GodOfOreos: Jason Conrad +/obj/item/lighter/zippo/fluff/purple name = "purple engraved zippo" desc = "All craftsspacemanship is of the highest quality. It is encrusted with refined plasma sheets. On the item is an image of a dwarf and the words 'Strike the Earth!' etched onto the side." icon_state = "zippo-purple" item_state = "zippo-purple" -/obj/item/lighter/zippo/fluff/michael_guess_1 // mrbits: Callista Gold +/// mrbits: Callista Gold +/obj/item/lighter/zippo/fluff/michael_guess_1 name = "engraved lighter" desc = "A golden lighter, engraved with some ornaments and a G." icon_state = "zippo-guess" item_state = "zippo-gold" -/obj/item/lighter/zippo/fluff/duckchan // Duckchan: Rybys Romney +/// Duckchan: Rybys Romney +/obj/item/lighter/zippo/fluff/duckchan name = "Monogrammed Zippo" desc = " A shiny purple zippo lighter, engraved with Rybys Romney and BuzzPing's name, with a festive green flame." icon_state = "zippo-duckchan" item_state = "zippo-purple" -/obj/item/lighter/zippo/fluff/warriorstar // Warriorstar: DEADLOCK +/// Warriorstar: DEADLOCK +/obj/item/lighter/zippo/fluff/warriorstar name = "zippo" desc = "The lighter is made of a pastel purple metal which seems to glimmer even in complete darkness." icon_state = "zippo-warriorstar" item_state = "zippo-purple" -/obj/item/fluff/dogwhistle //phantasmicdream: Zeke Varloss +/// phantasmicdream: Zeke Varloss +/obj/item/fluff/dogwhistle name = "Sax's whistle" desc = "This whistle seems to have a strange aura about it. Maybe you should blow on it?" icon = 'icons/obj/custom_items.dmi' @@ -256,7 +270,8 @@ user.drop_item() qdel(src) -/obj/item/storage/toolbox/fluff/lunchbox //godoforeos: Jason Conrad +/// godoforeos: Jason Conrad +/obj/item/storage/toolbox/fluff/lunchbox name = "lunchpail" desc = "A simple black lunchpail." icon = 'icons/obj/custom_items.dmi' @@ -297,7 +312,8 @@ to_chat(target, "You comb your tail with [src].") used = TRUE -/obj/item/fluff/desolate_coat_kit //DesolateG: Micheal Smith +/// DesolateG: Micheal Smith +/obj/item/fluff/desolate_coat_kit name = "armored jacket conversion kit" desc = "Flaps of dark fabric, probably used to somehow modify some sort of an armored garment. Won't help with protection, though." icon_state = "modkit" @@ -328,7 +344,8 @@ user.update_inv_wear_suit() qdel(src) -/obj/item/fluff/fei_gasmask_kit //Fei Hazelwood: Tariq Yon-Dale +/// Fei Hazelwood: Tariq Yon-Dale +/obj/item/fluff/fei_gasmask_kit name = "gas mask conversion kit" desc = "A gas mask conversion kit." icon_state = "modkit" @@ -354,7 +371,8 @@ to_chat(user, "You can't modify [target]!") -/obj/item/fluff/desolate_baton_kit //DesolateG: Micheal Smith +/// DesolateG: Micheal Smith +/obj/item/fluff/desolate_baton_kit name = "stun baton conversion kit" desc = "Some sci-fi looking parts for a stun baton." icon = 'icons/obj/custom_items.dmi' @@ -380,7 +398,8 @@ to_chat(user, "You can't modify [target]!") -/obj/item/fluff/cardgage_helmet_kit //captain cardgage: Richard Ulery +/// captain cardgage: Richard Ulery +/obj/item/fluff/cardgage_helmet_kit name = "welding helmet modkit" desc = "Some spraypaint and a stencil, perfect for painting flames onto a welding helmet!" icon_state = "modkit" @@ -402,7 +421,8 @@ return to_chat(user, "You can't modify [target]!") -/obj/item/fluff/merchant_sallet_modkit //Travelling Merchant: Trav Noble. This is what they spawn in with +/// Travelling Merchant: Trav Noble. This is what they spawn in with +/obj/item/fluff/merchant_sallet_modkit name = "SG Helmet modkit" desc = "A modkit that can make most helmets look like a Shellguard Helmet." icon_state = "modkit" @@ -445,7 +465,8 @@ else to_chat(user, "You can't modify [target]!") -/obj/item/fluff/k3_webbing_modkit //IK3I: Yakikatachi +/// IK3I: Yakikatachi +/obj/item/fluff/k3_webbing_modkit name = "webbing modkit" desc = "A modkit that can be used to turn certain vests and labcoats into lightweight webbing" icon_state = "modkit" @@ -470,7 +491,8 @@ to_chat(user, "You can't modify [target]!") // These two fluff items are commented out due to the transfer to MODsuits breaking these. Sprites are still in custom_items.dmi , but they need a resprite to work with MODsuits. -/obj/item/fluff/pyro_wintersec_kit //DarkLordpyro: Valthorne Haliber +/// DarkLordpyro: Valthorne Haliber +/obj/item/fluff/pyro_wintersec_kit name = "winter sec conversion kit" desc = "A securirty hardsuit conversion kit." icon_state = "modkit" @@ -523,7 +545,8 @@ to_chat(user, "You can't modify [target]!") */ -/obj/item/fluff/sylus_conversion_kit //Decemviri: Sylus Cain +/// Decemviri: Sylus Cain +/obj/item/fluff/sylus_conversion_kit name = "cerberus pattern conversion kit" desc = "A securirty hardsuit conversion kit." icon_state = "modkit" @@ -589,53 +612,61 @@ //////////// Gloves ////////////// //////////// Eye Wear //////////// -/obj/item/clothing/glasses/hud/security/sunglasses/fluff/eyepro //T0EPIC4U: Ty Omaha +/// T0EPIC4U: Ty Omaha +/obj/item/clothing/glasses/hud/security/sunglasses/fluff/eyepro name = "Tacticool EyePro" desc = "Tacticool ballistic glasses, for making all operators look badass." icon = 'icons/obj/custom_items.dmi' icon_state = "eyepro" item_state = "eyepro" -/obj/item/clothing/glasses/hud/security/sunglasses/fluff/voxxyhud //LP Spartan: Kaskreyarawkta +/// LP Spartan: Kaskreyarawkta +/obj/item/clothing/glasses/hud/security/sunglasses/fluff/voxxyhud name = "VoxxyHUD" desc = "A worn down visor from a vox raider's gear, crudely ripped from its helmet and linked into the security systems of the station. The word 'Kask' is scratched into the side." icon = 'icons/obj/custom_items.dmi' icon_state = "hud-spartan" //////////// Hats //////////// -/obj/item/clothing/head/fluff/heather_winceworth // Regens: Heather Winceworth +/// Regens: Heather Winceworth +/obj/item/clothing/head/fluff/heather_winceworth name= "Heather's rose" desc= "A beautiful purple rose for your hair." icon= 'icons/obj/custom_items.dmi' icon_state = "hairflowerp" item_state = "hairflowerp" -/obj/item/clothing/head/valkyriehelmet //R3Valkyrie: Rikki +/// R3Valkyrie: Rikki +/obj/item/clothing/head/valkyriehelmet name = "charred visor" desc = "A visor of alien origin, charred by fire and completely non-functioning. It's been impeccably polished, shiny!" icon = 'icons/obj/custom_items.dmi' icon_state = "charred_visor" species_restricted = list("Vox") -/obj/item/clothing/head/bearpelt/fluff/polar //Gibson1027: Sploosh +/// Gibson1027: Sploosh +/obj/item/clothing/head/bearpelt/fluff/polar name = "polar bear pelt hat" desc = "Fuzzy, and also stained with blood." icon = 'icons/obj/custom_items.dmi' icon_state = "polarbearpelt" -/obj/item/clothing/head/fluff/sparkyninja_beret // Sparkyninja: Neil Wilkinson +/// Sparkyninja: Neil Wilkinson +/obj/item/clothing/head/fluff/sparkyninja_beret name = "royal marines commando beret" desc = "Dark Green beret with an old insignia on it." icon = 'icons/obj/custom_items.dmi' icon_state = "sparkyninja_beret" -/obj/item/clothing/head/beret/fluff/sigholt //sigholtstarsong: Sigholt Starsong +/// sigholtstarsong: Sigholt Starsong +/obj/item/clothing/head/beret/fluff/sigholt name = "Lieutenant Starsong's beret" desc = "This beret bears insignia of the SOLGOV Marine Corps 417th Regiment, 2nd Battalion, Bravo Company. It looks meticulously maintained." icon_state = "beret_hos" item_state = "beret_hos" -/obj/item/clothing/head/pirate/fluff/stumpy //MrFroztee: Stumpy +/// MrFroztee: Stumpy +/obj/item/clothing/head/pirate/fluff/stumpy name = "The Sobriety Skullcap" desc = "A hat suited for the king of the pirates" icon_state = "pirate" @@ -655,19 +686,22 @@ if(H.head == src) H.Slur(6 SECONDS) //always slur -/obj/item/clothing/head/beret/fluff/linda //Epic_Charger: Linda Clark +/// Epic_Charger: Linda Clark +/obj/item/clothing/head/beret/fluff/linda name = "Green beret" desc = "A beret, an artist's favorite headwear. This one has two holes cut on the edges." icon = 'icons/obj/custom_items.dmi' icon_state = "linda_beret" -/obj/item/clothing/head/fluff/kaki //Rapidvalj: Kakicharakiti +/// Rapidvalj: Kakicharakiti +/obj/item/clothing/head/fluff/kaki name = "sleek fancy leader hat" desc = "A uniquely colored vox leader hat. Has some signs of wear." icon = 'icons/obj/custom_items.dmi' icon_state = "kakicharakiti" -/obj/item/clothing/head/helmet/fluff/merchant_sallet //Travelling Merchant: Trav Noble. This >>IS NOT<< what they spawn in with +/// Travelling Merchant: Trav Noble. This >>IS NOT<< what they spawn in with +/obj/item/clothing/head/helmet/fluff/merchant_sallet name = "Shellguard Helmet" desc = "A Shellguard Helmet with the name Noble written on the inside." icon = 'icons/obj/custom_items.dmi' @@ -715,7 +749,8 @@ user.update_inv_head() return 1 -/obj/item/clothing/head/beret/fluff/elo //V-Force_Bomber: E.L.O. +/// V-Force_Bomber: E.L.O. +/obj/item/clothing/head/beret/fluff/elo name = "E.L.O.'s medical beret" desc = "E.L.O.s personal medical beret, issued by Nanotrassen and awarded along with her medal." icon = 'icons/obj/custom_items.dmi' @@ -729,7 +764,8 @@ adjust_flavour = null sprite_sheets = null -/obj/item/clothing/suit/storage/labcoat/fluff/pulsecoat //ozewse : Daniel Harper : Donated to them by Runemeds, who is the original donor. +/// ozewse : Daniel Harper : Donated to them by Runemeds, who is the original donor. +/obj/item/clothing/suit/storage/labcoat/fluff/pulsecoat name = "EMT pulse coat" desc = "An EMT labcoat modified to track the wearer's heartbeat. It's so worn out that it doesn't seem to accurately track heartbeat anymore. Also, the zipper is stuck." icon = 'icons/obj/custom_items.dmi' @@ -738,7 +774,8 @@ ignore_suitadjust = 1 actions_types = list() -/obj/item/clothing/suit/jacket/miljacket/patch // sniper_fairy : P.A.T.C.H. +/// sniper_fairy : P.A.T.C.H. +/obj/item/clothing/suit/jacket/miljacket/patch name = "custom purple military jacket" desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable. This one has a medical patch on it." icon = 'icons/obj/custom_items.dmi' @@ -785,20 +822,23 @@ . = ..() -/obj/item/clothing/suit/fluff/dusty_jacket //ComputerlessCitizen: Screech +/// ComputerlessCitizen: Screech +/obj/item/clothing/suit/fluff/dusty_jacket name = "Dusty Jacket" desc = "A worn leather jacket. Some burn holes have been patched." body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS icon_state = "dusty_jacket" -/obj/item/clothing/suit/fluff/cheeky_sov_coat //CheekyCrenando: Srusu Rskuzu +/// CheekyCrenando: Srusu Rskuzu +/obj/item/clothing/suit/fluff/cheeky_sov_coat name = "Srusu's Greatcoat" desc = "A heavy wool Soviet-style greatcoat. A name is written in fancy handwriting on the inside tag: Srusu Rskuzu" icon = 'icons/obj/custom_items.dmi' item_state = "cheeky_sov_coat" icon_state = "cheeky_sov_coat" -/obj/item/clothing/suit/fluff/supplymaster_jacket //Denthamos: Henry Grandpa Gadow +/// Denthamos: Henry Grandpa Gadow +/obj/item/clothing/suit/fluff/supplymaster_jacket name = "faded NT Supply Master's Coat" desc = "A faded leather overcoat bearing a worn out badge from the NAS Crescent on the shoulder, and a designation tag of Supply Master on the front. A tarnished gold nameplate says H.Gadow on it." icon_state = "supplymaster_jacket_open" @@ -811,14 +851,16 @@ actions_types = list(/datum/action/item_action/button) adjust_flavour = "unbutton" -/obj/item/clothing/suit/storage/labcoat/fluff/aeneas_rinil //Socialsystem: Lynn Fea +/// Socialsystem: Lynn Fea +/obj/item/clothing/suit/storage/labcoat/fluff/aeneas_rinil name = "Robotics labcoat" desc = "A labcoat with a few markings denoting it as the labcoat of roboticist." icon = 'icons/obj/custom_items.dmi' icon_state = "aeneasrinil_open" sprite_sheets = null -/obj/item/clothing/suit/jacket/fluff/kidosvest // Anxipal: Kido Qasteth +/// Anxipal: Kido Qasteth +/obj/item/clothing/suit/jacket/fluff/kidosvest name = "Kido's Vest" desc = "A rugged leather vest with a tag labelled \"Men of Mayhem.\"" icon = 'icons/obj/custom_items.dmi' @@ -829,7 +871,8 @@ adjust_flavour = null sprite_sheets = null -/obj/item/clothing/suit/jacket/fluff/jacksvest // Anxipal: Jack Harper +/// Anxipal: Jack Harper +/obj/item/clothing/suit/jacket/fluff/jacksvest name = "Jack's vest" desc = "A rugged leather vest with a tag labelled \"President\"." icon = 'icons/obj/custom_items.dmi' @@ -839,7 +882,8 @@ adjust_flavour = null sprite_sheets = null -/obj/item/clothing/suit/fluff/kluys // Kluys: Cripty Pandaen +/// Kluys: Cripty Pandaen +/obj/item/clothing/suit/fluff/kluys name = "Nano Fibre Jacket" desc = "A Black Suit made out of nanofibre. The newest of cyberpunk fashion using hightech liquid to solid materials." icon = 'icons/obj/custom_items.dmi' @@ -870,38 +914,44 @@ return usr.update_inv_wear_suit() -/obj/item/clothing/suit/storage/labcoat/fluff/red // Sweetjealousy: Sophie Faust-Noms +/// Sweetjealousy: Sophie Faust-Noms +/obj/item/clothing/suit/storage/labcoat/fluff/red name = "red labcoat" desc = "A suit that protects against minor chemical spills. Has a red stripe on the shoulders and rolled up sleeves." icon = 'icons/obj/custom_items.dmi' icon_state = "labcoat_red_open" sprite_sheets = null -/obj/item/clothing/suit/storage/labcoat/fluff/ionward_labcoat // Ionward: Gemini +/// Ionward: Gemini +/obj/item/clothing/suit/storage/labcoat/fluff/ionward_labcoat name = "Technocracy labcoat" desc = "A thin, faded, carbon fiber labcoat. On the back, a Technocracy vessel's logo. Inside, the name 'Gemini' is printed on the collar." icon = 'icons/obj/custom_items.dmi' icon_state = "ionward_labcoat_open" sprite_sheets = null -/obj/item/clothing/suit/fluff/stobarico_greatcoat // Stobarico: F.U.R.R.Y +/// Stobarico: F.U.R.R.Y +/obj/item/clothing/suit/fluff/stobarico_greatcoat name = "\improper F.U.R.R.Y's Nanotrasen Greatcoat" desc = "A greatcoat with Nanotrasen colors." icon = 'icons/obj/custom_items.dmi' icon_state = "stobarico_jacket" -/obj/item/clothing/suit/hooded/hoodie/fluff/linda // Epic_Charger: Linda Clark +/// Epic_Charger: Linda Clark +/obj/item/clothing/suit/hooded/hoodie/fluff/linda name = "Green Nanotrasen Hoodie" desc = "A green hoodie with the Nanotrasen logo on the back. It looks weathered." icon = 'icons/obj/custom_items.dmi' icon_state = "linda_hoodie" hoodtype = /obj/item/clothing/head/hooded/hood/fluff/linda -/obj/item/clothing/head/hooded/hood/fluff/linda //Epic_Charger: Linda Clark +/// Epic_Charger: Linda Clark +/obj/item/clothing/head/hooded/hood/fluff/linda icon_state = "greenhood" -/obj/item/clothing/suit/hooded/hoodie/hylo //Hylocereus: Sam Aria +/// Hylocereus: Sam Aria +/obj/item/clothing/suit/hooded/hoodie/hylo name = "worn assymetrical hoodie" desc = "A soft, cozy longline hoodie. It looks old and worn, but well cared for. There's no label, but a series of dates and names is penned on a scrap of fabric sewn on the inside of the left side of the chest - 'Sam Aria' is scrawled atop them all, next to the words 'Please Remember'." icon = 'icons/obj/custom_items.dmi' @@ -912,7 +962,8 @@ icon = 'icons/obj/custom_items.dmi' icon_state = "sam_hood" -/obj/item/clothing/suit/hooded/fluff/bone //Doru7: Jack Bone +/// Doru7: Jack Bone +/obj/item/clothing/suit/hooded/fluff/bone name = "skeleton suit" desc = "A spooky full-body suit! This one doesn't glow in the dark." body_parts_covered = HEAD|UPPER_TORSO|LOWER_TORSO|LEGS|ARMS @@ -924,7 +975,8 @@ icon = 'icons/obj/custom_items.dmi' icon_state = "skeleton_hood" -/obj/item/clothing/suit/armor/shodanscoat // RazekPraxis: SHODAN +/// RazekPraxis: SHODAN +/obj/item/clothing/suit/armor/shodanscoat name = "SHODAN's Captain's Coat" desc = "A black coat with gold trim and an old US Chevron printed on the back. Edgy." icon = 'icons/obj/custom_items.dmi' @@ -962,7 +1014,8 @@ to_chat(user, "You turn [src]'s lighting system [flavour].") user.update_inv_wear_suit() -/obj/item/clothing/suit/hooded/hoodie/fluff/xantholne // Xantholne: Meex Zwichsnicrur +/// Xantholne: Meex Zwichsnicrur +/obj/item/clothing/suit/hooded/hoodie/fluff/xantholne name = "stripped winter coat" desc = "A velvety smooth black winter coat with white and red stripes on the side." icon = 'icons/obj/custom_items.dmi' @@ -972,7 +1025,8 @@ allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter) -/obj/item/clothing/head/hooded/hood/fluff/xantholne // Xantholne: Meex Zwichsnicrur +/// Xantholne: Meex Zwichsnicrur +/obj/item/clothing/head/hooded/hood/fluff/xantholne name = "black winter hood" desc = "A black hood attached to a stripped winter coat." icon = 'icons/obj/custom_items.dmi' @@ -981,7 +1035,8 @@ flags = BLOCKHAIR flags_inv = HIDEEARS -/obj/item/clothing/suit/hooded/hoodie/fluff/xydonus //Xydonus: Rsik Ugsharki Atan | Based off of the bomber jacket, but with a hood slapped on (for allowed suit storage) +/// Xydonus: Rsik Ugsharki Atan | Based off of the bomber jacket, but with a hood slapped on (for allowed suit storage) +/obj/item/clothing/suit/hooded/hoodie/fluff/xydonus name = "custom fit bomber jacket" desc = "Made for Unathi who likes to show off their big horns." icon = 'icons/obj/custom_items.dmi' @@ -1001,12 +1056,14 @@ flags = BLOCKHAIR flags_inv = HIDEEARS -/obj/item/clothing/suit/fluff/pineapple //Pineapple Salad: Dan Jello +/// Pineapple Salad: Dan Jello +/obj/item/clothing/suit/fluff/pineapple name = "red trench coat" desc = "A red coat with cheaply made plastic accessories." icon_state = "pineapple_trench" -/obj/item/fluff/pinapplehairgel ////Pineapple Salad: Dan Jello +/// //Pineapple Salad: Dan Jello +/obj/item/fluff/pinapplehairgel name = "slime hair gel" desc = "A bottle containing extra..material..for custom 'hair' styling." icon = 'icons/obj/custom_items.dmi' @@ -1027,7 +1084,8 @@ -/obj/item/clothing/suit/hooded/wintercoat/fluff/shesi //MrSynnester : Shesi Skaklas +/// MrSynnester : Shesi Skaklas +/obj/item/clothing/suit/hooded/wintercoat/fluff/shesi name = "custom made winter coat" desc = "A custom made winter coat with the arms removed. Looks comfy." icon = 'icons/obj/custom_items.dmi' @@ -1037,7 +1095,8 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO cold_protection = UPPER_TORSO|LOWER_TORSO -/obj/item/clothing/head/hooded/hood/fluff/shesi //MrSynnester : Shesi Skaklas +/// MrSynnester : Shesi Skaklas +/obj/item/clothing/head/hooded/hood/fluff/shesi name = "custom made winter hood" desc = "A custom made winter coat hood. Looks comfy." icon = 'icons/obj/custom_items.dmi' @@ -1046,7 +1105,8 @@ flags = BLOCKHAIR flags_inv = HIDEEARS -/obj/item/clothing/suit/jacket/dtx //AffectedArc07: DTX +/// AffectedArc07: DTX +/obj/item/clothing/suit/jacket/dtx name = "telecommunications bomber jacket" desc = "Looks like something only a nerd would buy. Has a tag inside reading Property of DTX." icon = 'icons/obj/custom_items.dmi' @@ -1070,7 +1130,8 @@ "Grey" = 'icons/mob/clothing/species/grey/under/donator.dmi' ) -/obj/item/clothing/under/fluff/counterfeitguise_uniform // thatdanguy23 : Rissa Williams +/// thatdanguy23 : Rissa Williams +/obj/item/clothing/under/fluff/counterfeitguise_uniform icon = 'icons/obj/custom_items.dmi' name = "Rissa's hand-me-downs" desc = "An old, hand-me-down baggy sweater and sweatpants combo. A label on the neck reads 'RISSA' in scruffy handwriting." @@ -1080,7 +1141,8 @@ item_state = "counterfeitguise" item_color = "counterfeitguise" -/obj/item/clothing/under/fluff/benjaminfallout // Benjaminfallout: Pretzel Brassheart +/// Benjaminfallout: Pretzel Brassheart +/obj/item/clothing/under/fluff/benjaminfallout icon = 'icons/obj/custom_items.dmi' name = "Pretzel's dress" desc = "A nice looking dress" @@ -1088,7 +1150,8 @@ item_state = "fallout_dress" item_color = "fallout_dress" -/obj/item/clothing/under/fluff/soviet_casual_uniform // Norstead : Natalya Sokolova +/// Norstead : Natalya Sokolova +/obj/item/clothing/under/fluff/soviet_casual_uniform icon = 'icons/obj/custom_items.dmi' name = "Soviet Casual Uniform" desc = "Female U.S.S.P. casual wear. Dlya Rodiny!" @@ -1096,7 +1159,8 @@ item_state = "soviet_casual_uniform" item_color = "soviet_casual_uniform" -/obj/item/clothing/under/fluff/kharshai // Kharshai: Athena Castile +/// Kharshai: Athena Castile +/obj/item/clothing/under/fluff/kharshai name = "Castile formal outfit" desc = "A white and gold formal uniform, accompanied by a small pin with the numbers '004' etched upon it." icon = 'icons/obj/custom_items.dmi' @@ -1104,7 +1168,8 @@ item_state = "castile_dress" item_color = "castile_dress" -/obj/item/clothing/under/fluff/xantholne //Xantholne: Meex Zwichsnicrur +/// Xantholne: Meex Zwichsnicrur +/obj/item/clothing/under/fluff/xantholne name = "Stripped Shorts and Shirt" desc = "A silky pair of dark shorts with a matching shirt. The shirt's collar has a tag on the inside that reads 'Meexy' on it." icon = 'icons/obj/custom_items.dmi' @@ -1114,7 +1179,8 @@ item_state = "xantholne" item_color = "xantholne" -/obj/item/clothing/under/fluff/elishirt // FlattestGuitar9: Eli Randolph +/// FlattestGuitar9: Eli Randolph +/obj/item/clothing/under/fluff/elishirt name = "casual dress shirt" desc = "A soft, white dress shirt paired up with black suit pants. The set looks comfortable." icon = 'icons/obj/custom_items.dmi' @@ -1123,7 +1189,8 @@ item_color = "elishirt" displays_id = FALSE -/obj/item/clothing/under/fluff/jay_turtleneck // Jayfeather: Jay Wingler +/// Jayfeather: Jay Wingler +/obj/item/clothing/under/fluff/jay_turtleneck name = "Mar's Pattern Custom Turtleneck" desc = "It seems to be lightly dusted in orange fuzz, and damp with the smell of anti-freeze. It has a strange symbol in the middle." icon = 'icons/obj/custom_items.dmi' @@ -1132,11 +1199,13 @@ item_color = "jaywingler" displays_id = FALSE -/obj/item/clothing/under/psysuit/fluff/isaca_sirius_1 // Xilia: Isaca Sirius +/// Xilia: Isaca Sirius +/obj/item/clothing/under/psysuit/fluff/isaca_sirius_1 name = "Isaca's suit" desc = "Black, comfortable and nicely fitting suit. Made not to hinder the wearer in any way. Made of some exotic fabric. And some strange glowing jewel at the waist. Name labels says; Property of Isaca Sirius; The Seeder." -/obj/item/clothing/under/fluff/jane_sidsuit // SyndiGirl: Zoey Scyth +/// SyndiGirl: Zoey Scyth +/obj/item/clothing/under/fluff/jane_sidsuit name = "NT-SID jumpsuit" desc = "A Nanotrasen Synthetic Intelligence Division jumpsuit, issued to 'volunteers'. On other people it looks fine, but right here a scientist has noted: on you it looks stupid." icon = 'icons/obj/custom_items.dmi' @@ -1164,7 +1233,8 @@ src.item_state = "[item_color]" usr.update_inv_w_uniform() -/obj/item/clothing/under/fluff/honourable // MrBarrelrolll: Maximus Greenwood +/// MrBarrelrolll: Maximus Greenwood +/obj/item/clothing/under/fluff/honourable name = "Viridi Protegat" desc = "A set of chainmail adorned with a hide mantle. \"Greenwood\" is engraved into the right breast." icon = 'icons/obj/clothing/under/costumes.dmi' @@ -1174,7 +1244,8 @@ displays_id = FALSE strip_delay = 100 -/obj/item/clothing/under/fluff/aegis //PlagueWalker: A.E.G.I.S. +/// PlagueWalker: A.E.G.I.S. +/obj/item/clothing/under/fluff/aegis name = "gilded waistcoat" desc = "This black, gold-trimmed, rather expensive-looking uniform laced with fine materials appears comfortable despite its stiffness." icon = 'icons/obj/custom_items.dmi' @@ -1185,7 +1256,8 @@ item_color = "aegisuniform" displays_id = FALSE -/obj/item/clothing/under/fluff/elo_turtleneck // vforcebomber: E.L.O. +/// vforcebomber: E.L.O. +/obj/item/clothing/under/fluff/elo_turtleneck name = "E.L.O's Turtleneck" desc = "This TurtleNeck belongs to the IPC E.L.O. And has her name sown into the upper left breast, a very wooly jumper." icon = 'icons/obj/custom_items.dmi' // for the floor sprite @@ -1195,13 +1267,15 @@ //////////// Masks //////////// -/obj/item/clothing/mask/bandana/fluff/dar //sasanek12: Dar'Konr +/// sasanek12: Dar'Konr +/obj/item/clothing/mask/bandana/fluff/dar name = "camo bandana" desc = "It's a worn-out bandana in camo paint" icon = 'icons/obj/custom_items.dmi' icon_state = "bandcamo" -/obj/item/clothing/mask/gas/sechailer/fluff/spartan //LP Spartan: Kaskreyarawkta +/// LP Spartan: Kaskreyarawkta +/obj/item/clothing/mask/gas/sechailer/fluff/spartan name = "minimal gasmask" desc = "Designed to cover as little of face as possible while still being a functional gasmask." icon = 'icons/obj/custom_items.dmi' @@ -1300,7 +1374,8 @@ item_state = "superior_boots" -/obj/item/nullrod/fluff/chronx //chronx100: Hughe O'Splash +/// chronx100: Hughe O'Splash +/obj/item/nullrod/fluff/chronx fluff_transformations = list(/obj/item/nullrod/fluff/chronx/scythe) /obj/item/nullrod/fluff/chronx/scythe @@ -1310,7 +1385,8 @@ icon_state = "chronx_scythe" item_state = "chronx_scythe" -/obj/item/clothing/head/fluff/chronx //chronx100: Hughe O'Splash +/// chronx100: Hughe O'Splash +/obj/item/clothing/head/fluff/chronx name = "Cthulhu's Hood" desc = "Hood worn by the worshipers of Cthulhu. You see a name inscribed in blood on the inside: Hughe O'Splash" icon = 'icons/obj/custom_items.dmi' @@ -1340,7 +1416,8 @@ var/datum/action/A = X A.UpdateButtonIcon() -/obj/item/clothing/suit/chaplain_hoodie/fluff/chronx //chronx100: Hughe O'Splash +/// chronx100: Hughe O'Splash +/obj/item/clothing/suit/chaplain_hoodie/fluff/chronx name = "Cthulhu's Robes" desc = "Robes worn by the worshipers of Cthulhu. You see a name inscribed in blood on the inside: Hughe O'Splash" icon = 'icons/obj/custom_items.dmi' @@ -1350,14 +1427,16 @@ adjust_flavour = "untransform" ignore_suitadjust = 0 -/obj/item/clothing/shoes/black/fluff/chronx //chronx100: Hughe O'Splash +/// chronx100: Hughe O'Splash +/obj/item/clothing/shoes/black/fluff/chronx name = "Cthulhu's Boots" desc = "Boots worn by the worshipers of Cthulhu. You see a name inscribed in blood on the inside: Hughe O'Splash" icon = 'icons/obj/custom_items.dmi' icon_state = "chronx_shoes" item_state = "chronx_shoes" -/obj/item/clothing/suit/armor/vest/fluff/tactical //m3hillus: Medusa Schlofield +/// m3hillus: Medusa Schlofield +/obj/item/clothing/suit/armor/vest/fluff/tactical name = "tactical armor vest" desc = "A tactical vest with armored plate inserts." icon = 'icons/obj/clothing/ties.dmi' @@ -1378,7 +1457,8 @@ "Grey" = 'icons/mob/clothing/species/grey/under/donator.dmi' ) -/obj/item/clothing/suit/jacket/fluff/elliot_windbreaker // DaveTheHeadcrab: Elliot Campbell +/// DaveTheHeadcrab: Elliot Campbell +/obj/item/clothing/suit/jacket/fluff/elliot_windbreaker name = "nylon windbreaker" desc = "A cheap nylon windbreaker, according to the tag it was manufactured in New Chiba, Earth.
The color reminds you of a television tuned to a dead channel." icon = 'icons/obj/custom_items.dmi' @@ -1388,7 +1468,8 @@ suit_adjusted = 1 sprite_sheets = null -/obj/item/storage/backpack/fluff/syndiesatchel //SkeletalElite: Rawkkihiki +/// SkeletalElite: Rawkkihiki +/obj/item/storage/backpack/fluff/syndiesatchel name= "Military Satchel" desc = "A well made satchel for military operations. Totally not made by an enemy corporation" icon = 'icons/obj/custom_items.dmi' @@ -1396,28 +1477,32 @@ item_state = null sprite_sheets = null -/obj/item/storage/backpack/fluff/krich_back //lizardzsi: Krichahka +/// lizardzsi: Krichahka +/obj/item/storage/backpack/fluff/krich_back name = "Voxcaster" desc = "Battered, Sol-made military radio backpack that had its speakers fried from playing Vox opera. The words 'Swift-Talon' are crudely scratched onto its side." icon = 'icons/obj/custom_items.dmi' icon_state = "voxcaster_fluff" item_state = null -/obj/item/storage/backpack/fluff/ssscratches_back //Ssscratches: Lasshy-Bot +/// Ssscratches: Lasshy-Bot +/obj/item/storage/backpack/fluff/ssscratches_back name = "CatPack" desc = "It's a backpack, but it's also a cat." icon = 'icons/obj/custom_items.dmi' icon_state = "ssscratches_backpack" item_state = null -/obj/item/storage/backpack/fluff/thebrew //Greey: Korala Ice +/// Greey: Korala Ice +/obj/item/storage/backpack/fluff/thebrew name = "The Brew" desc = "Amber colored backpack resembling a long lost friend, a spirit long forgotten." icon = 'icons/obj/custom_items.dmi' icon_state = "greeyfluff" item_state = "greeyfluff" -/obj/item/clothing/head/wizard/fake/fluff/dreamy //phantasmicdream : Dreamy Rockwall +/// phantasmicdream : Dreamy Rockwall +/obj/item/clothing/head/wizard/fake/fluff/dreamy name = "strange witch hat" desc = "A shapeshifting witch hat. A strange aura comes from it..." icon = 'icons/obj/custom_items.dmi' @@ -1447,7 +1532,8 @@ return 1 ..() -/obj/item/fluff/zekemirror //phantasmicdream : Zeke Varloss +/// phantasmicdream : Zeke Varloss +/obj/item/fluff/zekemirror name = "engraved hand mirror" desc = "A very classy hand mirror, with fancy detailing." icon = 'icons/obj/custom_items.dmi' @@ -1469,7 +1555,8 @@ to_chat(target, "You take time to admire yourself in [src], brushing your tendrils down and revealing their true length.") -/obj/item/clothing/accessory/necklace/locket/fluff/fethasnecklace //Fethas: Sefra'neem +/// Fethas: Sefra'neem +/obj/item/clothing/accessory/necklace/locket/fluff/fethasnecklace name = "Orange gemmed locket" desc = "A locket with a orange gem set on the front, the picture inside seems to be of a Tajaran." icon = 'icons/obj/custom_items.dmi' @@ -1478,7 +1565,8 @@ item_color = "fethasnecklace" slot_flags = SLOT_FLAG_MASK | SLOT_FLAG_TIE -/obj/item/bedsheet/fluff/hugosheet //HugoLuman: Dan Martinez +/// HugoLuman: Dan Martinez +/obj/item/bedsheet/fluff/hugosheet name = "Cosmic space blankie" desc = "Made from the dreams of space children everywhere." icon = 'icons/obj/custom_items.dmi' @@ -1489,13 +1577,15 @@ item_color = "sheetcosmos" -/obj/item/clothing/head/fluff/lfbowler //Lightfire: Hyperion +/// Lightfire: Hyperion +/obj/item/clothing/head/fluff/lfbowler name = "classy bowler hat" desc = "A very classy looking bowler hat." icon = 'icons/obj/custom_items.dmi' icon_state = "bowler_lightfire" -/obj/item/clothing/under/fluff/lfvicsuit //Lightfire: Hyperion +/// Lightfire: Hyperion +/obj/item/clothing/under/fluff/lfvicsuit name = "classy victorian suit" desc = "A blue and black victorian suit with silver buttons, very fancy!" icon = 'icons/obj/custom_items.dmi' @@ -1507,7 +1597,8 @@ displays_id = FALSE -/obj/item/fluff/lighty_plasman_modkit // LightFire53: Ikelos +/// LightFire53: Ikelos +/obj/item/fluff/lighty_plasman_modkit name = "plasmaman suit modkit" desc = "A kit containing nanites that are able to modify the look of a plasmaman suit and helmet without exposing the wearer to hostile environments." icon_state = "modkit" @@ -1553,11 +1644,13 @@ else to_chat(user, "You can't modify [target]!") -/obj/item/clothing/head/helmet/space/plasmaman/lf53_fluff // LightFire53: Ikelos +/// LightFire53: Ikelos +/obj/item/clothing/head/helmet/space/plasmaman/lf53_fluff icon_state = "ikelos_envirohelm" // New item needed because `initial(icon_state)` is used. icon = 'icons/obj/custom_items.dmi' -/obj/item/bikehorn/fluff/pinkbikehorn //Xerdies: Squiddle Toodle +/// Xerdies: Squiddle Toodle +/obj/item/bikehorn/fluff/pinkbikehorn name = "Honkinator5000" desc = "This horn may look ridiculous but is the new hot item for clowns in the Clown Empire. It has a fine print on its side reading: Property of Prince Honktertong the IV" icon = 'icons/obj/custom_items.dmi' @@ -1567,14 +1660,16 @@ icon_state = "teri_horn" item_state = "teri_horn" -/obj/item/clothing/accessory/medal/fluff/elo //V-Force_Bomber: E.L.O. +/// V-Force_Bomber: E.L.O. +/obj/item/clothing/accessory/medal/fluff/elo name = "distinguished medal of loyalty and excellence" desc = "This medal is cut into the shape of a Victoria Cross, and is awarded to those who have proven themselves to Nanotrasen with a long and successful career." icon = 'icons/obj/custom_items.dmi' icon_state = "elo-medal" item_color = "elo-medal" -/obj/item/clothing/suit/fluff/vetcoat //Furasian: Fillmoore Grayson +/// Furasian: Fillmoore Grayson +/obj/item/clothing/suit/fluff/vetcoat name = "Veteran Coat" desc = "An old, yet well-kept Nanotrasen uniform. Very few of its kind are still produced." icon = 'icons/obj/custom_items.dmi' @@ -1584,15 +1679,18 @@ item_state = "alchemistcoatblack" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS -/obj/item/clothing/suit/fluff/vetcoat/red //Furasian: Fillmoore Grayson +/// Furasian: Fillmoore Grayson +/obj/item/clothing/suit/fluff/vetcoat/red icon_state = "alchemistcoatred" item_state = "alchemistcoatred" -/obj/item/clothing/suit/fluff/vetcoat/navy //Furasian: Fillmoore Grayson +/// Furasian: Fillmoore Grayson +/obj/item/clothing/suit/fluff/vetcoat/navy icon_state = "alchemistcoatnavy" item_state = "alchemistcoatnavy" -/obj/item/clothing/accessory/medal/fluff/panzermedal //PanzerSkull: GRN-DER +/// PanzerSkull: GRN-DER +/obj/item/clothing/accessory/medal/fluff/panzermedal name = "Cross of Valor" desc = "A medal from the bygone Asteroid Wars. Its Ruby shines with a strange intensity." icon = 'icons/obj/custom_items.dmi' @@ -1601,7 +1699,8 @@ item_color = "panzermedal" slot_flags = SLOT_FLAG_TIE -/obj/item/clothing/accessory/medal/fluff/XannZxiax //Sagrotter: Xann Zxiax +/// Sagrotter: Xann Zxiax +/obj/item/clothing/accessory/medal/fluff/XannZxiax name = "Zxiax Garnet" desc = "Green Garnet on fancy blue cord, when you look at the Garnet, you feel strangely appeased." icon = 'icons/obj/custom_items.dmi' @@ -1610,7 +1709,8 @@ item_color = "Xann_necklace" slot_flags = SLOT_FLAG_TIE -/obj/item/clothing/accessory/rbscarf //Rb303: Isthel Eisenwald +/// Rb303: Isthel Eisenwald +/obj/item/clothing/accessory/rbscarf name = "Old purple scarf" desc = "An old, striped purple scarf. It appears to be hand-knitted and has the name 'Isthel' written on it in bad handwriting." icon = 'icons/obj/custom_items.dmi' @@ -1618,13 +1718,15 @@ item_state = "rbscarf" item_color = "rbscarf" -/obj/item/clothing/head/fluff/pinesalad_horns //Pineapple Salad: Dan Jello +/// Pineapple Salad: Dan Jello +/obj/item/clothing/head/fluff/pinesalad_horns name = "Bluespace Horns" desc = "A pair of fake horns. Now with added bluespace!" icon = 'icons/obj/custom_items.dmi' icon_state = "ps_horns" -/obj/item/storage/backpack/fluff/hiking //Pineapple Salad: Dan Jello +/// Pineapple Salad: Dan Jello +/obj/item/storage/backpack/fluff/hiking name = "\improper Fancy Dufflebag" desc = "It's pretty lightweight for a dufflebag, but it only seems to have as much space as an ordinary backpack." icon = 'icons/obj/custom_items.dmi' @@ -1633,7 +1735,8 @@ lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' -/obj/item/clothing/under/fluff/kiaoutfit //FullOfSkittles: Kiachi +/// FullOfSkittles: Kiachi +/obj/item/clothing/under/fluff/kiaoutfit name = "Suspicious Outfit" desc = "A very expensive top with intricate details tailored to fit a vox and paired with a glittery blue skirt, probably illegal." icon = 'icons/obj/custom_items.dmi' @@ -1645,7 +1748,8 @@ displays_id = FALSE species_restricted = list("Vox") -/obj/item/clothing/head/fluff/kiahat //FullOfSkittles: Kiachi +/// FullOfSkittles: Kiachi +/obj/item/clothing/head/fluff/kiahat name = "Suspicious Witch Hat" desc = "A black witch hat with a blue sash decorated with tiny glimmering stars and a gold squid-like medallion, probably possessed." icon = 'icons/obj/custom_items.dmi' @@ -1655,7 +1759,8 @@ item_state = "kiahat" item_color = "kiahat" -/obj/item/clothing/mask/gas/fluff/kiamask //FullOfSkittles: Kiachi +/// FullOfSkittles: Kiachi +/obj/item/clothing/mask/gas/fluff/kiamask name = "Suspicious Mask" desc = "A sleek mask that blends in with the owner's existing quills using strange technology. It might even be magic..." icon = 'icons/obj/custom_items.dmi' @@ -1683,13 +1788,15 @@ -/obj/item/clothing/gloves/ring/fluff/benjaminfallout //Benjaminfallout: Pretzel Brassheart +/// Benjaminfallout: Pretzel Brassheart +/obj/item/clothing/gloves/ring/fluff/benjaminfallout name = "Pretzel's Ring" desc = "A small platinum ring with a large light blue diamond. Engraved inside the band are the words: 'To my lovely Pristine Princess. Forever yours, Savinien.'" icon_state = "benjaminfallout_ring" -/obj/item/clothing/under/fluff/kikeridress //Gangelwaefre: Kikeri +/// Gangelwaefre: Kikeri +/obj/item/clothing/under/fluff/kikeridress name = "Kikeri's Dress" desc = "A simple black dress with a white undercoat, tied with a blue ribbon." lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' @@ -1701,7 +1808,8 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO species_restricted = list("Vox") -/obj/item/clothing/mask/gas/fluff/kikerimask //Gangelwaefre: Kikeri +/// Gangelwaefre: Kikeri +/obj/item/clothing/mask/gas/fluff/kikerimask name = "Kikeri's Mask" desc = "A light grey mask with masquerade-esque blue details." icon = 'icons/obj/custom_items.dmi' @@ -1713,7 +1821,8 @@ item_color = "kikerimask" species_restricted = list("Vox") -/obj/item/clothing/mask/gas/fluff/yahiyamask //Asmerath: Yahiya +/// Asmerath: Yahiya +/obj/item/clothing/mask/gas/fluff/yahiyamask name = "Yahiya's Mask" desc = "A dark brown and silver mask resembling that of an eagle. There is a fiery red gem embedded into the forehead." icon = 'icons/obj/custom_items.dmi' diff --git a/code/modules/events/blob/blob_structures/captured_nuke.dm b/code/modules/events/blob/blob_structures/captured_nuke.dm index 3374850b1b2..030b37d2408 100644 --- a/code/modules/events/blob/blob_structures/captured_nuke.dm +++ b/code/modules/events/blob/blob_structures/captured_nuke.dm @@ -1,4 +1,5 @@ -/obj/structure/blob/captured_nuke //alternative to blob just straight up destroying nukes +/// alternative to blob just straight up destroying nukes +/obj/structure/blob/captured_nuke name = "blob captured nuke" icon_state = "blob" desc = "A Nuclear Warhead tangled in blob tendrils pulsating with a horrific green glow." diff --git a/code/modules/events/event.dm b/code/modules/events/event.dm index f82af011b84..2ac68d47855 100644 --- a/code/modules/events/event.dm +++ b/code/modules/events/event.dm @@ -45,7 +45,8 @@ return ..(active_with_role) return 0*/ -/datum/event //NOTE: Times are measured in master controller ticks! +/// NOTE: Times are measured in master controller ticks! +/datum/event /// The human-readable name of the event var/name /// When in the lifetime to call start(). diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 00b1914c181..dad1fac6c8d 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -218,7 +218,8 @@ if(!isvineimmune(eater)) eater.adjustToxLoss(5) -/datum/spacevine_mutation/explosive //OH SHIT IT CAN CHAINREACT RUN!!! +/// OH SHIT IT CAN CHAINREACT RUN!!! +/datum/spacevine_mutation/explosive name = "explosive" hue = "#ff0000" quality = NEGATIVE @@ -261,7 +262,8 @@ prey.wither() . = TRUE -/datum/spacevine_mutation/aggressive_spread //very OP, but im out of other ideas currently +/// very OP, but im out of other ideas currently +/datum/spacevine_mutation/aggressive_spread name = "aggressive spreading" hue = "#333333" severity = 3 diff --git a/code/modules/events/wizard/ghost_wizard_spells.dm b/code/modules/events/wizard/ghost_wizard_spells.dm index e703799ff02..f824344c833 100644 --- a/code/modules/events/wizard/ghost_wizard_spells.dm +++ b/code/modules/events/wizard/ghost_wizard_spells.dm @@ -1,10 +1,12 @@ -/datum/event/wizard/ghost //The spook is real +/// The spook is real +/datum/event/wizard/ghost /datum/event/wizard/ghost/start() var/msg = "You suddenly feel extremely obvious..." set_observer_default_invisibility(0, msg) -/datum/event/wizard/ghost_mute //The spook is silent +/// The spook is silent +/datum/event/wizard/ghost_mute /datum/event/wizard/ghost_mute/start() GLOB.dsay_enabled = FALSE diff --git a/code/modules/food_and_drinks/drinks/drinks_base.dm b/code/modules/food_and_drinks/drinks/drinks_base.dm index fc9e0a75aa2..bbfbaa8e0f3 100644 --- a/code/modules/food_and_drinks/drinks/drinks_base.dm +++ b/code/modules/food_and_drinks/drinks/drinks_base.dm @@ -156,7 +156,8 @@ materials = list(MAT_METAL=400) volume = 25 -/obj/item/reagent_containers/drinks/trophy/bronze_cup/toolbox_win //2023 toolbox tournament 3rd place went to paradise station. +/// 2023 toolbox tournament 3rd place went to paradise station. +/obj/item/reagent_containers/drinks/trophy/bronze_cup/toolbox_win name = "3rd place toolbox tournament 2567" desc = "Awarded to centcomms elite toolbox warriors raising money for the GBS research institute." icon_state = "reward_cup" diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm index 01c99264ebf..8b083436ea1 100644 --- a/code/modules/food_and_drinks/food/condiment.dm +++ b/code/modules/food_and_drinks/food/condiment.dm @@ -135,7 +135,8 @@ list_reagents = list("sugar" = 50) possible_states = list() -/obj/item/reagent_containers/condiment/saltshaker //Seperate from above since it's a small shaker rather then +/// Seperate from above since it's a small shaker rather then +/obj/item/reagent_containers/condiment/saltshaker name = "salt shaker" // a large one. desc = "Salt. From space oceans, presumably." icon_state = "saltshakersmall" diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm index 8d22dd0d9db..01db2bfef50 100644 --- a/code/modules/food_and_drinks/food/customizables.dm +++ b/code/modules/food_and_drinks/food/customizables.dm @@ -302,7 +302,8 @@ do {\ snack_overlays = 0 top = 0 -/obj/item/food/snacks/customizable/fullycustom // In the event you fuckers find something I forgot to add a customizable food for. +/// In the event you fuckers find something I forgot to add a customizable food for. +/obj/item/food/snacks/customizable/fullycustom name = "on a plate" desc = "A unique dish." icon_state = "fullycustom" diff --git a/code/modules/food_and_drinks/food/foods/ingredients.dm b/code/modules/food_and_drinks/food/foods/ingredients.dm index a0cf80c61b6..cefb49fd02e 100644 --- a/code/modules/food_and_drinks/food/foods/ingredients.dm +++ b/code/modules/food_and_drinks/food/foods/ingredients.dm @@ -239,7 +239,8 @@ return ..() -/obj/item/food/snacks/choc_pile //for reagent chocolate being spilled on turfs +/// for reagent chocolate being spilled on turfs +/obj/item/food/snacks/choc_pile name = "pile of chocolate" desc = "A pile of pure chocolate pieces." icon_state = "cocoa" diff --git a/code/modules/food_and_drinks/food/foods/side_dishes.dm b/code/modules/food_and_drinks/food/foods/side_dishes.dm index fbfdf039462..648fd6f1038 100644 --- a/code/modules/food_and_drinks/food/foods/side_dishes.dm +++ b/code/modules/food_and_drinks/food/foods/side_dishes.dm @@ -72,7 +72,8 @@ list_reagents = list("nutriment" = 10, "beans" = 10, "vitamin" = 3) tastes = list("beans" = 1) -/obj/item/food/snacks/mashed_potatoes //mashed taters +/// mashed taters +/obj/item/food/snacks/mashed_potatoes name = "mashed potatoes" desc = "Some soft, creamy, and irresistible mashed potatoes." icon_state = "mashedtaters" diff --git a/code/modules/food_and_drinks/recipes/recipes_oven.dm b/code/modules/food_and_drinks/recipes/recipes_oven.dm index e95dad37b10..0d639141d32 100644 --- a/code/modules/food_and_drinks/recipes/recipes_oven.dm +++ b/code/modules/food_and_drinks/recipes/recipes_oven.dm @@ -568,7 +568,8 @@ ) result = /obj/item/food/snacks/toastedsandwich -/datum/recipe/oven/turkey // Magic +/// Magic +/datum/recipe/oven/turkey items = list( /obj/item/food/snacks/meat, /obj/item/food/snacks/meat, diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm index 57d8f8c7e5d..7126866a9a3 100644 --- a/code/modules/hydroponics/grown/banana.dm +++ b/code/modules/hydroponics/grown/banana.dm @@ -133,7 +133,8 @@ icon_state = "bluenana_peel" // Other -/obj/item/grown/bananapeel/specialpeel //used by /obj/item/clothing/shoes/clown_shoes/banana_shoes +/// used by /obj/item/clothing/shoes/clown_shoes/banana_shoes +/obj/item/grown/bananapeel/specialpeel name = "synthesized banana peel" desc = "A synthetic banana peel." diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm index 0f624c37e1d..888bcdc9aef 100644 --- a/code/modules/hydroponics/grown/citrus.dm +++ b/code/modules/hydroponics/grown/citrus.dm @@ -87,7 +87,8 @@ filling_color = "#FFD700" // Combustible lemon -/obj/item/seeds/firelemon //combustible lemon is too long so firelemon +/// combustible lemon is too long so firelemon +/obj/item/seeds/firelemon name = "pack of combustible lemon seeds" desc = "When life gives you lemons, don't make lemonade. Make life take the lemons back! Get mad! I don't want your damn lemons!" icon_state = "seed-firelemon" diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index 42d7eaa2e9c..f71f1edf211 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -118,7 +118,8 @@ mutatelist = list(/obj/item/seeds/sunflower/moonflower, /obj/item/seeds/sunflower/novaflower) reagents_add = list("cornoil" = 0.08, "plantmatter" = 0.04) -/obj/item/grown/sunflower // FLOWER POWER! +/// FLOWER POWER! +/obj/item/grown/sunflower seed = /obj/item/seeds/sunflower name = "sunflower" desc = "It's beautiful! A certain person might beat you to death if you trample these." diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm index 78fe7964c46..1d79c1d0b31 100644 --- a/code/modules/hydroponics/grown/nettle.dm +++ b/code/modules/hydroponics/grown/nettle.dm @@ -28,7 +28,8 @@ reagents_add = list("facid" = 0.25, "sacid" = 0.25) rarity = 20 -/obj/item/grown/nettle //abstract type +/// abstract type +/obj/item/grown/nettle name = "nettle" desc = "It's probably not wise to touch it with bare hands..." icon = 'icons/obj/items.dmi' diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm index 1c33b6ce5da..9acbcc055fb 100644 --- a/code/modules/hydroponics/grown/towercap.dm +++ b/code/modules/hydroponics/grown/towercap.dm @@ -119,7 +119,8 @@ /obj/structure/bonfire/dense density = TRUE -/obj/structure/bonfire/lit //haha empty define +/// haha empty define +/obj/structure/bonfire/lit /obj/structure/bonfire/lit/dense density = TRUE diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm index 4fcbe25430e..820cf7420c8 100644 --- a/code/modules/hydroponics/growninedible.dm +++ b/code/modules/hydroponics/growninedible.dm @@ -2,7 +2,8 @@ // Other harvested materials from plants (that are not food) // ********************** -/obj/item/grown // Grown weapons +/// Grown weapons +/obj/item/grown name = "grown_weapon" icon = 'icons/obj/hydroponics/harvest.dmi' resistance_flags = FLAMMABLE diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 73154db5ef9..f5bbb310453 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -14,7 +14,8 @@ // Hydroponics Tools // ************************************* -/obj/item/reagent_containers/spray/weedspray // -- Skie +/// -- Skie +/obj/item/reagent_containers/spray/weedspray name = "weed spray" desc = "It's a toxic mixture, in spray form, to kill small weeds." icon = 'icons/obj/hydroponics/equipment.dmi' @@ -34,7 +35,8 @@ user.visible_message("[user] is huffing [src]! It looks like [user.p_theyre()] trying to commit suicide.") return TOXLOSS -/obj/item/reagent_containers/spray/pestspray // -- Skie +/// -- Skie +/obj/item/reagent_containers/spray/pestspray name = "pest spray" desc = "It's some pest eliminator spray! Do not inhale!" icon = 'icons/obj/hydroponics/equipment.dmi' diff --git a/code/modules/hydroponics/hydroponics_tray.dm b/code/modules/hydroponics/hydroponics_tray.dm index ebeaac15cdd..9c0b489baff 100644 --- a/code/modules/hydroponics/hydroponics_tray.dm +++ b/code/modules/hydroponics/hydroponics_tray.dm @@ -975,7 +975,8 @@ return ..() /////////////////////////////////////////////////////////////////////////////// -/obj/machinery/hydroponics/soil //Not actually hydroponics at all! Honk! +/// Not actually hydroponics at all! Honk! +/obj/machinery/hydroponics/soil name = "soil" icon = 'icons/obj/hydroponics/equipment.dmi' icon_state = "soil" diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index ccf886c8b66..95b53c40d64 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -450,7 +450,8 @@ S.set_up(G.reagents, splat_location) S.start(smoke_amount) -/datum/plant_gene/trait/fire_resistance // Lavaland +/// Lavaland +/datum/plant_gene/trait/fire_resistance name = "Fire Resistance" /datum/plant_gene/trait/fire_resistance/apply_vars(obj/item/seeds/S) @@ -461,7 +462,8 @@ if(!(G.resistance_flags & FIRE_PROOF)) G.resistance_flags |= FIRE_PROOF -/datum/plant_gene/trait/plant_type // Parent type +/// Parent type +/datum/plant_gene/trait/plant_type name = "you shouldn't see this" trait_id = "plant_type" diff --git a/code/modules/library/library_datums.dm b/code/modules/library/library_datums.dm index 8d191870b26..ccc1b341924 100644 --- a/code/modules/library/library_datums.dm +++ b/code/modules/library/library_datums.dm @@ -34,7 +34,8 @@ * Used for tracking books that have been checked out from the library by players. Created and stored upon a book being * checked out and deleted upon the book being succesfully checked back in or the librarian marking a book as "lost" */ -/datum/borrowbook // Datum used to keep track of who has borrowed what when and for how long. +/// Datum used to keep track of who has borrowed what when and for how long. +/datum/borrowbook var/bookname var/libraryid var/patron_name @@ -48,7 +49,8 @@ * are designed to only temporarily hold book data * checked out and deleted upon the book being succesfully checked back in or the librarian marking a book as "lost" */ -/datum/cachedbook // Datum used to cache the SQL DB books locally in order to achieve a performance gain. +/// Datum used to cache the SQL DB books locally in order to achieve a performance gain. +/datum/cachedbook var/id var/libraryid var/title diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index 0cf585940ed..e3afd6ffb08 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -1,4 +1,5 @@ -/obj/effect/baseturf_helper //Set the baseturfs of every turf in the /area/ it is placed. +/// Set the baseturfs of every turf in the /area/ it is placed. +/obj/effect/baseturf_helper name = "baseturf editor" icon = 'icons/effects/mapping_helpers.dmi' icon_state = "" diff --git a/code/modules/martial_arts/krav_maga.dm b/code/modules/martial_arts/krav_maga.dm index 7b018bbca56..0552c9eb101 100644 --- a/code/modules/martial_arts/krav_maga.dm +++ b/code/modules/martial_arts/krav_maga.dm @@ -171,7 +171,8 @@ . = ..() RegisterSignal(src, COMSIG_PARENT_QDELETING, PROC_REF(alert_admins_on_destroy)) -/obj/item/clothing/gloves/color/black/krav_maga/combat // for nukies +/// for nukies +/obj/item/clothing/gloves/color/black/krav_maga/combat name = "Combat gloves plus" desc = "These combat gloves have been upgraded with nanochips that teach the wearer Krav Maga." icon_state = "combat" diff --git a/code/modules/mining/equipment/marker_beacons.dm b/code/modules/mining/equipment/marker_beacons.dm index 57f32f4dae8..1d353d1309c 100644 --- a/code/modules/mining/equipment/marker_beacons.dm +++ b/code/modules/mining/equipment/marker_beacons.dm @@ -27,10 +27,12 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list( max_amount = 100 var/picked_color = "random" -/obj/item/stack/marker_beacon/ten //miners start with 10 of these +/// miners start with 10 of these +/obj/item/stack/marker_beacon/ten amount = 10 -/obj/item/stack/marker_beacon/thirty //and they're bought in stacks of 1, 10, or 30 +/// and they're bought in stacks of 1, 10, or 30 +/obj/item/stack/marker_beacon/thirty amount = 30 /obj/item/stack/marker_beacon/Initialize(mapload) diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index 6ee74a27e43..44bc6c90725 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -105,7 +105,8 @@ origin_tech = "materials=6;powerstorage=4;engineering=4" toolspeed = 0.2 -/obj/item/pickaxe/drill/cyborg/diamond //This is the BORG version! +/// This is the BORG version! +/obj/item/pickaxe/drill/cyborg/diamond name = "diamond-tipped cyborg mining drill" //To inherit the NODROP flag, and easier to change borg specific drill mechanics. icon_state = "diamonddrill" toolspeed = 0.2 diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm index 903be3aa68b..3440c1be56e 100644 --- a/code/modules/mining/equipment/wormhole_jaunter.dm +++ b/code/modules/mining/equipment/wormhole_jaunter.dm @@ -168,7 +168,8 @@ /obj/effect/portal/advanced/getaway one_use = TRUE -/obj/effect/temp_visual/getaway_flare // Because the original contractor flare is not a temp visual, for some reason. +/// Because the original contractor flare is not a temp visual, for some reason. +/obj/effect/temp_visual/getaway_flare name = "contractor extraction flare" icon = 'icons/obj/lighting.dmi' icon_state = "flare-contractor-on" diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index 668442ccf5f..c8f0a1e584e 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -75,7 +75,8 @@ else ..() -/obj/structure/flora/ash/tall_shroom //exists only so that the spawning check doesn't allow these spawning near other things +/// exists only so that the spawning check doesn't allow these spawning near other things +/obj/structure/flora/ash/tall_shroom regrowth_time_low = 4200 /obj/structure/flora/ash/leaf_shroom @@ -197,7 +198,8 @@ pixel_x = rand(-4, 4) pixel_y = rand(-4, 4) -/obj/item/food/snacks/grown/ash_flora/shavings //for actual crafting +/// for actual crafting +/obj/item/food/snacks/grown/ash_flora/shavings /obj/item/food/snacks/grown/ash_flora/mushroom_leaf name = "mushroom leaf" diff --git a/code/modules/mining/lavaland/loot/colossus_loot.dm b/code/modules/mining/lavaland/loot/colossus_loot.dm index 38d4653f196..c0aa03e2d82 100644 --- a/code/modules/mining/lavaland/loot/colossus_loot.dm +++ b/code/modules/mining/lavaland/loot/colossus_loot.dm @@ -85,7 +85,8 @@ new random_crystal(loc) return INITIALIZE_HINT_QDEL -/obj/machinery/anomalous_crystal/theme_warp //Warps the area you're in to look like a new one +/// Warps the area you're in to look like a new one +/obj/machinery/anomalous_crystal/theme_warp activation_method = "touch" cooldown_add = 200 var/terrain_theme = "winter" @@ -159,7 +160,8 @@ continue affected_targets += A -/obj/machinery/anomalous_crystal/emitter //Generates a projectile when interacted with +/// Generates a projectile when interacted with +/obj/machinery/anomalous_crystal/emitter activation_method = "touch" cooldown_add = 50 var/generated_projectile = /obj/item/projectile/beam/emitter @@ -188,7 +190,8 @@ P.xo = 0 P.fire() -/obj/machinery/anomalous_crystal/dark_reprise //Revives anyone nearby, but turns them into shadowpeople and renders them uncloneable, so the crystal is your only hope of getting up again if you go down. +/// Revives anyone nearby, but turns them into shadowpeople and renders them uncloneable, so the crystal is your only hope of getting up again if you go down. +/obj/machinery/anomalous_crystal/dark_reprise activation_method = "touch" activation_sound = 'sound/hallucinations/growl1.ogg' @@ -206,7 +209,8 @@ ADD_TRAIT(H, TRAIT_BADDNA, MAGIC_TRAIT) //Free revives, but significantly limits your options for reviving except via the crystal H.grab_ghost(force = TRUE) -/obj/machinery/anomalous_crystal/helpers //Lets ghost spawn as helpful creatures that can only heal people slightly. Incredibly fragile and they can't converse with humans +/// Lets ghost spawn as helpful creatures that can only heal people slightly. Incredibly fragile and they can't converse with humans +/obj/machinery/anomalous_crystal/helpers activation_method = "touch" var/ready_to_deploy = 0 @@ -299,7 +303,8 @@ /mob/living/simple_animal/hostile/lightgeist/ghost() qdel(src) -/obj/machinery/anomalous_crystal/possessor //Allows you to bodyjack small animals, then exit them at your leisure, but you can only do this once per activation. Because they blow up. Also, if the bodyjacked animal dies, SO DO YOU. +/// Allows you to bodyjack small animals, then exit them at your leisure, but you can only do this once per activation. Because they blow up. Also, if the bodyjacked animal dies, SO DO YOU. +/obj/machinery/anomalous_crystal/possessor activation_method = "touch" /obj/machinery/anomalous_crystal/possessor/ActivationReaction(mob/user, method) diff --git a/code/modules/mob/living/carbon/human/body_accessories.dm b/code/modules/mob/living/carbon/human/body_accessories.dm index fbbfdba9a7c..26abf032695 100644 --- a/code/modules/mob/living/carbon/human/body_accessories.dm +++ b/code/modules/mob/living/carbon/human/body_accessories.dm @@ -83,19 +83,22 @@ GLOBAL_LIST_EMPTY(body_accessory_by_species) return ..() //Tajaran -/datum/body_accessory/tail/wingler_tail // Jay wingler fluff tail +/// Jay wingler fluff tail +/datum/body_accessory/tail/wingler_tail name = "Striped Tail" icon_state = "winglertail" animated_icon_state = "winglertail_a" allowed_species = list("Tajaran") -/datum/body_accessory/tail/tiny //Pretty ambiguous as to what species it belongs to, tail could've been injured or docked. +/// Pretty ambiguous as to what species it belongs to, tail could've been injured or docked. +/datum/body_accessory/tail/tiny name = "Tiny Tail" icon_state = "tiny" animated_icon_state = "tiny_a" allowed_species = list("Vulpkanin", "Tajaran") -/datum/body_accessory/tail/short //Same as above. +/// Same as above. +/datum/body_accessory/tail/short name = "Short Tail" icon_state = "short" animated_icon_state = "short_a" diff --git a/code/modules/mob/living/carbon/human/species/diona_species.dm b/code/modules/mob/living/carbon/human/species/diona_species.dm index 4381438edae..b25bfe9e191 100644 --- a/code/modules/mob/living/carbon/human/species/diona_species.dm +++ b/code/modules/mob/living/carbon/human/species/diona_species.dm @@ -131,7 +131,8 @@ H.set_nutrition(min(H.nutrition + 30, NUTRITION_LEVEL_FULL)) return TRUE -/datum/species/diona/pod //Same name and everything; we want the same limitations on them; we just want their regeneration to kick in at all times and them to have special factions +/// Same name and everything; we want the same limitations on them; we just want their regeneration to kick in at all times and them to have special factions +/datum/species/diona/pod name = "Diomorph" //Seperate name needed else can't select diona period species_traits = list(NO_HAIR, NOT_SELECTABLE) pod = TRUE diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm index 92319021efc..e19be02507f 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -1,6 +1,7 @@ //Simple borg hand. //Limited use. -/obj/item/gripper_engineering // This isn't a drone item, also in engineering cyborg kits +/// This isn't a drone item, also in engineering cyborg kits +/obj/item/gripper_engineering name = "magnetic gripper" desc = "A simple grasping tool for synthetic assets." icon = 'icons/obj/device.dmi' diff --git a/code/modules/mob/living/simple_animal/bot/griefsky.dm b/code/modules/mob/living/simple_animal/bot/griefsky.dm index 2530633daa3..37406b435e5 100644 --- a/code/modules/mob/living/simple_animal/bot/griefsky.dm +++ b/code/modules/mob/living/simple_animal/bot/griefsky.dm @@ -1,4 +1,5 @@ -/mob/living/simple_animal/bot/secbot/griefsky //This bot is powerful. If you managed to get 4 eswords somehow, you deserve this horror. Emag him for best results. +/// This bot is powerful. If you managed to get 4 eswords somehow, you deserve this horror. Emag him for best results. +/mob/living/simple_animal/bot/secbot/griefsky name = "\improper General Griefsky" desc = "Is that a secbot with four eswords in its arms...?" icon_state = "griefsky0" @@ -18,7 +19,8 @@ var/spam_flag = 0 var/frustration_number = 15 -/mob/living/simple_animal/bot/secbot/griefsky/toy //A toy version of general griefsky! +/// A toy version of general griefsky! +/mob/living/simple_animal/bot/secbot/griefsky/toy name = "Genewul Giftskee" desc = "An adorable looking secbot with four toy swords taped to its arms" spin_icon = "griefskyj-c" diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index 1e74d1162df..ea8eea9b0d7 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -162,7 +162,8 @@ playstyle_string = "You are a Juggernaut. Though slow, your shell can withstand extreme punishment, \ create shield walls, rip apart enemies and walls." -/mob/living/simple_animal/hostile/construct/armoured/hostile //actually hostile, will move around, hit things +/// actually hostile, will move around, hit things +/mob/living/simple_animal/hostile/construct/armoured/hostile AIStatus = AI_ON environment_smash = 1 //only token destruction, don't smash the cult wall NO STOP @@ -195,10 +196,12 @@ retreat_distance = 2 //AI wraiths will move in and out of combat playstyle_string = "You are a Wraith. Though relatively fragile, you are fast, deadly, and even able to phase through walls." -/mob/living/simple_animal/hostile/construct/wraith/hostile //actually hostile, will move around, hit things +/// actually hostile, will move around, hit things +/mob/living/simple_animal/hostile/construct/wraith/hostile AIStatus = AI_ON -/mob/living/simple_animal/hostile/construct/wraith/hostile/bubblegum //Used in bubblegum summoning. Needs MOB_SIZE_LARGE so crushers don't suffer +/// Used in bubblegum summoning. Needs MOB_SIZE_LARGE so crushers don't suffer +/mob/living/simple_animal/hostile/construct/wraith/hostile/bubblegum mob_size = MOB_SIZE_LARGE /////////////////////////////Artificer///////////////////////// @@ -276,7 +279,8 @@ retreat_distance = initial(retreat_distance) minimum_distance = initial(minimum_distance) -/mob/living/simple_animal/hostile/construct/builder/hostile //actually hostile, will move around, hit things, heal other constructs +/// actually hostile, will move around, hit things, heal other constructs +/mob/living/simple_animal/hostile/construct/builder/hostile AIStatus = AI_ON environment_smash = ENVIRONMENT_SMASH_STRUCTURES //only token destruction, don't smash the cult wall NO STOP @@ -306,7 +310,8 @@ var/energy = 0 var/max_energy = 1000 -/mob/living/simple_animal/hostile/construct/behemoth/hostile //actually hostile, will move around, hit things +/// actually hostile, will move around, hit things +/mob/living/simple_animal/hostile/construct/behemoth/hostile AIStatus = AI_ON environment_smash = 1 //only token destruction, don't smash the cult wall NO STOP @@ -340,7 +345,8 @@ return TRUE -/mob/living/simple_animal/hostile/construct/harvester/hostile //actually hostile, will move around, hit things +/// actually hostile, will move around, hit things +/mob/living/simple_animal/hostile/construct/harvester/hostile AIStatus = AI_ON environment_smash = 1 //only token destruction, don't smash the cult wall NO STOP diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm index 4cd1f666d0b..667a2ab9cb8 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -647,7 +647,8 @@ // Puppies do not have a head or back equipment slot. return "
Collar: [pcollar]" : "add_inv=collar'>Nothing"]" -/mob/living/simple_animal/pet/dog/corgi/puppy/void //Tribute to the corgis born in nullspace +/// Tribute to the corgis born in nullspace +/mob/living/simple_animal/pet/dog/corgi/puppy/void name = "\improper void puppy" real_name = "voidy" desc = "A corgi puppy that has been infused with deep space energy. It's staring back..." diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm index e1e4d06f04d..76469fd9356 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm @@ -784,7 +784,8 @@ Difficulty: Hard duration = 20 -/obj/item/projectile/energy/tesla_bolt //Leaving here for adminbus / so vetus still uses it. +/// Leaving here for adminbus / so vetus still uses it. +/obj/item/projectile/energy/tesla_bolt name = "shock bolt" icon_state = "purple_laser" impact_effect_type = /obj/effect/temp_visual/impact_effect/purple_laser @@ -810,7 +811,8 @@ Difficulty: Hard var/turf/target_turf = get_turf(A) loc = target_turf -/obj/effect/temp_visual/dragon_swoop/bubblegum/ancient_robot //this is the worst path I have ever made +/// this is the worst path I have ever made +/obj/effect/temp_visual/dragon_swoop/bubblegum/ancient_robot icon_state = "target" /obj/effect/temp_visual/dragon_swoop/bubblegum/ancient_robot/Initialize(mapload, target) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm index 3515e72c788..7a29e37406a 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm @@ -110,7 +110,8 @@ Difficulty: Medium shoot_ka() transform_weapon() -/obj/item/melee/energy/cleaving_saw/miner //nerfed saw because it is very murdery +/// nerfed saw because it is very murdery +/obj/item/melee/energy/cleaving_saw/miner force = 6 force_on = 10 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm index d2a79230e92..2ef2491296e 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -577,7 +577,8 @@ Difficulty: Hard var/turf/simulated/mineral/M = loc M.gets_drilled(caster) -/obj/effect/temp_visual/hierophant/wall //smoothing and pooling were not friends, but pooling is dead. +/// smoothing and pooling were not friends, but pooling is dead. +/obj/effect/temp_visual/hierophant/wall name = "vortex wall" icon = 'icons/turf/walls/hierophant_wall_temp.dmi' icon_state = "hierophant_wall_temp-0" @@ -612,7 +613,8 @@ Difficulty: Hard return TRUE return FALSE -/obj/effect/temp_visual/hierophant/chaser //a hierophant's chaser. follows target around, moving and producing a blast every speed deciseconds. +/// a hierophant's chaser. follows target around, moving and producing a blast every speed deciseconds. +/obj/effect/temp_visual/hierophant/chaser duration = 98 var/mob/living/target //what it's following var/turf/targetturf //what turf the target is actually on diff --git a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm index 39b5bc47bd6..a6a840906f8 100644 --- a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm +++ b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm @@ -1,6 +1,7 @@ -/obj/structure/alien/resin/flower_bud_enemy //inheriting basic attack/damage stuff from alien structures +/// inheriting basic attack/damage stuff from alien structures +/obj/structure/alien/resin/flower_bud_enemy name = "flower bud" desc = "A large pulsating plant..." icon = 'icons/effects/spacevines.dmi' diff --git a/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm b/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm index 2ba65d00bf4..845b8bf461f 100644 --- a/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm @@ -89,7 +89,8 @@ new next_stage(get_turf(src)) qdel(src) //hide the body -/mob/living/simple_animal/hostile/winter/santa/stage_1 //stage 1: slow melee +/// stage 1: slow melee +/mob/living/simple_animal/hostile/winter/santa/stage_1 maxHealth = 150 health = 150 desc = "GET THE FAT MAN!" @@ -99,7 +100,8 @@ melee_damage_lower = 10 melee_damage_upper = 20 -/mob/living/simple_animal/hostile/winter/santa/stage_2 //stage 2: slow ranged +/// stage 2: slow ranged +/mob/living/simple_animal/hostile/winter/santa/stage_2 desc = "GET THE FAT MAN AGAIN!" next_stage = /mob/living/simple_animal/hostile/winter/santa/stage_3 death_message = "YOU'VE BEEN VERY NAUGHTY! PREPARE TO DIE!" @@ -110,7 +112,8 @@ retreat_distance = 5 minimum_distance = 5 -/mob/living/simple_animal/hostile/winter/santa/stage_3 //stage 3: fast rapidfire ranged +/// stage 3: fast rapidfire ranged +/mob/living/simple_animal/hostile/winter/santa/stage_3 desc = "WHY WON'T HE DIE ALREADY!?" next_stage = /mob/living/simple_animal/hostile/winter/santa/stage_4 death_message = "FACE MY FINAL FORM AND KNOW DESPAIR!" @@ -123,7 +126,8 @@ retreat_distance = 3 minimum_distance = 3 -/mob/living/simple_animal/hostile/winter/santa/stage_4 //stage 4: fast spinebreaker +/// stage 4: fast spinebreaker +/mob/living/simple_animal/hostile/winter/santa/stage_4 name = "Final Form Santa" desc = "WHAT THE HELL IS HE!?! WHY WON'T HE STAY DEAD!?!" maxHealth = 300 //YOU FACE JARAX- I MEAN SANTA! diff --git a/code/modules/mob/new_player/sprite_accessories/human/human_body_markings.dm b/code/modules/mob/new_player/sprite_accessories/human/human_body_markings.dm index 9dd5345d483..87cac271a18 100644 --- a/code/modules/mob/new_player/sprite_accessories/human/human_body_markings.dm +++ b/code/modules/mob/new_player/sprite_accessories/human/human_body_markings.dm @@ -8,7 +8,8 @@ species_allowed = list("Unathi", "Tajaran", "Vulpkanin") icon_state = "tiger" -/datum/sprite_accessory/body_markings/tattoo // Tattoos applied post-round startup with tattoo guns in item_defines.dm +/// Tattoos applied post-round startup with tattoo guns in item_defines.dm +/datum/sprite_accessory/body_markings/tattoo species_allowed = list("Human", "Unathi", "Vulpkanin", "Tajaran", "Skrell") icon_state = "none" @@ -17,7 +18,8 @@ icon_state = "campbell" species_allowed = null -/datum/sprite_accessory/body_markings/tattoo/tiger_body // Yep, this is repeated. To be fixed later +/// Yep, this is repeated. To be fixed later +/datum/sprite_accessory/body_markings/tattoo/tiger_body name = "Tiger-stripe Tattoo" species_allowed = list("Human", "Unathi", "Vulpkanin", "Tajaran", "Skrell") icon_state = "tiger" diff --git a/code/modules/mob/new_player/sprite_accessories/human/human_hair.dm b/code/modules/mob/new_player/sprite_accessories/human/human_hair.dm index 27c2ad066b8..9cdfb017e9b 100644 --- a/code/modules/mob/new_player/sprite_accessories/human/human_hair.dm +++ b/code/modules/mob/new_player/sprite_accessories/human/human_hair.dm @@ -762,7 +762,8 @@ icon_state = "father" species_allowed = list("Human", "Slime People", "Unathi", "Tajaran", "Vulpkanin") -/datum/sprite_accessory/hair/bun4 // Due to a vulp hairstyle called bun +/// Due to a vulp hairstyle called bun +/datum/sprite_accessory/hair/bun4 name = "Bun 4" icon_state = "bun4" species_allowed = list("Human", "Slime People", "Unathi", "Tajaran", "Vulpkanin") @@ -854,7 +855,8 @@ ///Fluff HairStyles// -/datum/sprite_accessory/hair/fluff/pinapple_fluff_hair //Pineapple Salad hair fluff its for a slime..has to go under human +/// Pineapple Salad hair fluff its for a slime..has to go under human +/datum/sprite_accessory/hair/fluff/pinapple_fluff_hair name = "Sasook Hair" icon_state = "psalad_fluff_hair" species_allowed = list("Slime People") diff --git a/code/modules/mob/new_player/sprite_accessories/shared/shared_tail_markings.dm b/code/modules/mob/new_player/sprite_accessories/shared/shared_tail_markings.dm index ea1176ff738..72c9dbdc5ed 100644 --- a/code/modules/mob/new_player/sprite_accessories/shared/shared_tail_markings.dm +++ b/code/modules/mob/new_player/sprite_accessories/shared/shared_tail_markings.dm @@ -1,7 +1,8 @@ /datum/sprite_accessory/body_markings/tail/shared icon = 'icons/mob/sprite_accessories/shared/shared_tail_markings.dmi' -/datum/sprite_accessory/body_markings/tail/shared/short_tip //Species-ambiguous, generic short tail. +/// Species-ambiguous, generic short tail. +/datum/sprite_accessory/body_markings/tail/shared/short_tip name = "Short Tail Tip" species_allowed = list("Vulpkanin", "Tajaran") tails_allowed = list("Short Tail") diff --git a/code/modules/mob/new_player/sprite_accessories/skrell/skrell_face.dm b/code/modules/mob/new_player/sprite_accessories/skrell/skrell_face.dm index 0846744f0ca..76cbbc7284c 100644 --- a/code/modules/mob/new_player/sprite_accessories/skrell/skrell_face.dm +++ b/code/modules/mob/new_player/sprite_accessories/skrell/skrell_face.dm @@ -155,7 +155,8 @@ secondary_theme = "fest" no_sec_colour = 1 -/datum/sprite_accessory/hair/fluff/zeke_fluff_tentacle //Zeke Fluff hair +/// Zeke Fluff hair +/datum/sprite_accessory/hair/fluff/zeke_fluff_tentacle icon = 'icons/mob/sprite_accessories/skrell/skrell_hair.dmi' name = "Zekes Tentacles" icon_state = "zeke_fluff_hair" diff --git a/code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_head_markings.dm b/code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_head_markings.dm index cf23d358bf0..519b62894bc 100644 --- a/code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_head_markings.dm +++ b/code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_head_markings.dm @@ -31,14 +31,17 @@ name = "Tajaran Muzzle and Inner Ears" icon_state = "muzinears" -/datum/sprite_accessory/body_markings/head/tajara/muzzle_alt_taj //Companion marking for Tajaran Belly 2. +/// Companion marking for Tajaran Belly 2. +/datum/sprite_accessory/body_markings/head/tajara/muzzle_alt_taj name = "Tajaran Muzzle 2" icon_state = "muzzle2" -/datum/sprite_accessory/body_markings/head/tajara/points_taj //Companion marking for Tajaran Points. +/// Companion marking for Tajaran Points. +/datum/sprite_accessory/body_markings/head/tajara/points_taj name = "Tajaran Points Head" icon_state = "points" -/datum/sprite_accessory/body_markings/head/tajara/patchy_taj //Companion marking for Tajaran Patches. +/// Companion marking for Tajaran Patches. +/datum/sprite_accessory/body_markings/head/tajara/patchy_taj name = "Tajaran Patches Head" icon_state = "patch" diff --git a/code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_tail_markings.dm b/code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_tail_markings.dm index c8c0d20a6b3..ce507542afa 100644 --- a/code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_tail_markings.dm +++ b/code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_tail_markings.dm @@ -2,6 +2,7 @@ icon = 'icons/mob/sprite_accessories/tajaran/tajaran_tail_markings.dmi' species_allowed = list("Tajaran") -/datum/sprite_accessory/body_markings/tail/tajara/taj_wingler_stripes //Tiger stripes. +/// Tiger stripes. +/datum/sprite_accessory/body_markings/tail/tajara/taj_wingler_stripes name = "Tajaran Tail Stripes" icon_state = "default_wingler" diff --git a/code/modules/mob/new_player/sprite_accessories/unathi/unathi_hair.dm b/code/modules/mob/new_player/sprite_accessories/unathi/unathi_hair.dm index 81eb4356c6c..beed2052449 100644 --- a/code/modules/mob/new_player/sprite_accessories/unathi/unathi_hair.dm +++ b/code/modules/mob/new_player/sprite_accessories/unathi/unathi_hair.dm @@ -3,7 +3,8 @@ species_allowed = list("Unathi") glasses_over = 1 -/datum/sprite_accessory/hair/braid_hip_una // Future coder: Change the typepath under unathi. This is a legacy of my accessories splitting PR where typepath change is avoided at all cost +// Future coder: Change the typepath under unathi. This is a legacy of my accessories splitting PR where typepath change is avoided at all cost +/datum/sprite_accessory/hair/braid_hip_una icon = 'icons/mob/sprite_accessories/unathi/unathi_hair.dmi' name = "Unathi Hippie Braid" icon_state = "hipbraid" diff --git a/code/modules/mob/new_player/sprite_accessories/unathi/unathi_head_markings.dm b/code/modules/mob/new_player/sprite_accessories/unathi/unathi_head_markings.dm index b410148b0c9..bb416b82f09 100644 --- a/code/modules/mob/new_player/sprite_accessories/unathi/unathi_head_markings.dm +++ b/code/modules/mob/new_player/sprite_accessories/unathi/unathi_head_markings.dm @@ -20,16 +20,19 @@ icon_state = "lowersnout" heads_allowed = list("All") -/datum/sprite_accessory/body_markings/head/unathi/banded_una //Companion marking for Unathi Banded. +/// Companion marking for Unathi Banded. +/datum/sprite_accessory/body_markings/head/unathi/banded_una name = "Unathi Banded Head" icon_state = "bandedface" heads_allowed = list("All") -/datum/sprite_accessory/body_markings/head/unathi/snout_narrow_una //Companion marking for Unathi Narrow Belly. +/// Companion marking for Unathi Narrow Belly. +/datum/sprite_accessory/body_markings/head/unathi/snout_narrow_una name = "Unathi Snout 2" icon_state = "facenarrow" -/datum/sprite_accessory/body_markings/head/unathi/points_una //Companion marking for Unathi Points. +/// Companion marking for Unathi Points. +/datum/sprite_accessory/body_markings/head/unathi/points_una name = "Unathi Points Head" icon_state = "pointsface" heads_allowed = list("All") @@ -45,6 +48,7 @@ name = "Unathi Sharp Snout" icon_state = "snoutsharp" -/datum/sprite_accessory/body_markings/head/unathi/sharp/snout_narrow_una_sharp //Companion marking for Unathi Narrow Belly. +/// Companion marking for Unathi Narrow Belly. +/datum/sprite_accessory/body_markings/head/unathi/sharp/snout_narrow_una_sharp name = "Unathi Sharp Snout 2" icon_state = "facesharp" diff --git a/code/modules/mob/new_player/sprite_accessories/vulpkanin/vulpkanin_head_markings.dm b/code/modules/mob/new_player/sprite_accessories/vulpkanin/vulpkanin_head_markings.dm index e4c54a0b65e..d48897737c4 100644 --- a/code/modules/mob/new_player/sprite_accessories/vulpkanin/vulpkanin_head_markings.dm +++ b/code/modules/mob/new_player/sprite_accessories/vulpkanin/vulpkanin_head_markings.dm @@ -18,18 +18,22 @@ name = "Vulpkanin Tiger Head and Face" icon_state = "tiger_face" -/datum/sprite_accessory/body_markings/head/vulpkanin/muzzle_vulp //Companion marking for Vulpkanin Belly Alt.. +/// Companion marking for Vulpkanin Belly Alt.. +/datum/sprite_accessory/body_markings/head/vulpkanin/muzzle_vulp name = "Vulpkanin Muzzle" icon_state = "muzzle" -/datum/sprite_accessory/body_markings/head/vulpkanin/muzzle_ears_vulp //Companion marking for Vulpkanin Belly Alt.. +/// Companion marking for Vulpkanin Belly Alt.. +/datum/sprite_accessory/body_markings/head/vulpkanin/muzzle_ears_vulp name = "Vulpkanin Muzzle and Ears" icon_state = "muzzle_ear" -/datum/sprite_accessory/body_markings/head/vulpkanin/points_fade_vulp //Companion marking for Vulpkanin Points Fade. +/// Companion marking for Vulpkanin Points Fade. +/datum/sprite_accessory/body_markings/head/vulpkanin/points_fade_vulp name = "Vulpkanin Points Head" icon_state = "points_fade" -/datum/sprite_accessory/body_markings/head/vulpkanin/points_sharp_vulp //Companion marking for Vulpkanin Points Sharp. +/// Companion marking for Vulpkanin Points Sharp. +/datum/sprite_accessory/body_markings/head/vulpkanin/points_sharp_vulp name = "Vulpkanin Points Head 2" icon_state = "points_sharp" diff --git a/code/modules/mod/mod_construction.dm b/code/modules/mod/mod_construction.dm index e92f9bf41a3..081cbddf017 100644 --- a/code/modules/mod/mod_construction.dm +++ b/code/modules/mod/mod_construction.dm @@ -63,16 +63,20 @@ /obj/item/mod/construction/plating/cosmohonk theme = /datum/mod_theme/cosmohonk -/obj/item/mod/construction/plating/rescue //I want to add a way to get the rarer modsuit types, that is limited. A low chance for traders to have plating for it seems interesting +/// I want to add a way to get the rarer modsuit types, that is limited. A low chance for traders to have plating for it seems interesting +/obj/item/mod/construction/plating/rescue theme = /datum/mod_theme/rescue -/obj/item/mod/construction/plating/safeguard //Continued from above, none of these are steal objectives, and only the CE or RD one comes pre-installed with modules. You are getting the protection / speed / looks of these hardsuits, but no special modules. +/// Continued from above, none of these are steal objectives, and only the CE or RD one comes pre-installed with modules. You are getting the protection / speed / looks of these hardsuits, but no special modules. +/obj/item/mod/construction/plating/safeguard theme = /datum/mod_theme/safeguard -/obj/item/mod/construction/plating/advanced //This may be a bad idea. I think this is an interesting idea. And you still need robotics to build it, and traders can charge as much for it as they want. Also with ones like the CE modsuit, it is the flagship mod. That means it is sold a lot. +/// This may be a bad idea. I think this is an interesting idea. And you still need robotics to build it, and traders can charge as much for it as they want. Also with ones like the CE modsuit, it is the flagship mod. That means it is sold a lot. +/obj/item/mod/construction/plating/advanced theme = /datum/mod_theme/advanced -/obj/item/mod/construction/plating/research //Don't think people will want the RD one though, it is as slow as shit. Anyway, here it is. Surely this will not end poorly. +/// Don't think people will want the RD one though, it is as slow as shit. Anyway, here it is. Surely this will not end poorly. +/obj/item/mod/construction/plating/research theme = /datum/mod_theme/research #define START_STEP "start" diff --git a/code/modules/mod/mod_core.dm b/code/modules/mod/mod_core.dm index 2dbd92afebc..62f737b3278 100644 --- a/code/modules/mod/mod_core.dm +++ b/code/modules/mod/mod_core.dm @@ -44,7 +44,8 @@ /obj/item/mod/core/proc/update_charge_alert() mod.wearer.clear_alert("mod_charge") -/obj/item/mod/core/infinite //Admin only. +/// Admin only. +/obj/item/mod/core/infinite name = "MOD infinite core" icon_state = "mod-core-infinite" desc = "A fusion core using the rare Infinium to sustain enough energy for the lifetime of the MOD's user. \ diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm index d4057244a45..14c1ce98eb8 100644 --- a/code/modules/mod/mod_theme.dm +++ b/code/modules/mod/mod_theme.dm @@ -101,7 +101,8 @@ ), ) -/datum/mod_theme/standard //We don't want the civilian skin to apply to all modsuits, that causes issues. +/// We don't want the civilian skin to apply to all modsuits, that causes issues. +/datum/mod_theme/standard name = "standard" @@ -1125,7 +1126,8 @@ ), ) -/obj/item/mod/armor/mod_theme_responsory //This has no slowdown active, and no variation between levels. I am ASSUMING this will be gamma only. +/// This has no slowdown active, and no variation between levels. I am ASSUMING this will be gamma only. +/obj/item/mod/armor/mod_theme_responsory armor = list(MELEE = 40, BULLET = 25, LASER = 25, ENERGY = 20, BOMB = 25, RAD = INFINITY, FIRE = 200, ACID = 200) /datum/mod_theme/apocryphal @@ -1335,5 +1337,6 @@ ), ) -/obj/item/mod/armor/mod_theme_administrative //considering this should not be used, it's getting just DS armor, not infinity in everything. +/// considering this should not be used, it's getting just DS armor, not infinity in everything. +/obj/item/mod/armor/mod_theme_administrative armor = list(MELEE = 200, BULLET = 200, LASER = 50, ENERGY = 50, BOMB = INFINITY, RAD = INFINITY, FIRE = INFINITY, ACID = INFINITY) diff --git a/code/modules/mod/mod_types.dm b/code/modules/mod/mod_types.dm index 0ae05ec490e..370a5b29bce 100644 --- a/code/modules/mod/mod_types.dm +++ b/code/modules/mod/mod_types.dm @@ -119,7 +119,8 @@ /obj/item/mod/module/sphere_transform, ) -/obj/item/mod/control/pre_equipped/mining/vendor //visit robotics. +/// visit robotics. +/obj/item/mod/control/pre_equipped/mining/vendor theme = /datum/mod_theme/mining applied_core = /obj/item/mod/core/plasma applied_modules = list( @@ -130,7 +131,8 @@ ) -/obj/item/mod/control/pre_equipped/mining/asteroid //The asteroid skin, as that one looks more space worthy / older. Good for space ruins. +/// The asteroid skin, as that one looks more space worthy / older. Good for space ruins. +/obj/item/mod/control/pre_equipped/mining/asteroid applied_skin = "asteroid" /obj/item/mod/control/pre_equipped/medical @@ -368,7 +370,8 @@ insignia_type = /obj/item/mod/module/insignia/chaplain additional_module = /obj/item/mod/module/injector -/obj/item/mod/control/pre_equipped/responsory/inquisitory //Diffrent look, as well as magic proof on TG. We don't have the magic proof stuff here, but it's perfect for inqusitors. Or if you want to give your ERT a fancy look. +/// Diffrent look, as well as magic proof on TG. We don't have the magic proof stuff here, but it's perfect for inqusitors. Or if you want to give your ERT a fancy look. +/obj/item/mod/control/pre_equipped/responsory/inquisitory applied_skin = "inquisitory" /obj/item/mod/control/pre_equipped/responsory/inquisitory/commander diff --git a/code/modules/mod/modules/modules_security.dm b/code/modules/mod/modules/modules_security.dm index 6e5a9536495..865cf356faa 100644 --- a/code/modules/mod/modules/modules_security.dm +++ b/code/modules/mod/modules/modules_security.dm @@ -92,7 +92,8 @@ M.Copy_Parent(thrower, 15 SECONDS) qdel(src) -/mob/living/simple_animal/hostile/illusion/mirage //It's just standing there, menacingly +/// It's just standing there, menacingly +/mob/living/simple_animal/hostile/illusion/mirage AIStatus = AI_OFF density = FALSE diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index 630d3140b11..f0ed2903029 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -32,7 +32,8 @@ name = "autopsy reports drawer" desc = "A large drawer for holding autopsy reports." -/obj/structure/filingcabinet/filingcabinet //not changing the path to avoid unecessary map issues, but please don't name stuff like this in the future -Pete +/// not changing the path to avoid unecessary map issues, but please don't name stuff like this in the future -Pete +/obj/structure/filingcabinet/filingcabinet icon_state = "tallcabinet" diff --git a/code/modules/paperwork/silicon_photography.dm b/code/modules/paperwork/silicon_photography.dm index 5539477190a..aba7263615e 100644 --- a/code/modules/paperwork/silicon_photography.dm +++ b/code/modules/paperwork/silicon_photography.dm @@ -10,13 +10,16 @@ var/photos_taken = 0 var/list/aipictures = list() -/obj/item/camera/siliconcam/ai_camera //camera AI can take pictures with +/// camera AI can take pictures with +/obj/item/camera/siliconcam/ai_camera name = "AI photo camera" -/obj/item/camera/siliconcam/robot_camera //camera cyborgs can take pictures with +/// camera cyborgs can take pictures with +/obj/item/camera/siliconcam/robot_camera name = "Cyborg photo camera" -/obj/item/camera/siliconcam/drone_camera //currently doesn't offer the verbs, thus cannot be used +/// currently doesn't offer the verbs, thus cannot be used +/obj/item/camera/siliconcam/drone_camera name = "Drone photo camera" /obj/item/camera/siliconcam/proc/injectaialbum(datum/picture/P, sufix = "") //stores image information to a list similar to that of the datacore diff --git a/code/modules/pda/cart.dm b/code/modules/pda/cart.dm index 9ca068dd81f..4a66081f956 100644 --- a/code/modules/pda/cart.dm +++ b/code/modules/pda/cart.dm @@ -282,7 +282,8 @@ charges = 4 messenger_plugins = list(new/datum/data/pda/messenger_plugin/virus/detonate) -/obj/item/cartridge/syndicate/nuclear //needed subtype so regular traitors can't open and close nuclear shuttle doors +/// needed subtype so regular traitors can't open and close nuclear shuttle doors +/obj/item/cartridge/syndicate/nuclear name = "Nuclear Agent Detomatix Cartridge" desc = "The same reliable Detomatix program except with the added ability of remotely toggling your nuclear shuttle airlock from your PDA" var/initial_remote_door_id = "smindicate" //Make sure this matches the syndicate shuttle's shield/door id!! //don't ask about the name, testing. diff --git a/code/modules/power/apc/apc.dm b/code/modules/power/apc/apc.dm index bd6ed8a952e..f5ca2d8097a 100644 --- a/code/modules/power/apc/apc.dm +++ b/code/modules/power/apc/apc.dm @@ -1063,7 +1063,8 @@ /obj/machinery/power/apc/off_station/empty_charge start_charge = 0 -/obj/machinery/power/apc/syndicate //general syndicate access +/// general syndicate access +/obj/machinery/power/apc/syndicate name = "Main branch, do not use" req_access = list(ACCESS_SYNDICATE) report_power_alarm = FALSE diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 58ef4172770..ac615cfcf74 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -211,17 +211,20 @@ name = "\improper X-01 multiphase energy gun power cell" maxcharge = 1200 -/obj/item/stock_parts/cell/pulse //200 pulse shots +/// 200 pulse shots +/obj/item/stock_parts/cell/pulse name = "pulse rifle power cell" maxcharge = 40000 rating = 3 chargerate = 1500 -/obj/item/stock_parts/cell/pulse/carbine //25 pulse shots +/// 25 pulse shots +/obj/item/stock_parts/cell/pulse/carbine name = "pulse carbine power cell" maxcharge = 5000 -/obj/item/stock_parts/cell/pulse/pistol //10 pulse shots +/// 10 pulse shots +/obj/item/stock_parts/cell/pulse/pistol name = "pulse pistol power cell" maxcharge = 2000 @@ -371,7 +374,8 @@ maxcharge = 40000 chargerate = 2600 // about 30 seconds to charge with a default recharger -/obj/item/stock_parts/cell/emproof/reactive // EMP proof so emp_act does not double dip. +/// EMP proof so emp_act does not double dip. +/obj/item/stock_parts/cell/emproof/reactive name = "reactive armor power cell" desc = "A cell used to power reactive armors." maxcharge = 2400 diff --git a/code/modules/power/engines/singularity/narsie.dm b/code/modules/power/engines/singularity/narsie.dm index c5ee48948b6..a90624bb3c7 100644 --- a/code/modules/power/engines/singularity/narsie.dm +++ b/code/modules/power/engines/singularity/narsie.dm @@ -1,4 +1,5 @@ -/obj/singularity/narsie //Moving narsie to a child object of the singularity so it can be made to function differently. --NEO +/// Moving narsie to a child object of the singularity so it can be made to function differently. --NEO +/obj/singularity/narsie name = "Nar'sie's Avatar" desc = "Your mind begins to bubble and ooze as it tries to comprehend what it sees." icon = 'icons/obj/magic_terror.dmi' diff --git a/code/modules/power/engines/supermatter/supermatter.dm b/code/modules/power/engines/supermatter/supermatter.dm index 5eb1232d935..cfb174ff110 100644 --- a/code/modules/power/engines/supermatter/supermatter.dm +++ b/code/modules/power/engines/supermatter/supermatter.dm @@ -1026,7 +1026,8 @@ moveable = FALSE anchored = TRUE -/obj/machinery/atmospherics/supermatter_crystal/shard/hugbox/fakecrystal //Hugbox shard with crystal visuals, used in the Supermatter/Hyperfractal shuttle +/// Hugbox shard with crystal visuals, used in the Supermatter/Hyperfractal shuttle +/obj/machinery/atmospherics/supermatter_crystal/shard/hugbox/fakecrystal name = "supermatter crystal" base_icon_state = "darkmatter" icon_state = "darkmatter" diff --git a/code/modules/procedural_mapping/mapGenerators/syndicate_mapgen.dm b/code/modules/procedural_mapping/mapGenerators/syndicate_mapgen.dm index 620d88ca48a..08031bcec24 100644 --- a/code/modules/procedural_mapping/mapGenerators/syndicate_mapgen.dm +++ b/code/modules/procedural_mapping/mapGenerators/syndicate_mapgen.dm @@ -25,7 +25,8 @@ // Generators -/datum/mapGenerator/syndicate/empty //walls and floor only +/// walls and floor only +/datum/mapGenerator/syndicate/empty modules = list(/datum/mapGeneratorModule/bottomLayer/syndieFloor, \ /datum/mapGeneratorModule/border/syndieWalls,\ /datum/mapGeneratorModule/bottomLayer/repressurize) diff --git a/code/modules/projectiles/ammunition/energy_lens.dm b/code/modules/projectiles/ammunition/energy_lens.dm index 322d210681a..93f8c9b3d66 100644 --- a/code/modules/projectiles/ammunition/energy_lens.dm +++ b/code/modules/projectiles/ammunition/energy_lens.dm @@ -13,7 +13,8 @@ muzzle_flash_color = LIGHT_COLOR_DARKRED select_name = "kill" -/obj/item/ammo_casing/energy/laser/cyborg //to balance cyborg energy cost seperately +/// to balance cyborg energy cost seperately +/obj/item/ammo_casing/energy/laser/cyborg e_cost = 250 /obj/item/ammo_casing/energy/lasergun @@ -175,7 +176,8 @@ randomspread = 1 delay = 2 -/obj/item/ammo_casing/energy/disabler/cyborg //seperate balancing for cyborg, again +/// seperate balancing for cyborg, again +/obj/item/ammo_casing/energy/disabler/cyborg e_cost = 250 /obj/item/ammo_casing/energy/disabler/hos @@ -306,7 +308,8 @@ e_cost = 350 // about 42 shots on an engineering borg from a borging machine, Reads a lot better than it actually is because people miss shots and often your better abilities require charge as well delay = 1 SECONDS -/obj/item/ammo_casing/energy/emitter/cyborg/proto // needed a slightly weaker ranged option to give to Safety Overriden borgs. The fire rate is about the same as an emitter if you put it on the ground. +/// needed a slightly weaker ranged option to give to Safety Overriden borgs. The fire rate is about the same as an emitter if you put it on the ground. +/obj/item/ammo_casing/energy/emitter/cyborg/proto e_cost = 500 delay = 2 SECONDS diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index 54fc6475c14..2a74c71b448 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -571,7 +571,8 @@ multi_sprite_step = 5 w_class = WEIGHT_CLASS_NORMAL -/obj/item/ammo_box/magazine/laser/ert //Used by red ERT. Keeps the size for them +/// Used by red ERT. Keeps the size for them +/obj/item/ammo_box/magazine/laser/ert name = "compact laser carbine projector magazine" desc = "By use of bluespace technology, the ammo casings are stored in a pocket dimension, saving on space and making them EMP proof." w_class = WEIGHT_CLASS_TINY @@ -589,7 +590,8 @@ /obj/item/ammo_box/magazine/toy/smgm45/riot ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot -/obj/item/ammo_box/magazine/detective/speedcharger //yes this doesn't really belong here but nowhere else works +// yes this doesn't really belong here but nowhere else works +/obj/item/ammo_box/magazine/detective/speedcharger name = "DL-88 charge pack" desc = "One-use charge pack for the DL-88 energy revolver." icon_state = "handgun_ammo_battery" diff --git a/code/modules/projectiles/guns/energy/special_eguns.dm b/code/modules/projectiles/guns/energy/special_eguns.dm index f76483b01c4..bad7b5dcbfc 100644 --- a/code/modules/projectiles/guns/energy/special_eguns.dm +++ b/code/modules/projectiles/guns/energy/special_eguns.dm @@ -838,7 +838,8 @@ tracking_target_UID = null -/obj/item/gun/energy/spikethrower //It's like the cyborg LMG, uses energy to make spikes +/// It's like the cyborg LMG, uses energy to make spikes +/obj/item/gun/energy/spikethrower name = "\improper Vox spike thrower" desc = "A vicious alien projectile weapon. Parts of it quiver gelatinously, as though the thing is insectile and alive." icon = 'icons/obj/guns/projectile.dmi' diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 381d1d641d9..7098081a31c 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -112,7 +112,8 @@ user.bleed(BLOOD_VOLUME_NORMAL) user.death() // Just in case -/obj/item/gun/projectile/revolver/fingergun //Summoned by the Finger Gun spell, from advanced mimery traitor item +/// Summoned by the Finger Gun spell, from advanced mimery traitor item +/obj/item/gun/projectile/revolver/fingergun name = "\improper finger gun" desc = "Bang bang bang!" icon_state = "fingergun" diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 70e9a7f903b..f5f3d6100d3 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -86,7 +86,8 @@ // RIOT SHOTGUN // -/obj/item/gun/projectile/shotgun/riot //for spawn in the armory +/// for spawn in the armory +/obj/item/gun/projectile/shotgun/riot name = "riot shotgun" desc = "A sturdy shotgun with a longer magazine and a fixed tactical stock designed for non-lethal riot control." icon_state = "riotshotgun" diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 56935aae546..406aa34e3e3 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -7,7 +7,8 @@ hitsound_wall = "ricochet" impact_effect_type = /obj/effect/temp_visual/impact_effect -/obj/item/projectile/bullet/weakbullet //beanbag, heavy stamina damage +/// beanbag, heavy stamina damage +/obj/item/projectile/bullet/weakbullet name = "beanbag slug" damage = 5 stamina = 40 @@ -138,7 +139,8 @@ /obj/item/projectile/bullet/heavybullet damage = 35 -/obj/item/projectile/bullet/stunshot //taser slugs for shotguns, nothing special +/// taser slugs for shotguns, nothing special +/obj/item/projectile/bullet/stunshot name = "stunshot" damage = 5 weaken = 10 SECONDS diff --git a/code/modules/reagents/chemistry/reagents/admin_reagents.dm b/code/modules/reagents/chemistry/reagents/admin_reagents.dm index 32dc34f79de..bce28f02500 100644 --- a/code/modules/reagents/chemistry/reagents/admin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/admin_reagents.dm @@ -1,4 +1,5 @@ -/datum/reagent/medicine/adminordrazine //An OP chemical for admins +/// An OP chemical for admins +/datum/reagent/medicine/adminordrazine name = "Adminordrazine" id = "adminordrazine" description = "It's magic. We don't have to explain it." diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index ac51cdc9cad..2995b332c32 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -230,7 +230,8 @@ drink_desc = "Damn, you feel like some kind of French aristocrat just by holding this." taste_description = "cognac" -/datum/reagent/consumable/ethanol/suicider //otherwise known as "I want to get so smashed my liver gives out and I die from alcohol poisoning". +/// otherwise known as "I want to get so smashed my liver gives out and I die from alcohol poisoning". +/datum/reagent/consumable/ethanol/suicider name = "Suicider" id = "suicider" description = "An unbelievably strong and potent variety of Cider." @@ -1155,7 +1156,8 @@ drink_desc = "For enjoying the most wonderful time of the year." taste_description = "christmas spirit" -/datum/reagent/consumable/ethanol/dragons_breath //inaccessible to players, but here for admin shennanigans +/// inaccessible to players, but here for admin shennanigans +/datum/reagent/consumable/ethanol/dragons_breath name = "Dragon's Breath" id = "dragonsbreath" description = "Possessing this stuff probably breaks the Geneva convention." @@ -1409,7 +1411,8 @@ #undef MIN_WINE_PERCENT -/datum/reagent/consumable/ethanol/bacchus_blessing //An EXTREMELY powerful drink. Smashed in seconds, dead in minutes. +/// An EXTREMELY powerful drink. Smashed in seconds, dead in minutes. +/datum/reagent/consumable/ethanol/bacchus_blessing name = "Bacchus' Blessing" id = "bacchus_blessing" description = "Unidentifiable mixture. Unmeasurably high alcohol content." diff --git a/code/modules/reagents/chemistry/reagents/blob_reagents.dm b/code/modules/reagents/chemistry/reagents/blob_reagents.dm index 0387905fe2c..5eaa1a1e094 100644 --- a/code/modules/reagents/chemistry/reagents/blob_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/blob_reagents.dm @@ -12,7 +12,8 @@ /datum/reagent/blob/proc/damage_reaction(obj/structure/blob/B, damage, damage_type, damage_flag) //when the blob takes damage, do this return damage -/datum/reagent/blob/ripping_tendrils //does brute and a little stamina damage +/// does brute and a little stamina damage +/datum/reagent/blob/ripping_tendrils name = "Ripping Tendrils" description = "Deals High Brute damage, as well as Stamina damage." id = "ripping_tendrils" @@ -28,7 +29,8 @@ if(iscarbon(M)) M.emote("scream") -/datum/reagent/blob/boiling_oil //sets you on fire, does burn damage +/// sets you on fire, does burn damage +/datum/reagent/blob/boiling_oil name = "Boiling Oil" description = "Deals High Burn damage, and sets the victim aflame." id = "boiling_oil" @@ -45,7 +47,8 @@ M.IgniteMob() M.emote("scream") -/datum/reagent/blob/envenomed_filaments //toxin, hallucination, and some bonus spore toxin +/// toxin, hallucination, and some bonus spore toxin +/datum/reagent/blob/envenomed_filaments name = "Envenomed Filaments" description = "Deals High Toxin damage, causes Hallucinations, and injects Spores into the bloodstream." id = "envenomed_filaments" @@ -61,7 +64,8 @@ if(M.reagents) M.reagents.add_reagent("spore", 0.4*volume) -/datum/reagent/blob/lexorin_jelly //does tons of oxygen damage and a little brute +/// does tons of oxygen damage and a little brute +/datum/reagent/blob/lexorin_jelly name = "Lexorin Jelly" description = "Deals Medium Brute damage, but massive amounts of Respiration Damage." id = "lexorin_jelly" @@ -77,7 +81,8 @@ M.AdjustLoseBreath(round(0.6 SECONDS * volume)) -/datum/reagent/blob/kinetic //does semi-random brute damage +/// does semi-random brute damage +/datum/reagent/blob/kinetic name = "Kinetic Gelatin" description = "Deals Randomized damage, between 0.33 to 2.33 times the standard amount." id = "kinetic" @@ -91,7 +96,8 @@ var/damage = rand(5, 35)/25 M.apply_damage(damage*volume, BRUTE) -/datum/reagent/blob/cryogenic_liquid //does low burn damage and stamina damage and cools targets down +/// does low burn damage and stamina damage and cools targets down +/datum/reagent/blob/cryogenic_liquid name = "Cryogenic Liquid" description = "Deals Medium Brute damage, Stamina Damage, and injects Frost Oil into its victims, freezing them to death." id = "cryogenic_liquid" diff --git a/code/modules/reagents/chemistry/reagents/drugs.dm b/code/modules/reagents/chemistry/reagents/drugs.dm index 51f8ec28f33..da1e5407c06 100644 --- a/code/modules/reagents/chemistry/reagents/drugs.dm +++ b/code/modules/reagents/chemistry/reagents/drugs.dm @@ -775,7 +775,8 @@ M.emote("laugh") return list(effect, update_flags) -/datum/reagent/rotatium //Rotatium. Fucks up your rotation and is hilarious +/// Rotatium. Fucks up your rotation and is hilarious +/datum/reagent/rotatium name = "Rotatium" id = "rotatium" description = "A constantly swirling, oddly colourful fluid. Causes the consumer's sense of direction and hand-eye coordination to become wild." diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index fc3ed3ccd20..e1e666e56ab 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -19,7 +19,8 @@ H.adjust_nutrition(nutriment_factor) // For hunger and fatness return ..() -/datum/reagent/consumable/nutriment // Pure nutriment, universally digestable and thus slightly less effective +/// Pure nutriment, universally digestable and thus slightly less effective +/datum/reagent/consumable/nutriment name = "Nutriment" id = "nutriment" description = "A questionable mixture of various pure nutrients commonly found in processed foods." @@ -62,13 +63,15 @@ counterlist_normalise(taste_amounts) data = taste_amounts -/datum/reagent/consumable/nutriment/protein // Meat-based protein, digestable by carnivores and omnivores, worthless to herbivores +/// Meat-based protein, digestable by carnivores and omnivores, worthless to herbivores +/datum/reagent/consumable/nutriment/protein name = "Protein" id = "protein" description = "Various essential proteins and fats commonly found in animal flesh and blood." diet_flags = DIET_CARN | DIET_OMNI -/datum/reagent/consumable/nutriment/plantmatter // Plant-based biomatter, digestable by herbivores and omnivores, worthless to carnivores +/// Plant-based biomatter, digestable by herbivores and omnivores, worthless to carnivores +/datum/reagent/consumable/nutriment/plantmatter name = "Plant-matter" id = "plantmatter" description = "Vitamin-rich fibers and natural sugars commonly found in fresh produce." @@ -813,7 +816,8 @@ ///Food Related, but non-nutritious -/datum/reagent/questionmark // food poisoning +/// food poisoning +/datum/reagent/questionmark name = "????" id = "????" description = "A gross and unidentifiable substance." diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm index 3cd551e24f9..7057b02f99b 100644 --- a/code/modules/reagents/chemistry/reagents/medicine.dm +++ b/code/modules/reagents/chemistry/reagents/medicine.dm @@ -1258,7 +1258,8 @@ M.Drowsy(40 SECONDS) return ..() | update_flags -/datum/reagent/medicine/syndicate_nanites //Used exclusively by Syndicate medical cyborgs +/// Used exclusively by Syndicate medical cyborgs +/datum/reagent/medicine/syndicate_nanites name = "Restorative Nanites" id = "syndicate_nanites" description = "Miniature medical robots that swiftly restore bodily damage. May begin to attack their host's cells in high amounts." @@ -1400,7 +1401,8 @@ return ..() | update_flags -/datum/reagent/medicine/earthsblood //Created by ambrosia gaia plants +/// Created by ambrosia gaia plants +/datum/reagent/medicine/earthsblood name = "Earthsblood" id = "earthsblood" description = "Ichor from an extremely powerful plant. Great for restoring wounds, but it's a little heavy on the brain." diff --git a/code/modules/reagents/chemistry/reagents/misc_reagents.dm b/code/modules/reagents/chemistry/reagents/misc_reagents.dm index e99879f3b28..ad585ba96a1 100644 --- a/code/modules/reagents/chemistry/reagents/misc_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/misc_reagents.dm @@ -447,7 +447,8 @@ /datum/reagent/love/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume) to_chat(M, "You feel loved!") -/datum/reagent/jestosterone //Formerly known as Nitrogen tungstide hypochlorite before NT fired the chemists for trying to be funny +/// Formerly known as Nitrogen tungstide hypochlorite before NT fired the chemists for trying to be funny +/datum/reagent/jestosterone name = "Jestosterone" id = "jestosterone" description = "Jestosterone is an odd chemical compound that induces a variety of annoying side-effects in the average person. It also causes mild intoxication, and is toxic to mimes." diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm index c104e21bd9e..264b0b6c882 100644 --- a/code/modules/reagents/chemistry/reagents/toxins.dm +++ b/code/modules/reagents/chemistry/reagents/toxins.dm @@ -452,7 +452,8 @@ M.EyeBlurry(6 SECONDS) return ..() | update_flags -/datum/reagent/beer2 //disguised as normal beer for use by emagged service borgs +/// disguised as normal beer for use by emagged service borgs +/datum/reagent/beer2 name = "Beer" id = "beer2" description = "An alcoholic beverage made from malted grains, hops, yeast, and water." @@ -1082,7 +1083,8 @@ lethality = 2 //Atrazine, however, is definitely toxic -/datum/reagent/pestkiller // To-Do; make this more realistic. +/// To-Do; make this more realistic. +/datum/reagent/pestkiller name = "Pest Killer" id = "pestkiller" description = "A harmful toxic mixture to kill pests. Do not ingest!" @@ -1237,7 +1239,8 @@ M.emote("scream") M.adjustBruteLoss(4) -/datum/reagent/teslium //Teslium. Causes periodic shocks, and makes shocks against the target much more effective. +/// Teslium. Causes periodic shocks, and makes shocks against the target much more effective. +/datum/reagent/teslium name = "Teslium" id = "teslium" description = "An unstable, electrically-charged metallic slurry. Increases the conductance of living things." @@ -1281,7 +1284,8 @@ playsound(M, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) chosen_timer = rand(shock_low, shock_high) //It needs to be randomised here for blob teslium, and randoming it here doesn't affect normal -/datum/reagent/teslium/blob //This version has it's shocks much less frequently, while retaining the shock multiplier +/// This version has it's shocks much less frequently, while retaining the shock multiplier +/datum/reagent/teslium/blob id = "blob_teslium" shock_low = 10 use_chaotic_random = FALSE diff --git a/code/modules/reagents/chemistry/reagents/water.dm b/code/modules/reagents/chemistry/reagents/water.dm index 4c894c64f67..25d4c98451e 100644 --- a/code/modules/reagents/chemistry/reagents/water.dm +++ b/code/modules/reagents/chemistry/reagents/water.dm @@ -363,7 +363,8 @@ qdel(R) T.Bless() -/datum/reagent/fuel/unholywater //if you somehow managed to extract this from someone, dont splash it on yourself and have a smoke +/// if you somehow managed to extract this from someone, dont splash it on yourself and have a smoke +/datum/reagent/fuel/unholywater name = "Unholy Water" id = "unholywater" description = "Something that shouldn't exist on this plane of existence." diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index ed5bb95bedd..0614786d2d1 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -225,7 +225,8 @@ result_amount = 2 mix_message = "The substance becomes a pile of burning dust." -/datum/chemical_reaction/phlogiston_fire //This MUST be above the smoke recipe. +/// This MUST be above the smoke recipe. +/datum/chemical_reaction/phlogiston_fire name = "Phlogiston Fire" id = "phlogiston_fire" result = "phlogiston" diff --git a/code/modules/reagents/chemistry/recipes/toxins_reactions.dm b/code/modules/reagents/chemistry/recipes/toxins_reactions.dm index cf61f2f916b..68d23fe73c1 100644 --- a/code/modules/reagents/chemistry/recipes/toxins_reactions.dm +++ b/code/modules/reagents/chemistry/recipes/toxins_reactions.dm @@ -108,7 +108,8 @@ result_amount = 3 mix_message = "The mixture gives off a harsh odor" -/datum/chemical_reaction/pestkiller // To-Do make this more realistic +/// To-Do make this more realistic +/datum/chemical_reaction/pestkiller name = "Pest Killer" id = "pestkiller" result = "pestkiller" diff --git a/code/modules/reagents/reagent_containers/applicator.dm b/code/modules/reagents/reagent_containers/applicator.dm index 4478d05ad27..b8ee6eb9823 100644 --- a/code/modules/reagents/reagent_containers/applicator.dm +++ b/code/modules/reagents/reagent_containers/applicator.dm @@ -144,5 +144,6 @@ name = "dual auto-mender" list_reagents = list("synthflesh" = 200) -/obj/item/reagent_containers/applicator/dual/syndi // It magically goes through hardsuits. Don't ask how. +/// It magically goes through hardsuits. Don't ask how. +/obj/item/reagent_containers/applicator/dual/syndi ignore_flags = TRUE diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index ccffe1dcab9..558f06a3a19 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -116,7 +116,8 @@ volume = 100 list_reagents = list("nanites" = 100) -/obj/item/reagent_containers/hypospray/autoinjector // This is an empty variant +/// This is an empty variant +/obj/item/reagent_containers/hypospray/autoinjector name = "empty autoinjector" desc = "A rapid and safe way to inject chemicals into humanoids. This one is empty." icon_state = "autoinjector" @@ -160,13 +161,15 @@ desc = "A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge." list_reagents = list("epinephrine" = 10) -/obj/item/reagent_containers/hypospray/autoinjector/teporone //basilisks +/// basilisks +/obj/item/reagent_containers/hypospray/autoinjector/teporone name = "teporone autoinjector" desc = "A rapid way to regulate your body's temperature in the event of a hardsuit malfunction." icon_state = "lepopen" list_reagents = list("teporone" = 10) -/obj/item/reagent_containers/hypospray/autoinjector/stimpack //goliath kiting +/// goliath kiting +/obj/item/reagent_containers/hypospray/autoinjector/stimpack name = "stimpack autoinjector" desc = "A rapid way to stimulate your body's adrenaline, allowing for freer movement in restrictive armor." icon_state = "stimpen" diff --git a/code/modules/reagents/reagent_containers/iv_bag.dm b/code/modules/reagents/reagent_containers/iv_bag.dm index 0236eb5ed2e..4dcf8ffff9a 100644 --- a/code/modules/reagents/reagent_containers/iv_bag.dm +++ b/code/modules/reagents/reagent_containers/iv_bag.dm @@ -163,7 +163,8 @@ . = ..() name = "[initial(name)] - Saline Glucose" -/obj/item/reagent_containers/iv_bag/blood // Don't use this - just an abstract type to allow blood bags to have a common blood_type var for ease of creation. +/// Don't use this - just an abstract type to allow blood bags to have a common blood_type var for ease of creation. +/obj/item/reagent_containers/iv_bag/blood var/blood_type var/blood_species = "Synthetic humanoid" var/iv_blood_colour = "#A10808" diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 518e1f9a4a4..6a7f760a61e 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -273,8 +273,9 @@ to_chat(user, "You adjust the output switch. You'll now use [amount_per_transfer_from_this] units per spray.") -// Plant-B-Gone -/obj/item/reagent_containers/spray/plantbgone // -- Skie +/// Plant-B-Gone +/// -- Skie +/obj/item/reagent_containers/spray/plantbgone name = "Plant-B-Gone" desc = "Kills those pesky weeds!" icon = 'icons/obj/hydroponics/equipment.dmi' diff --git a/code/modules/recycling/belt-placer.dm b/code/modules/recycling/belt-placer.dm index 1b473bef814..8e1db8b15fc 100644 --- a/code/modules/recycling/belt-placer.dm +++ b/code/modules/recycling/belt-placer.dm @@ -1,4 +1,5 @@ -/obj/item/storage/conveyor //Stores conveyor belts, click floor to make belt, use a conveyor switch on this to link all belts to that lever. +/// Stores conveyor belts, click floor to make belt, use a conveyor switch on this to link all belts to that lever. +/obj/item/storage/conveyor name = "conveyor belt placer" desc = "This device facilitates the rapid deployment of conveyor belts." icon_state = "belt_placer" diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 809cf610e01..aeae9e6daa5 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -29,7 +29,8 @@ other types of metals and chemistry for reagents). */ -/datum/design //Datum for object designs, used in construction +/// Datum for object designs, used in construction +/datum/design var/name = "Name" //Name of the created object. var/desc = "Desc" //Description of the created object. var/id = "id" //ID of the created object for easy refernece. Alphanumeric, lower-case, no symbols diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm index 50e22ec33ca..18468233723 100644 --- a/code/modules/research/research.dm +++ b/code/modules/research/research.dm @@ -44,7 +44,8 @@ research holder datum. ** Includes all the helper procs and basic tech processing. ** ***************************************************************/ -/datum/research //Holder for all the existing, archived, and known tech. Individual to console. +/// Holder for all the existing, archived, and known tech. Individual to console. +/datum/research //Datum/tech go here. // Possible is a list of direct datum references @@ -249,7 +250,8 @@ research holder datum. ** Includes all the various technoliges and what they make. ** ***************************************************************/ -/datum/tech //Datum of individual technologies. +/// Datum of individual technologies. +/datum/tech var/name = "name" //Name of the technology. var/desc = "description" //General description of what it does and what it makes. var/id = "id" //An easily referenced ID. Must be alphanumeric, lower-case, and no symbols. @@ -317,7 +319,8 @@ research holder datum. id = "programming" max_level = 7 -/datum/tech/toxins //not meant to be raised by deconstruction, do not give objects toxins as an origin_tech +/// not meant to be raised by deconstruction, do not give objects toxins as an origin_tech +/datum/tech/toxins name = "Toxins Research" desc = "Research into plasma based explosive devices. Upgrade through testing explosives in the toxins lab." id = "toxins" diff --git a/code/modules/ruins/lavalandruin_code/dead_ratvar.dm b/code/modules/ruins/lavalandruin_code/dead_ratvar.dm index fa9306f5245..35c509798e1 100644 --- a/code/modules/ruins/lavalandruin_code/dead_ratvar.dm +++ b/code/modules/ruins/lavalandruin_code/dead_ratvar.dm @@ -68,7 +68,8 @@ layer = TURF_LAYER plane = FLOOR_PLANE -/obj/effect/clockwork/overlay/floor/bloodcult //this is used by BLOOD CULT, it shouldn't use such a path... +/// this is used by BLOOD CULT, it shouldn't use such a path... +/obj/effect/clockwork/overlay/floor/bloodcult icon_state = "cult" // Wall gears @@ -204,7 +205,8 @@ name = "gear bit" desc = "A broken chunk of a gear. You want it." -/obj/item/clockwork/alloy_shards/medium/gear_bit/large //gives more power +/// gives more power +/obj/item/clockwork/alloy_shards/medium/gear_bit/large /obj/item/clockwork/alloy_shards/medium/gear_bit/large/replace_name_desc() ..() diff --git a/code/modules/ruins/lavalandruin_code/sin_ruins.dm b/code/modules/ruins/lavalandruin_code/sin_ruins.dm index 38fc3e466bd..8d9ed669b8c 100644 --- a/code/modules/ruins/lavalandruin_code/sin_ruins.dm +++ b/code/modules/ruins/lavalandruin_code/sin_ruins.dm @@ -130,7 +130,8 @@ collapse() // Gluttony -/obj/effect/gluttony //Gluttony's wall: Used in the Gluttony ruin. Only lets the overweight through. +/// Gluttony's wall: Used in the Gluttony ruin. Only lets the overweight through. +/obj/effect/gluttony name = "gluttony's wall" desc = "Only those who truly indulge may pass." anchored = TRUE @@ -153,7 +154,8 @@ return FALSE // Pride -/obj/structure/mirror/magic/pride //Pride's mirror: Used in the Pride ruin. +/// Pride's mirror: Used in the Pride ruin. +/obj/structure/mirror/magic/pride name = "pride's mirror" desc = "Pride cometh before the..." icon_state = "magic_mirror" @@ -180,7 +182,8 @@ C.drop(user) // Envy -/obj/item/kitchen/knife/envy //Envy's knife: Found in the Envy ruin. Attackers take on the appearance of whoever they strike. +/// Envy's knife: Found in the Envy ruin. Attackers take on the appearance of whoever they strike. +/obj/item/kitchen/knife/envy name = "envy's knife" desc = "Their success will be yours." icon = 'icons/obj/wizard.dmi' diff --git a/code/modules/space_management/space_transition.dm b/code/modules/space_management/space_transition.dm index 282fa666b99..f6030cfdf5d 100644 --- a/code/modules/space_management/space_transition.dm +++ b/code/modules/space_management/space_transition.dm @@ -82,7 +82,8 @@ return S -/datum/point //this is explicitly utilitarian datum type made specially for the space map generation and are absolutely unusable for anything else +/// this is explicitly utilitarian datum type made specially for the space map generation and are absolutely unusable for anything else +/datum/point var/list/neighbors = list() var/x var/y diff --git a/code/modules/supply/supply_packs/pack_emergency.dm b/code/modules/supply/supply_packs/pack_emergency.dm index 3957f94e939..c34c949986b 100644 --- a/code/modules/supply/supply_packs/pack_emergency.dm +++ b/code/modules/supply/supply_packs/pack_emergency.dm @@ -1,4 +1,5 @@ -/datum/supply_packs/emergency // Section header - use these to set default supply group and crate type for sections +/// Section header - use these to set default supply group and crate type for sections +/datum/supply_packs/emergency name = "HEADER" // Use "HEADER" to denote section headers, this is needed for the supply computers to filter them containertype = /obj/structure/closet/crate/internals group = SUPPLY_EMERGENCY diff --git a/code/modules/supply/supply_packs/pack_engineering.dm b/code/modules/supply/supply_packs/pack_engineering.dm index cd06c41f785..f75fbf64f1e 100644 --- a/code/modules/supply/supply_packs/pack_engineering.dm +++ b/code/modules/supply/supply_packs/pack_engineering.dm @@ -12,7 +12,8 @@ containertype = /obj/structure/largecrate containername = "fuel tank crate" -/datum/supply_packs/engineering/tools //the most robust crate +/// the most robust crate +/datum/supply_packs/engineering/tools name = "Toolbox Crate" contains = list(/obj/item/storage/toolbox/electrical, /obj/item/storage/toolbox/electrical, diff --git a/code/modules/supply/supply_packs/pack_miscellaneous.dm b/code/modules/supply/supply_packs/pack_miscellaneous.dm index 113ab3cbfa7..80dfa802b46 100644 --- a/code/modules/supply/supply_packs/pack_miscellaneous.dm +++ b/code/modules/supply/supply_packs/pack_miscellaneous.dm @@ -405,7 +405,8 @@ cost = 1000 containername = "expensive coat crate" -/datum/supply_packs/misc/formalwear //This is a very classy crate. +/// This is a very classy crate. +/datum/supply_packs/misc/formalwear name = "Formal Wear Crate" contains = list(/obj/item/clothing/under/dress/blacktango, /obj/item/clothing/under/misc/assistantformal, @@ -449,7 +450,8 @@ cost = 400 containername = "wedding crate" -/datum/supply_packs/misc/teamcolors //For team sports like space polo +/// For team sports like space polo +/datum/supply_packs/misc/teamcolors name = "Team Jerseys Crate" // 4 red jerseys, 4 blue jerseys, and 1 baseball contains = list(/obj/item/clothing/under/color/red/jersey, @@ -464,7 +466,8 @@ cost = 300 containername = "team jerseys crate" -/datum/supply_packs/misc/polo //For space polo! Or horsehead Quiditch +/// For space polo! Or horsehead Quiditch +/datum/supply_packs/misc/polo name = "Polo Supply Crate" // 6 brooms, 6 horse masks for the brooms, and 1 beach ball contains = list(/obj/item/staff/broom, @@ -483,7 +486,8 @@ cost = 250 containername = "polo supply crate" -/datum/supply_packs/misc/boxing //For non log spamming cargo brawls! +/// For non log spamming cargo brawls! +/datum/supply_packs/misc/boxing name = "Boxing Supply Crate" // 4 boxing gloves contains = list(/obj/item/clothing/gloves/boxing/blue, diff --git a/code/modules/supply/supply_packs/pack_organic.dm b/code/modules/supply/supply_packs/pack_organic.dm index 2f6158d207b..26940ae3572 100644 --- a/code/modules/supply/supply_packs/pack_organic.dm +++ b/code/modules/supply/supply_packs/pack_organic.dm @@ -37,7 +37,8 @@ cost = 500 containername = "Pizza crate" -/datum/supply_packs/misc/randomised/ingredients // its a bit hacky... +/// its a bit hacky... +/datum/supply_packs/misc/randomised/ingredients num_contained = 25 contains = list(/obj/item/food/snacks/grown/wheat, /obj/item/food/snacks/grown/tomato, @@ -234,7 +235,8 @@ ////// hippy gear -/datum/supply_packs/organic/hydroponics // -- Skie +/// -- Skie +/datum/supply_packs/organic/hydroponics name = "Hydroponics Supply Crate" contains = list(/obj/item/reagent_containers/spray/plantbgone, /obj/item/reagent_containers/spray/plantbgone, diff --git a/code/modules/supply/supply_packs/pack_security.dm b/code/modules/supply/supply_packs/pack_security.dm index ed278f83aaf..152cd90f2ba 100644 --- a/code/modules/supply/supply_packs/pack_security.dm +++ b/code/modules/supply/supply_packs/pack_security.dm @@ -216,7 +216,8 @@ containertype = /obj/structure/closet/crate/secure/plasma containername = "energy gun crate" -/datum/supply_packs/security/armory/epistol // costs 3/5ths of the normal e-guns for 3/4ths the total ammo, making it cheaper to arm more people, but less convient for any one person +/// costs 3/5ths of the normal e-guns for 3/4ths the total ammo, making it cheaper to arm more people, but less convient for any one person +/datum/supply_packs/security/armory/epistol name = "Energy Pistol Crate" contains = list(/obj/item/gun/energy/gun/mini, /obj/item/gun/energy/gun/mini, @@ -330,7 +331,8 @@ cost = 200 containername = "security clothing crate" -/datum/supply_packs/security/officerpack // Starter pack for an officer. Contains everything in a locker but backpack (officer already start with one). Convenient way to equip new officer on highpop. +/// Starter pack for an officer. Contains everything in a locker but backpack (officer already start with one). Convenient way to equip new officer on highpop. +/datum/supply_packs/security/officerpack name = "Officer Starter Pack" contains = list(/obj/item/clothing/suit/armor/vest/security, /obj/item/radio/headset/headset_sec/alt, diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm index 89a19ebcb97..1dad1daa084 100644 --- a/code/modules/surgery/organs/augments_arms.dm +++ b/code/modules/surgery/organs/augments_arms.dm @@ -329,7 +329,8 @@ parent_organ = "l_arm" slot = "l_arm_device" -/obj/item/organ/internal/cyberimp/arm/janitorial/advanced /// ERT implant, i dont overly expect this to get into the hands of crew +/// ERT implant, i dont overly expect this to get into the hands of crew +/obj/item/organ/internal/cyberimp/arm/janitorial/advanced name = "advanced janitorial toolset implant" desc = "A set of advanced janitorial tools hidden behind a concealed panel on the user's arm." contents = newlist(/obj/item/mop/advanced, /obj/item/soap/deluxe, /obj/item/lightreplacer/bluespace, /obj/item/holosign_creator/janitor, /obj/item/melee/flyswatter, /obj/item/reagent_containers/spray/cleaner/advanced) @@ -338,7 +339,8 @@ action_icon_state = list(/datum/action/item_action/organ_action/toggle = "janibelt") emp_proof = TRUE -/obj/item/organ/internal/cyberimp/arm/janitorial/advanced/l /// its for ERT, but still probably a good idea. +/// its for ERT, but still probably a good idea. +/obj/item/organ/internal/cyberimp/arm/janitorial/advanced/l parent_organ = "l_arm" slot = "l_arm_device" diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm index 54a1b020316..e0733411b13 100644 --- a/code/modules/surgery/organs/augments_internal.dm +++ b/code/modules/surgery/organs/augments_internal.dm @@ -240,7 +240,8 @@ REMOVE_TRAIT(M, TRAIT_COMIC_SANS, "augment") return ..() -/obj/item/organ/internal/cyberimp/brain/speech_translator //actual translating done in human/handle_speech_problems +// actual translating done in human/handle_speech_problems +/obj/item/organ/internal/cyberimp/brain/speech_translator name = "Speech translator implant" desc = "While known as a translator, this implant actually generates speech based on the user's thoughts when activated, completely bypassing the need to speak." implant_color = "#C0C0C0" diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index 700232bf3fe..373303286c6 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -211,7 +211,8 @@ #define ONE_SHATTERED 1 #define BOTH_SHATTERED 2 -/obj/item/organ/internal/eyes/cybernetic/eyesofgod //no occuline allowed +// no occuline allowed +/obj/item/organ/internal/eyes/cybernetic/eyesofgod name = "\improper Eyes of the Gods" desc = "Two eyes said to belong to the gods. But such vision comes at a price." icon_state = "eyesofgod" diff --git a/code/modules/surgery/organs/subtypes/diona_organs.dm b/code/modules/surgery/organs/subtypes/diona_organs.dm index f015da30d20..896685a7be5 100644 --- a/code/modules/surgery/organs/subtypes/diona_organs.dm +++ b/code/modules/surgery/organs/subtypes/diona_organs.dm @@ -71,7 +71,8 @@ /obj/item/organ/diona/process() return -/obj/item/organ/internal/heart/diona // Turns into a nymph instantly, no transplanting possible. +/// Turns into a nymph instantly, no transplanting possible. +/obj/item/organ/internal/heart/diona name = "neural strata" icon = 'icons/obj/objects.dmi' icon_state = "nymph" @@ -81,29 +82,34 @@ icon = 'icons/obj/objects.dmi' icon_state = "nymph" -/obj/item/organ/internal/brain/diona // Turns into a nymph instantly, no transplanting possible. +/// Turns into a nymph instantly, no transplanting possible. +/obj/item/organ/internal/brain/diona name = "gas bladder" icon = 'icons/obj/objects.dmi' icon_state = "nymph" -/obj/item/organ/internal/kidneys/diona // Turns into a nymph instantly, no transplanting possible. +/// Turns into a nymph instantly, no transplanting possible. +/obj/item/organ/internal/kidneys/diona name = "polyp segment" icon = 'icons/obj/objects.dmi' icon_state = "nymph" -/obj/item/organ/internal/appendix/diona // Turns into a nymph instantly, no transplanting possible. +/// Turns into a nymph instantly, no transplanting possible. +/obj/item/organ/internal/appendix/diona name = "anchoring ligament" icon = 'icons/obj/objects.dmi' icon_state = "nymph" -/obj/item/organ/internal/eyes/diona // Turns into a nymph instantly, no transplanting possible. +/// Turns into a nymph instantly, no transplanting possible. +/obj/item/organ/internal/eyes/diona name = "receptor node" icon = 'icons/mob/alien.dmi' icon_state = "claw" //TODO:Make absorb rads on insert -/obj/item/organ/internal/liver/diona // Turns into a nymph instantly, no transplanting possible. +/// Turns into a nymph instantly, no transplanting possible. +/obj/item/organ/internal/liver/diona name = "nutrient vessel" icon = 'icons/mob/alien.dmi' icon_state = "claw" diff --git a/code/modules/surgery/organs/subtypes/tajaran_organs.dm b/code/modules/surgery/organs/subtypes/tajaran_organs.dm index 011cdb09c61..055228c7a49 100644 --- a/code/modules/surgery/organs/subtypes/tajaran_organs.dm +++ b/code/modules/surgery/organs/subtypes/tajaran_organs.dm @@ -10,7 +10,8 @@ replace_colours = TRITANOPIA_COLOR_REPLACE see_in_dark = 4 -/obj/item/organ/internal/eyes/tajaran/farwa //Being the lesser form of Tajara, Farwas have an utterly incurable version of their colourblindness. +/// Being the lesser form of Tajara, Farwas have an utterly incurable version of their colourblindness. +/obj/item/organ/internal/eyes/tajaran/farwa name = "farwa eyeballs" colourmatrix = MATRIX_TAJ_CBLIND see_in_dark = 3 diff --git a/code/modules/surgery/organs/subtypes/vulpkanin_organs.dm b/code/modules/surgery/organs/subtypes/vulpkanin_organs.dm index 42a632a37be..326996284c3 100644 --- a/code/modules/surgery/organs/subtypes/vulpkanin_organs.dm +++ b/code/modules/surgery/organs/subtypes/vulpkanin_organs.dm @@ -10,7 +10,8 @@ replace_colours = PROTANOPIA_COLOR_REPLACE see_in_dark = 4 -/obj/item/organ/internal/eyes/vulpkanin/wolpin //Being the lesser form of Vulpkanin, Wolpins have an utterly incurable version of their colourblindness. +/// Being the lesser form of Vulpkanin, Wolpins have an utterly incurable version of their colourblindness. +/obj/item/organ/internal/eyes/vulpkanin/wolpin name = "wolpin eyeballs" colourmatrix = MATRIX_VULP_CBLIND see_in_dark = 3 diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index f07d89797b9..b7b2d0f7419 100644 --- a/code/modules/surgery/organs/vocal_cords.dm +++ b/code/modules/surgery/organs/vocal_cords.dm @@ -35,7 +35,8 @@ GLOBAL_DATUM_INIT(clap_words, /regex, regex("clap|applaud")) GLOBAL_DATUM_INIT(honk_words, /regex, regex("ho+nk")) //hooooooonk GLOBAL_DATUM_INIT(multispin_words, /regex, regex("like a record baby")) -/obj/item/organ/internal/vocal_cords //organs that are activated through speech with the :x channel +/// organs that are activated through speech with the :x channel +/obj/item/organ/internal/vocal_cords name = "vocal cords" icon_state = "appendix" slot = "vocal_cords" diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm index ecf8f7d3424..cc4f1ccea02 100644 --- a/code/modules/surgery/other.dm +++ b/code/modules/surgery/other.dm @@ -173,7 +173,8 @@ ) return SURGERY_STEP_RETRY -/datum/surgery_step/fix_dead_tissue //Debridement +/// Debridement +/datum/surgery_step/fix_dead_tissue name = "remove dead tissue" allowed_tools = list( TOOL_SCALPEL = 100, diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 214350e6326..ce09847c4a8 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -138,14 +138,16 @@ /* * Researchable Scalpels */ -/obj/item/scalpel/laser //parent type +/// parent type +/obj/item/scalpel/laser name = "laser scalpel" desc = "A scalpel augmented with a directed laser." icon_state = "scalpel_laser1_on" damtype = "fire" hitsound = 'sound/weapons/sear.ogg' -/obj/item/scalpel/laser/laser1 //lasers also count as catuarys +/// lasers also count as catuarys +/obj/item/scalpel/laser/laser1 name = "laser scalpel" desc = "A scalpel augmented with a directed laser. This one looks basic and could be improved." icon_state = "scalpel_laser1_on" @@ -163,7 +165,8 @@ icon_state = "scalpel_laser3_on" toolspeed = 0.4 -/obj/item/scalpel/laser/manager //super tool! Retractor/hemostat +/// super tool! Retractor/hemostat +/obj/item/scalpel/laser/manager name = "incision management system" desc = "A true extension of the surgeon's body, this marvel instantly and completely prepares an incision allowing for the immediate commencement of therapeutic steps." icon_state = "scalpel_manager_on"