diff --git a/modular_skyrat/master_files/code/datums/ert.dm b/modular_skyrat/master_files/code/datums/ert.dm index 2dc837353c8..70f155001e1 100644 --- a/modular_skyrat/master_files/code/datums/ert.dm +++ b/modular_skyrat/master_files/code/datums/ert.dm @@ -1,7 +1,8 @@ -//////////////////////////// -/// Use this file to add /// -/// Modular ERT datums /// -//////////////////////////// +/* +* Use this file to add +* Modular ERT datums +*/ + /datum/ert/asset_protection roles = list(/datum/antagonist/ert/asset_protection) leader_role = /datum/antagonist/ert/asset_protection/leader diff --git a/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/kill_pet.dm b/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/kill_pet.dm index 816cc5a22ca..37632da2c06 100644 --- a/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/kill_pet.dm +++ b/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/kill_pet.dm @@ -1,4 +1,3 @@ -//// // This is a modular hook on the kill_pet.dm, the `possible_heads` variable needs to be upkept according to the upstream file, or they will not occur. /datum/traitor_objective/kill_pet possible_heads = list( @@ -18,8 +17,6 @@ // This variable is for the emag E-N objective. The obj details are below the next block var/obj/item/card/emag/one_shot/one_shot_emag - -//// // Objective overwrites /datum/traitor_objective/kill_pet/generate_objective(datum/mind/generating_for, list/possible_duplicates) . = ..() @@ -51,7 +48,6 @@ AddComponent(/datum/component/traitor_objective_register, target_pet, \ succeed_signals = list(COMSIG_ATOM_EMAG_ACT)) -//// // Objective item (for emagging E-N) /obj/item/card/emag/one_shot name = "cryptographic sequencer" @@ -81,8 +77,6 @@ balloon_alert(user, "out of charges!") charges -- - -//// // Handle the UI button, this is currently just generated by a modular objective /datum/traitor_objective/kill_pet/generate_ui_buttons(mob/user) var/list/buttons = list() diff --git a/modular_skyrat/master_files/code/modules/antagonists/wizard/equipment/spellbook.dm b/modular_skyrat/master_files/code/modules/antagonists/wizard/equipment/spellbook.dm index 1a9f139577a..c5e97522312 100644 --- a/modular_skyrat/master_files/code/modules/antagonists/wizard/equipment/spellbook.dm +++ b/modular_skyrat/master_files/code/modules/antagonists/wizard/equipment/spellbook.dm @@ -1,8 +1,6 @@ /* - -// THIS BEGINS OUR G LORIOUS WIZARD MODULAR SPELLBOOK! -// ALL HAIL THE MAGICIANS IN OUR LIFE! - +* THUS BEGINS OUR GLORIOUS WIZARD MODULAR SPELLBOOK! +* ALL HAIL THE MAGICIANS IN OUR LIFE! */ /datum/spellbook_entry/stimpack diff --git a/modular_skyrat/master_files/code/modules/clothing/outfits/ert.dm b/modular_skyrat/master_files/code/modules/clothing/outfits/ert.dm index 408f7533c86..4831913eac2 100644 --- a/modular_skyrat/master_files/code/modules/clothing/outfits/ert.dm +++ b/modular_skyrat/master_files/code/modules/clothing/outfits/ert.dm @@ -1,7 +1,7 @@ -////////////////////////////// -// SKYRAT MODULAR OUTFITS FILE -// PUT ANY NEW ERT OUTFITS HERE -////////////////////////////// +/* +* SKYRAT MODULAR OUTFITS FILE +* PUT ANY NEW ERT OUTFITS HERE +*/ /datum/outfit/centcom/asset_protection name = "Asset Protection" diff --git a/modular_skyrat/master_files/code/modules/clothing/under/jobs/cargo.dm b/modular_skyrat/master_files/code/modules/clothing/under/jobs/cargo.dm index 416c78bcbd8..144ef1d95dd 100644 --- a/modular_skyrat/master_files/code/modules/clothing/under/jobs/cargo.dm +++ b/modular_skyrat/master_files/code/modules/clothing/under/jobs/cargo.dm @@ -11,8 +11,10 @@ // Add a /obj/item/clothing/under/rank/cargo/miner/skyrat if you add miner uniforms -//////////////////////////////////////// -////////////// CARGO TECH ////////////// +/* +* CARGO TECH +*/ + /obj/item/clothing/under/rank/cargo/tech/skyrat/utility icon = 'modular_skyrat/master_files/icons/obj/clothing/under/cargo.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/cargo.dmi' @@ -61,8 +63,9 @@ icon_state = "cargotechjean" can_adjust = FALSE -///////////////////////////////////////// -///////////// QUARTERMASTER ///////////// +/* +* QUARTERMASTER +*/ /obj/item/clothing/under/rank/cargo/qm/skyrat/gorka name = "quartermaster's gorka" diff --git a/modular_skyrat/master_files/code/modules/clothing/under/jobs/engineering.dm b/modular_skyrat/master_files/code/modules/clothing/under/jobs/engineering.dm index 0fd5599aba6..2af4ffcd69f 100644 --- a/modular_skyrat/master_files/code/modules/clothing/under/jobs/engineering.dm +++ b/modular_skyrat/master_files/code/modules/clothing/under/jobs/engineering.dm @@ -7,8 +7,9 @@ // Add a /obj/item/clothing/under/rank/engineering/chief_engineer/skyrat or /obj/item/clothing/under/rank/engineering/atmospheric_technician/skyrat if you add uniforms for either -////////////////////////////////////// -////////////// ENGINEER ////////////// +/* +* ENGINEER +*/ /obj/item/clothing/under/rank/engineering/engineer/skyrat/utility name = "engineering utility uniform" diff --git a/modular_skyrat/master_files/code/modules/clothing/under/jobs/rnd.dm b/modular_skyrat/master_files/code/modules/clothing/under/jobs/rnd.dm index e3038bf4c0e..651ce5c9e2b 100644 --- a/modular_skyrat/master_files/code/modules/clothing/under/jobs/rnd.dm +++ b/modular_skyrat/master_files/code/modules/clothing/under/jobs/rnd.dm @@ -15,8 +15,9 @@ // Add a 'rnd/geneticist/skyrat' if you make Geneticist uniforms -/////////////////////////////////////// -////////////// SCIENTIST ////////////// +/* +* SCIENTIST +*/ /obj/item/clothing/under/rank/rnd/scientist/skyrat/utility name = "science utility uniform" @@ -35,8 +36,9 @@ icon_state = "hl_scientist" can_adjust = FALSE -//////////////////////////////////////// -////////////// ROBOTICIST ////////////// +/* +* ROBOTICIST +*/ /obj/item/clothing/under/rank/rnd/roboticist/skyrat/sleek name = "sleek roboticst jumpsuit" @@ -44,8 +46,9 @@ icon_state = "robosleek" can_adjust = FALSE -////////////////////////////////////// -////////////// DIRECTOR ////////////// +/* +* RESEARCH DIRECTOR +*/ /obj/item/clothing/under/rank/rnd/research_director/skyrat/jumpsuit name = "research director's jumpsuit" @@ -63,10 +66,10 @@ female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON - -/////////////////////////////////////// -////////////// OVERRIDES ////////////// -// Remind Orion to look over these when TG finishes their science resprites +/* +* OVERRIDES +* Remind Orion to look over these when TG finishes their science resprites +*/ /obj/item/clothing/under/rank/rnd/scientist icon = 'modular_skyrat/master_files/icons/obj/clothing/under/rnd.dmi' diff --git a/modular_skyrat/master_files/code/modules/mob/living/human/species.dm b/modular_skyrat/master_files/code/modules/mob/living/human/species.dm index 486f5c3a3c6..57a617f80b4 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/human/species.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/human/species.dm @@ -1,5 +1,8 @@ -/// Returns a list of strings representing features this species has. -/// Used by the preferences UI to know what buttons to show. +/** + * Returns a list of strings representing features this species has. + * + * Used by the preferences UI to know what buttons to show. + */ /datum/species/proc/get_features() var/cached_features = GLOB.features_by_species[type] if (!isnull(cached_features)) diff --git a/modular_skyrat/master_files/code/modules/mob/living/sillicon/robot.dm b/modular_skyrat/master_files/code/modules/mob/living/sillicon/robot.dm index 59461cbf4ec..407ebb90d64 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/sillicon/robot.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/sillicon/robot.dm @@ -1,4 +1,3 @@ -//// // Typing indicator icon change /mob/living/silicon/robot/set_typing_indicator(state, emote) var/static/mutable_appearance/type_indicator = mutable_appearance('modular_skyrat/modules/indicators/icons/typing_indicator.dmi', "borg0", CHAT_INDICATOR_LAYER) @@ -19,8 +18,6 @@ else regenerate_icons() - -//// // Smoke particle effect for heavy-duty cyborgs /datum/component/robot_smoke @@ -117,8 +114,6 @@ pixel_y = -8 layer = ABOVE_MOB_LAYER - -//// // Modular solution for alternative tipping visuals /datum/component/tippable/set_tipped_status(mob/living/tipped_mob, new_status = FALSE) var/mob/living/silicon/robot/robot = tipped_mob diff --git a/modular_skyrat/master_files/code/modules/spells/wizard.dm b/modular_skyrat/master_files/code/modules/spells/wizard.dm index 2bf98930696..971317b8e83 100644 --- a/modular_skyrat/master_files/code/modules/spells/wizard.dm +++ b/modular_skyrat/master_files/code/modules/spells/wizard.dm @@ -1,6 +1,6 @@ /* -// AND SO BEGINS THE GLORIOUS MODULAR SPELL ADDITION SPOT. -// PUT ALL NEWLY CREATED WIZARD SPELLS HERE! +* AND SO BEGINS THE GLORIOUS MODULAR SPELL ADDITION SPOT. +* PUT ALL NEWLY CREATED WIZARD SPELLS HERE! */ /obj/effect/proc_holder/spell/targeted/stimpack diff --git a/modular_skyrat/master_files/code/modules/uplink/uplink_items.dm b/modular_skyrat/master_files/code/modules/uplink/uplink_items.dm index 156ae38b312..87ab18d0ad7 100644 --- a/modular_skyrat/master_files/code/modules/uplink/uplink_items.dm +++ b/modular_skyrat/master_files/code/modules/uplink/uplink_items.dm @@ -1,6 +1,6 @@ -///////////////////////////// -// SKYRAT MODULAR UPLINK ITEMS -///////////////////////////// +/* +* MODULAR UPLINK ITEMS +*/ // Place any new uplink items in this file, and explain what they do @@ -11,6 +11,7 @@ item = /obj/item/storage/box/syndie_kit/spaceassassin cost = 30 // 40 tc would have been better */ // To be balanced + // DANGEROUS /datum/uplink_item/dangerous/aps_traitor name = "Stechkin APS Machine Pistol" diff --git a/modular_skyrat/modules/ERT_Factions/FTU/code/items.dm b/modular_skyrat/modules/ERT_Factions/FTU/code/items.dm index 94147d22130..a62f562fd5b 100644 --- a/modular_skyrat/modules/ERT_Factions/FTU/code/items.dm +++ b/modular_skyrat/modules/ERT_Factions/FTU/code/items.dm @@ -34,7 +34,7 @@ w_class_on = active_w_class) RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) -///////40x32 R37 PULSE RIFLE +// 40x32 R37 PULSE RIFLE /obj/item/gun/ballistic/automatic/pitbull/pulse/r37 name = "\improper Xan-Jing R37 'Killer Hornet' pulse rifle" desc = "A Xan-Jing Armories pulse rifle, nicknamed 'Killer Hornet' by FTU Mercenaries and Expeditioners. This one has an integrated computer that displays an objective compass, ammo counter and comes with a HUD link for easy targetting." @@ -71,7 +71,7 @@ max_ammo = 36 -///////40x32 R40 MACHINE GUN +// 40x32 R40 MACHINE GUN /obj/item/gun/ballistic/automatic/pitbull/pulse/r40 name = "\improper Xan-Jing R40 'Enforcer' pulse MMG" desc = "A Xan-Jing Armories medium machine gun, nicknamed 'Enforcer' by FTU Mercenaries and Private Militaries. This one has a custom wood furnishing and its batteries power up the sights." @@ -107,7 +107,7 @@ caliber = "7.2mm" max_ammo = 140 -//////////12.7 SAPHE GOLDEN EAGLE +// 12.7 SAPHE GOLDEN EAGLE /obj/item/gun/ballistic/automatic/pistol/pdh/pulse/golden_eagle name = "\improper FTU PDH-6G 'Sea Serpent' magnum" desc = "A custom-made high-power combat pistol seen in the hands of high ranking FTU Mercenaries and important executives, with a custom 24-karat gold finish and green laser sight. It has a chinese dragon engraved along its slide." diff --git a/modular_skyrat/modules/SiliconQoL/code/_onclick.dm b/modular_skyrat/modules/SiliconQoL/code/_onclick.dm index c7c6aa89360..9589c8d40ab 100644 --- a/modular_skyrat/modules/SiliconQoL/code/_onclick.dm +++ b/modular_skyrat/modules/SiliconQoL/code/_onclick.dm @@ -1,8 +1,9 @@ -///////////////////// -/////AI Changes////// -///////////////////// +/* +* AI CHANGES +*/ + /mob/living/silicon/ai/CtrlShiftClickOn(atom/A) - if(isturf(A)) + if(isturf(A)) var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in A if(airlock) airlock.AICtrlShiftClick(src) @@ -10,7 +11,7 @@ A.AICtrlShiftClick(src) // End of skyrat edit /mob/living/silicon/ai/ShiftClickOn(atom/A) - if(isturf(A)) + if(isturf(A)) var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in A if(airlock) airlock.AIShiftClick(src) @@ -19,7 +20,7 @@ A.AIExamine(A) /mob/living/silicon/ai/CtrlClickOn(atom/A) - if(isturf(A)) + if(isturf(A)) var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in A if(airlock) airlock.AICtrlClick(src) @@ -27,7 +28,7 @@ A.AICtrlClick(src) /mob/living/silicon/ai/AltClickOn(atom/A) - if(isturf(A)) + if(isturf(A)) var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in A if(airlock) airlock.AIAltClick(src) @@ -40,7 +41,7 @@ // Should keep all AI Examines in here in a list. /obj/machinery/door/airlock/AIExamine() // Lets not spam the AI with door examinations return - + /mob/living/silicon/ai/ClickOn(atom/A, params) ..() var/list/modifiers = params2list(params) @@ -48,25 +49,26 @@ var/obj/machinery/door/firedoor/TheDoor = locate(/obj/machinery/door/firedoor) in A if(TheDoor) TheDoor.attack_ai(usr) - -///////////////////////// -/////Cyborg changes////// -///////////////////////// + +/* +* CYBORG CHANGES +*/ + /mob/living/silicon/robot/CtrlShiftClickOn(atom/A) - if(isturf(A)) + if(isturf(A)) var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in A // Skyrat edit if(airlock) airlock.BorgCtrlShiftClick(src) else - A.BorgCtrlShiftClick(src) + A.BorgCtrlShiftClick(src) /mob/living/silicon/robot/ShiftClickOn(atom/A) - if(isturf(A)) + if(isturf(A)) var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in A // Skyrat edit if(airlock) airlock.BorgShiftClick(src) else - A.BorgShiftClick(src) + A.BorgShiftClick(src) /mob/living/silicon/robot/CtrlClickOn(atom/A) if(isturf(A)) @@ -77,9 +79,9 @@ A.BorgCtrlClick(src) // End of skyrat edit /mob/living/silicon/robot/AltClickOn(atom/A) - if(isturf(A)) + if(isturf(A)) var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in A // Skyrat edit if(airlock) airlock.BorgAltClick(src) else - A.BorgAltClick(src) + A.BorgAltClick(src) diff --git a/modular_skyrat/modules/advanced_shuttles/code/shuttles.dm b/modular_skyrat/modules/advanced_shuttles/code/shuttles.dm index f1c37c1ba6b..76454e2411e 100644 --- a/modular_skyrat/modules/advanced_shuttles/code/shuttles.dm +++ b/modular_skyrat/modules/advanced_shuttles/code/shuttles.dm @@ -32,7 +32,10 @@ desc = "Use this if your friends left you behind." possible_destinations = "arrivals_stationary;arrivals_shuttle" -///////////////////////////////////////////// Map Templates ////////////////////////////////////////////////////////// +/* +* MAP TEMPLATES +*/ + /datum/map_template/shuttle/ferry name = "NAV Monarch (Ferry)" prefix = "_maps/shuttles/skyrat/" diff --git a/modular_skyrat/modules/advanced_shuttles/code/turfs.dm b/modular_skyrat/modules/advanced_shuttles/code/turfs.dm index e2859ff6ca6..378a1799cce 100644 --- a/modular_skyrat/modules/advanced_shuttles/code/turfs.dm +++ b/modular_skyrat/modules/advanced_shuttles/code/turfs.dm @@ -39,7 +39,10 @@ /turf/closed/wall/mineral/titanium/shuttle_wall/window opacity = FALSE -///////////////////////////////////////////// POD ////////////////////////////////////////////////////////// +/* +* POD +*/ + /turf/closed/wall/mineral/titanium/shuttle_wall/pod icon = 'modular_skyrat/modules/advanced_shuttles/icons/pod.dmi' @@ -47,7 +50,10 @@ icon = 'modular_skyrat/modules/advanced_shuttles/icons/pod.dmi' icon_state = "3,1" -///////////////////////////////////////////// FERRY ////////////////////////////////////////////////////////// +/* +* FERRY +*/ + /turf/closed/wall/mineral/titanium/shuttle_wall/ferry icon = 'modular_skyrat/modules/advanced_shuttles/icons/erokez.dmi' icon_state = "18,2" @@ -61,7 +67,10 @@ icon = 'modular_skyrat/modules/advanced_shuttles/icons/erokez.dmi' icon_state = "floor1" -///////////////////////////////////////////// EVAC ////////////////////////////////////////////////////////// +/* +* EVAC +*/ + /turf/closed/wall/mineral/titanium/shuttle_wall/evac icon = 'modular_skyrat/modules/advanced_shuttles/icons/evac_shuttle.dmi' icon_state = "9,1" @@ -75,7 +84,10 @@ icon = 'modular_skyrat/modules/advanced_shuttles/icons/evac_shuttle.dmi' icon_state = "floor" -///////////////////////////////////////////// ARRIVALS ////////////////////////////////////////////////////////// +/* +* ARRIVALS +*/ + /turf/closed/wall/mineral/titanium/shuttle_wall/arrivals icon = 'modular_skyrat/modules/advanced_shuttles/icons/wagon.dmi' icon_state = "3,1" @@ -89,7 +101,10 @@ icon = 'modular_skyrat/modules/advanced_shuttles/icons/wagon.dmi' icon_state = "floor" -///////////////////////////////////////////// CARGO ////////////////////////////////////////////////////////// +/* +* CARGO +*/ + /turf/closed/wall/mineral/titanium/shuttle_wall/cargo icon = 'modular_skyrat/modules/advanced_shuttles/icons/cargo.dmi' icon_state = "3,1" @@ -103,7 +118,10 @@ icon = 'modular_skyrat/modules/advanced_shuttles/icons/cargo.dmi' icon_state = "floor" -///////////////////////////////////////////// MINING ////////////////////////////////////////////////////////// +/* +* MINING +*/ + /turf/closed/wall/mineral/titanium/shuttle_wall/mining icon = 'modular_skyrat/modules/advanced_shuttles/icons/mining.dmi' @@ -130,9 +148,10 @@ icon_state = "4,4" dir = NORTH -////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////// MINING/RND/EXPLORATION FLOORS ////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/* +* MINING/RND/EXPLORATION FLOORS +*/ + /turf/open/floor/iron/shuttle/exploration name = "shuttle floor" icon = 'modular_skyrat/modules/advanced_shuttles/icons/exploration_floor.dmi' diff --git a/modular_skyrat/modules/aesthetics/clothing/clothing.dm b/modular_skyrat/modules/aesthetics/clothing/clothing.dm index 4de9aaec66a..592c794b033 100644 --- a/modular_skyrat/modules/aesthetics/clothing/clothing.dm +++ b/modular_skyrat/modules/aesthetics/clothing/clothing.dm @@ -1,6 +1,6 @@ - -///////////////////////////////////////////////////////////////////////SHOES -///////////////////////////////////////////////////////////////////////UNIFORMS +/* +* UNIFORMS +*/ /obj/item/clothing/under/rank/civilian/chef/skirt worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' @@ -29,7 +29,10 @@ /obj/item/clothing/under/rank/rnd worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' -///////////////////////////////////////////////////////////////////////SUITS + +/* +* SUITS +*/ /obj/item/clothing/suit/bio_suit/general worn_icon = 'modular_skyrat/modules/aesthetics/clothing/suit.dmi' @@ -92,7 +95,9 @@ armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 80, FIRE = 80, ACID = 70) supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -///////////////////////////////////////////////////////////////////////HEAD +/* +* HEAD +*/ /obj/item/clothing/head/bio_hood/general worn_icon = 'modular_skyrat/modules/aesthetics/clothing/head.dmi' @@ -115,7 +120,10 @@ /obj/item/clothing/head/weddingveil worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi' -///////////////////////////////////////////////////////////////////////TURTLENECKS +/* +* TURTLENECKS +*/ + /obj/item/clothing/under/syndicate worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' diff --git a/modular_skyrat/modules/armaments/code/armament_entries.dm b/modular_skyrat/modules/armaments/code/armament_entries.dm index 3764443eddd..067bd2c667b 100644 --- a/modular_skyrat/modules/armaments/code/armament_entries.dm +++ b/modular_skyrat/modules/armaments/code/armament_entries.dm @@ -70,9 +70,10 @@ GLOBAL_LIST_INIT(armament_entries, build_armament_list()) armament_dataset[ARMAMENT_CATEGORY_STANDARD][CATEGORY_ENTRY][ARMAMENT_SUBCATEGORY_NONE] += spawned_armament_entry return armament_dataset -////////////////////// -// ARMAMENT ENTRIES // -////////////////////// +/* +* ARMAMENT ENTRIES +*/ + /datum/armament_entry /// The name of the equipment used in the listing, if not set, it will use the items name. var/name diff --git a/modular_skyrat/modules/assault_operatives/code/dynamic_rulsesets_roundstart.dm b/modular_skyrat/modules/assault_operatives/code/dynamic_rulsesets_roundstart.dm index 4963b51d842..83db1e6cf6d 100644 --- a/modular_skyrat/modules/assault_operatives/code/dynamic_rulsesets_roundstart.dm +++ b/modular_skyrat/modules/assault_operatives/code/dynamic_rulsesets_roundstart.dm @@ -1,8 +1,6 @@ -////////////////////////////////////////////// -// // -// ASSAULT OPERATIVES // -// // -////////////////////////////////////////////// +/* +* ASSAULT OPERATIVES +*/ #define ASSAULT_OPERATIVES_COUNT 6 diff --git a/modular_skyrat/modules/awaymissions_skyrat/code/mothership_astrum.dm b/modular_skyrat/modules/awaymissions_skyrat/code/mothership_astrum.dm index 246df9fb029..a738e1e087a 100644 --- a/modular_skyrat/modules/awaymissions_skyrat/code/mothership_astrum.dm +++ b/modular_skyrat/modules/awaymissions_skyrat/code/mothership_astrum.dm @@ -1,4 +1,9 @@ -///// AREAS, None of these should need power or lighting. I'd sooner die than hand-light this entire map +/* +* AREAS +* None of these should need power or lighting +* I'd sooner die than hand-light this entire map +*/ + /area/awaymission/mothership_astrum/halls name = "Mothership Astrum Hallways" icon_state = "away1" @@ -84,8 +89,14 @@ /obj/item/paper/fluff/awaymissions/astrum5/AltClick() return //no folding these -//Simplemobs -//MELEE +/* +* SIMPLEMOBS +*/ + +/* +* MELEE +*/ + /mob/living/simple_animal/hostile/abductor name = "Abductor Scientist" desc = "From the depths of space." @@ -142,7 +153,10 @@ health = 160 loot = list(/obj/effect/gibspawner/generic, /obj/effect/spawner/random/astrum/agentloot) -//RANGED +/* +* RANGED +*/ + /mob/living/simple_animal/hostile/abductor/ranged name = "Abductor Scientist" ranged = 1 @@ -164,7 +178,10 @@ health = 140 loot = list(/obj/effect/gibspawner/generic, /obj/effect/spawner/random/astrum/agentloot) -//GHOSTROLES +/* +* GHOST ROLES +*/ + /obj/effect/mob_spawn/ghost_role/human/lobotomite name = "lobotomite containment tube" prompt_name = "a lobotomite" @@ -189,8 +206,9 @@ mask = /obj/item/clothing/mask/breath/medical back = /obj/item/tank/internals/anesthetic -//LOOT - +/* +* LOOT +*/ /obj/effect/spawner/random/astrum name = "astrum low" @@ -293,7 +311,10 @@ armor = list(MELEE = 40, BULLET = 30, LASER = 30,ENERGY = 40, BOMB = 50, BIO = 90, FIRE = 100, ACID = 100, WOUND = 15) resistance_flags = FIRE_PROOF | ACID_PROOF -//Boss +/* +* BOSS +*/ + /mob/living/simple_animal/hostile/megafauna/hierophant/astrum name = "Abductor Captain" desc = "The one you've come here for, finish this." diff --git a/modular_skyrat/modules/barsigns/code/barsigns.dm b/modular_skyrat/modules/barsigns/code/barsigns.dm index e0c7c71a286..4e10e4fe551 100644 --- a/modular_skyrat/modules/barsigns/code/barsigns.dm +++ b/modular_skyrat/modules/barsigns/code/barsigns.dm @@ -10,10 +10,6 @@ name = "Club Bee" icon = "clubee" -// datum/barsign/cybersylph -// name = "Cyber Sylph's" -// icon = "cybersylph" - /datum/barsign/thesun name = "The Sun" icon = "thesun" diff --git a/modular_skyrat/modules/black_mesa/code/mobs/human_mobs.dm b/modular_skyrat/modules/black_mesa/code/mobs/human_mobs.dm index 836dce4adde..1e79e10f0b8 100644 --- a/modular_skyrat/modules/black_mesa/code/mobs/human_mobs.dm +++ b/modular_skyrat/modules/black_mesa/code/mobs/human_mobs.dm @@ -1,4 +1,7 @@ -///////////////////HECU +/* +* HECU +*/ + /mob/living/simple_animal/hostile/blackmesa/hecu name = "HECU Grunt" desc = "I didn't sign on for this shit. Monsters, sure, but civilians? Who ordered this operation anyway?" diff --git a/modular_skyrat/modules/bsa_overhaul/code/bsa_cannon.dm b/modular_skyrat/modules/bsa_overhaul/code/bsa_cannon.dm index 003b23595e6..1d6bbc75dca 100644 --- a/modular_skyrat/modules/bsa_overhaul/code/bsa_cannon.dm +++ b/modular_skyrat/modules/bsa_overhaul/code/bsa_cannon.dm @@ -1,7 +1,9 @@ -// Crew has to build a bluespace cannon -// Cargo orders part for high price -// Requires high amount of power -// Requires high level stock parts +/* +* Crew has to build a bluespace cannon +* Cargo orders part for high price +* Requires high amount of power +* Requires high level stock parts +*/ #define SYSTEM_OFFLINE "SYSTEM OFFLINE" #define SYSTEM_READY "SYSTEM READY" diff --git a/modular_skyrat/modules/cargo/code/goodies.dm b/modular_skyrat/modules/cargo/code/goodies.dm index 41244f198d3..bef600d36b3 100644 --- a/modular_skyrat/modules/cargo/code/goodies.dm +++ b/modular_skyrat/modules/cargo/code/goodies.dm @@ -1,6 +1,6 @@ -////////////////////////////////////////////////////////////////////////////// -//////////////////////// Emergency Race Stuff //////////////////////////////// -////////////////////////////////////////////////////////////////////////////// +/* +* EMERGENCY RACIAL EQUIPMENT +*/ /datum/supply_pack/goody/airsuppliesnitrogen name = "Emergency Air Supplies (Nitrogen)" @@ -23,9 +23,9 @@ contains = list(/obj/item/tank/internals/plasmaman/belt, /obj/item/clothing/mask/breath) -////////////////////////////////////////////////////////////////////////////// -///////////////////////////// Misc Stuff ///////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// +/* +* MISC +*/ /datum/supply_pack/goody/crayons name = "Box of Crayons" @@ -46,9 +46,9 @@ cost = PAYCHECK_CREW * 4 contains = list(/obj/item/paper_bin) -////////////////////////////////////////////////////////////////////////////// -//////////////////////////// Weapons or Ammo ///////////////////////////////// -////////////////////////////////////////////////////////////////////////////// +/* +* WEAPONS / AMMO +*/ /datum/supply_pack/goody/gunmaint name = "Gun Maintenance Kits" @@ -63,9 +63,9 @@ cost = PAYCHECK_CREW * 30 contains = list(/obj/item/storage/belt/sabre/cargo) -////////////////////////////////////////////////////////////////////////////// -//////////////////////////// Carpet Packs //////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// +/* +* CARPET PACKS +*/ /datum/supply_pack/goody/carpet name = "Classic Carpet Single-Pack" diff --git a/modular_skyrat/modules/cargo/code/packs.dm b/modular_skyrat/modules/cargo/code/packs.dm index b32039aa882..c59c16e0dce 100644 --- a/modular_skyrat/modules/cargo/code/packs.dm +++ b/modular_skyrat/modules/cargo/code/packs.dm @@ -1,8 +1,8 @@ /// Cost of the crate. DO NOT GO ANY LOWER THAN X1.4 the "CARGO_CRATE_VALUE" value if using regular crates, or infinite profit will be possible! -////////////////////////////////////////////////////////////////////////////// -//////////////////////////////// Livestock /////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// +/* +* LIVESTOCK +*/ /datum/supply_pack/critter/doublecrab name = "Crab Crate" @@ -24,9 +24,9 @@ for(var/i in 1 to 5) new /mob/living/simple_animal/mouse(.) -////////////////////////////////////////////////////////////////////////////// -//////////////////////////////// Medical ///////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// +/* +* MEDICAL +*/ /datum/supply_pack/medical/anesthetics name = "Anesthetics Crate" @@ -107,9 +107,9 @@ /obj/item/weaponcell/medical/toxin) crate_name = "medicell replacement crate" -////////////////////////////////////////////////////////////////////////////// -//////////////////////////// Security //////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// +/* +* SECURITY +*/ /datum/supply_pack/security/MODsuit_security name = "Security MODsuit Crate" @@ -137,10 +137,9 @@ /obj/item/storage/barricade,) crate_name = "C.U.C.K.S Crate" - -////////////////////////////////////////////////////////////////////////////// -///////////////////////////// Engineering //////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// +/* +* ENGINEERING +*/ /datum/supply_pack/engineering/industrial_rcd name = "Industrial RCD Crate" @@ -210,9 +209,9 @@ crate_name = "engineering inducer crate" crate_type = /obj/structure/closet/crate/engineering/electrical -////////////////////////////////////////////////////////////////////////////// -//////////////////////////// Misc Crates ///////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// +/* +* MISC +*/ /datum/supply_pack/misc/medibeam //Moved to Misc so Medical can't order them for free through department consoles and break the economy. name = "Medical Beam Gun" @@ -296,9 +295,9 @@ crate_name = "snowmobile kit" crate_type = /obj/structure/closet/crate/large -////////////////////////////////////////////////////////////////////////////// -//////////////////////////// Food Stuff ////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// +/* +* FOOD +*/ /datum/supply_pack/organic/combomeal name = "Burger Combo Crate" @@ -451,9 +450,9 @@ crate_name = "bulk lizard pack" crate_type = /obj/structure/closet/crate/freezer -////////////////////////////////////////////////////////////////////////////// -//////////////////////////// Pack Type /////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// +/* +* PACK TYPE +*/ /datum/supply_pack/service/buildabar name = "Build a Bar Crate" @@ -581,9 +580,9 @@ contains = list(/obj/item/mod/control/pre_equipped/loader) crate_name = "cargo MODsuit crate" -////////////////////////////////////////////////////////////////////////////// -//////////////////////////// Materials & Sheets ////////////////////////////// -////////////////////////////////////////////////////////////////////////////// +/* +* MATERIALS AND SHEETS +*/ /datum/supply_pack/materials/rawlumber name = "20 Towercap Logs" diff --git a/modular_skyrat/modules/cell_component/code/cell_component.dm b/modular_skyrat/modules/cell_component/code/cell_component.dm index 189edf7ab5c..09e3c9c4851 100644 --- a/modular_skyrat/modules/cell_component/code/cell_component.dm +++ b/modular_skyrat/modules/cell_component/code/cell_component.dm @@ -95,8 +95,15 @@ component_cell_out_of_charge/component_cell_removed proc using loc where necessa inserted_cell = null return ..() -/// This proc is the basic way of processing the cell, with included feedback. It will return a bitflag if it failed to use the power, or COMPONENT_POWER_SUCCESS if it succeeds. -/// The user is sent the feedback, use_amount is an override, check_only will only return if it can use the cell and feedback relating to that. +/** + * The basic way of processing the cell, with included feedback. + * + * This proc is the basic way of processing the cell, with included feedback. + * It will return a bitflag if it failed to use the power, or COMPONENT_POWER_SUCCESS if it succeeds. + * Arguments: + * * use_amount - an override + * * check_only - will only return if it can use the cell and feedback relating to that including any relevant detail + */ /datum/component/cell/proc/simple_power_use(datum/source, use_amount, mob/user, check_only) SIGNAL_HANDLER diff --git a/modular_skyrat/modules/cellguns/code/medigun_cells.dm b/modular_skyrat/modules/cellguns/code/medigun_cells.dm index 490fa0d1f25..4171cc3c3d0 100644 --- a/modular_skyrat/modules/cellguns/code/medigun_cells.dm +++ b/modular_skyrat/modules/cellguns/code/medigun_cells.dm @@ -27,7 +27,10 @@ target.adjustOxyLoss(-amount_healed) -//PROCS// +/* +* PROCS +*/ + /// Applies digust by damage thresholds. /obj/projectile/energy/medical/proc/DamageDisgust(mob/living/target, type_damage) if(type_damage >= 100) @@ -121,8 +124,15 @@ target.adjustToxLoss(-(amount_healed * healing_multiplier)) -//T1 Healing Projectiles// -//The Basic Brute Heal Projectile// +/* +* HEALING PROJECTILES +*/ + +/* +* TIER ONE +*/ + +//The Basic Brute Heal Projectile /obj/item/ammo_casing/energy/medical/brute1 projectile_type = /obj/projectile/energy/medical/brute select_name = "brute" @@ -198,8 +208,11 @@ . = ..() safeBurn(target, amount_healed, base_disgust) -//T2 Healing Projectiles// -//Tier II Brute Projectile// +/* +* TIER TWO +*/ + +//Tier II Brute Projectile /obj/item/ammo_casing/energy/medical/brute2 projectile_type = /obj/projectile/energy/medical/brute/better select_name = "brute II" @@ -212,7 +225,7 @@ max_clone = 1/3 base_disgust = 2 -//Tier II Burn Projectile// +//Tier II Burn Projectile /obj/item/ammo_casing/energy/medical/burn2 projectile_type = /obj/projectile/energy/medical/burn/better select_name = "burn II" @@ -225,7 +238,7 @@ max_clone = 1/3 base_disgust = 2 -//Tier II Oxy Projectile// +//Tier II Oxy Projectile /obj/item/ammo_casing/energy/medical/oxy2 projectile_type = /obj/projectile/energy/medical/oxygen/better select_name = "oxygen II" @@ -236,7 +249,7 @@ pass_flags = UPGRADED_MEDICELL_PASSFLAGS amount_healed = 20 -//Tier II Toxin Projectile// +//Tier II Toxin Projectile /obj/item/ammo_casing/energy/medical/toxin2 projectile_type = /obj/projectile/energy/medical/toxin/better select_name = "toxin II" @@ -266,8 +279,12 @@ amount_healed = 11.25 base_disgust = 2 -//T3 Healing Projectiles// -//Tier III Brute Projectile// + +/* +* TIER THREE +*/ + +//Tier III Brute Projectile /obj/item/ammo_casing/energy/medical/brute3 projectile_type = /obj/projectile/energy/medical/brute/better/best select_name = "brute III" @@ -279,7 +296,7 @@ max_clone = 1/9 base_disgust = 1 -//Tier III Burn Projectile// +//Tier III Burn Projectile /obj/item/ammo_casing/energy/medical/burn3 projectile_type = /obj/projectile/energy/medical/burn/better/best select_name = "burn III" @@ -291,7 +308,7 @@ max_clone = 1/9 base_disgust = 1 -//Tier III Oxy Projectile// +//Tier III Oxy Projectile /obj/item/ammo_casing/energy/medical/oxy3 projectile_type = /obj/projectile/energy/medical/oxygen/better/best select_name = "oxygen III" @@ -301,7 +318,7 @@ name = "powerful oxygen heal shot" amount_healed = 30 -//Tier III Toxin Projectile// +//Tier III Toxin Projectile /obj/item/ammo_casing/energy/medical/toxin3 projectile_type = /obj/projectile/energy/medical/toxin/better/best select_name = "toxin III" @@ -332,15 +349,16 @@ amount_healed = 15 base_disgust = 1 -//End of Basic Tiers of cells. +/* +* UTILITY CELLS +*/ -//Utility Cells //Utility basis /obj/projectile/energy/medical/utility name = "utility medical shot" pass_flags = UPGRADED_MEDICELL_PASSFLAGS -//CLotting +//Clotting /obj/item/ammo_casing/energy/medical/utility/clotting projectile_type = /obj/projectile/energy/medical/utility/clotting select_name = "clotting" diff --git a/modular_skyrat/modules/central_command_module/code/obj/wall.dm b/modular_skyrat/modules/central_command_module/code/obj/wall.dm index b29bff28211..5657c55747b 100644 --- a/modular_skyrat/modules/central_command_module/code/obj/wall.dm +++ b/modular_skyrat/modules/central_command_module/code/obj/wall.dm @@ -1,4 +1,6 @@ -/////////////////////////////////////////////NCV Titan////////////////////////////////////////////////////////// +/* +* NCV TITAN +*/ /turf/closed/indestructible/titanium name = "wall" diff --git a/modular_skyrat/modules/cme/code/_cme_defines.dm b/modular_skyrat/modules/cme/code/_cme_defines.dm index 22f60fd4852..732a2f99392 100644 --- a/modular_skyrat/modules/cme/code/_cme_defines.dm +++ b/modular_skyrat/modules/cme/code/_cme_defines.dm @@ -1,6 +1,6 @@ -//////////////////////// -//CME DEFINES FILE! -/////////////////////// +/* +* CME DEFINES +*/ GLOBAL_LIST_INIT(cme_loot_list, list( /obj/item/raw_anomaly_core/random = 30, diff --git a/modular_skyrat/modules/cme/code/cme.dm b/modular_skyrat/modules/cme/code/cme.dm index 62b0328f836..765c5d4653a 100644 --- a/modular_skyrat/modules/cme/code/cme.dm +++ b/modular_skyrat/modules/cme/code/cme.dm @@ -1,15 +1,15 @@ -//////////////////////////////////// -//CME EVENT SYSTEM -//SEE _CME_DEFINES.DM FOR SETTINGS. -//////////////////////////////////// +/* +* CME EVENT SYSTEM +* SEE _CME_DEFINES.DM FOR SETTINGS. +*/ /* Welcome to the CME control system. - -This controls the CME event, or coronal mass ejection event, which causes multiple EMP bubbles to form around the station -depending on conditons and time. There are currently 4 settings of CME, all of which have settings defined in the -cme defines DM file. See that for more info - -Armageddon is truly going to fuck the station, use it sparingly. +* +* This controls the CME event, or coronal mass ejection event, which causes multiple EMP bubbles to form around the station +* depending on conditons and time. There are currently 4 settings of CME, all of which have settings defined in the +* cme defines DM file. See that for more info +* +* Armageddon is truly going to fuck the station, use it sparingly. */ /datum/round_event_control/cme @@ -170,9 +170,9 @@ Armageddon is truly going to fuck the station, use it sparingly. minor_announce("The station has cleared the solar flare, please proceed to repair electronic failures.", "CME cleared:") -//////////////////////// -//CME bubbles -/////////////////////// +/* +* CME BUBBLES +*/ /obj/effect/cme desc = "A solar ejection projection." diff --git a/modular_skyrat/modules/customization/modules/clothing/suits/hoodies.dm b/modular_skyrat/modules/customization/modules/clothing/suits/hoodies.dm index 28dc274ae57..ec41c2c3eb3 100644 --- a/modular_skyrat/modules/customization/modules/clothing/suits/hoodies.dm +++ b/modular_skyrat/modules/customization/modules/clothing/suits/hoodies.dm @@ -1,7 +1,9 @@ -///HOODIES/// -///The hoodies and attached sprites [WERE ORIGINALLY FROM] https://github.com/Citadel-Station-13/Citadel-Station-13-RP before GAGSification -///Respective datums can be found in modular_skyrat/modules/customization/datums/greyscale/hoodies -///These are now a subtype of toggle/jacket too, so it properly toggles and isnt the unused 'storage' type +/* +* The hoodies and attached sprites [WERE ORIGINALLY FROM] https://github.com/Citadel-Station-13/Citadel-Station-13-RP before GAGSification +* Respective datums can be found in modular_skyrat/modules/customization/datums/greyscale/hoodies +* These are now a subtype of toggle/jacket too, so it properly toggles and isnt the unused 'storage' type +*/ + /obj/item/clothing/suit/toggle/jacket/hoodie name = "hoodie" desc = "A warm hoodie. you cant help but mess with the zipper..." @@ -25,7 +27,10 @@ greyscale_colors = "#ffffff#313131" flags_1 = IS_PLAYER_COLORABLE_1 -///Preset greyscales + branded hoodies +/* +* PRESET GREYSCALES & BRANDED +*/ + /obj/item/clothing/suit/toggle/jacket/hoodie/grey greyscale_colors = "#a8a8a8" diff --git a/modular_skyrat/modules/customization/modules/clothing/suits/modsuit_tailsprites.dm b/modular_skyrat/modules/customization/modules/clothing/suits/modsuit_tailsprites.dm index 7d710902965..7b13435fc26 100644 --- a/modular_skyrat/modules/customization/modules/clothing/suits/modsuit_tailsprites.dm +++ b/modular_skyrat/modules/customization/modules/clothing/suits/modsuit_tailsprites.dm @@ -1,5 +1,7 @@ -// Here be the hexadecimal color lists for the MODsuit tail sprites. -// The list gets passed on to var/list/special_colour_list in species.dm, turned to RGB values, and overlayed onto the uncolored tailsprite in tails_modsuit.dmi +/* +* Here be the hexadecimal color lists for the MODsuit tail sprites. +* The list gets passed on to var/list/special_colour_list in species.dm, turned to RGB values, and overlayed onto the uncolored tailsprite in tails_modsuit.dmi +*/ /datum/mod_theme /// Tail colors for the tail overlay of the modsuit diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species.dm index 9d2b459dc8a..a4f96ad7f64 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species.dm @@ -437,9 +437,9 @@ GLOBAL_LIST_EMPTY(customizable_races) stop_wagging_tail(H) . = ..() -//////////////// -//Tail Wagging// -//////////////// +/* +* TAIL WAGGING +*/ /datum/species/proc/can_wag_tail(mob/living/carbon/human/H) if(!H) //Somewhere in the core code we're getting those procs with H being null diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/ghoul.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/ghoul.dm index 11eff8af3dc..2f96c125914 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/ghoul.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/ghoul.dm @@ -133,9 +133,9 @@ C.part_default_r_leg = /obj/item/bodypart/r_leg C.ReassignForeignBodyparts() -////////////////// -// ATTACK PROCS // -////////////////// +/* +* ATTACK PROCS +*/ /datum/species/ghoul/disarm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style) // Targeting Self? With "DISARM" diff --git a/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/drinks.dm b/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/drinks.dm index 8cd6f9efcf5..32888d995ac 100644 --- a/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/drinks.dm +++ b/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/drinks.dm @@ -24,11 +24,15 @@ /obj/item/trash/can/skyrat icon = 'modular_skyrat/master_files/icons/obj/janitor.dmi' -//////////////////////////soda_cans/skyrat// +/* +* SKYRAT SODA CANS +*/ + /// How much fizziness is added to the can of soda by throwing it, in percentage points #define SODA_FIZZINESS_THROWN 15 /// How much fizziness is added to the can of soda by shaking it, in percentage points #define SODA_FIZZINESS_SHAKE 5 + /obj/item/reagent_containers/food/drinks/soda_cans/skyrat icon = 'modular_skyrat/master_files/icons/obj/drinks.dmi' diff --git a/modular_skyrat/modules/cyborg/code/robot_upgrades.dm b/modular_skyrat/modules/cyborg/code/robot_upgrades.dm index ed7ba8de0ec..e56f9e4ea6a 100644 --- a/modular_skyrat/modules/cyborg/code/robot_upgrades.dm +++ b/modular_skyrat/modules/cyborg/code/robot_upgrades.dm @@ -153,9 +153,9 @@ for(var/obj/item/dogborg_nose/dognose in borg.model.modules) borg.model.remove_module(dognose, TRUE) -///////////////////////////////////////////// -/// Advanced Engineering Cyborg Materials /// -///////////////////////////////////////////// +/* +* ADVANCED ENGINEERING CYBORG MATERIALS +*/ #define ENGINEERING_CYBORG_CHARGE_PER_STACK 1000 diff --git a/modular_skyrat/modules/decay_subsystem/code/nests.dm b/modular_skyrat/modules/decay_subsystem/code/nests.dm index 3527ed65390..277118a53ad 100644 --- a/modular_skyrat/modules/decay_subsystem/code/nests.dm +++ b/modular_skyrat/modules/decay_subsystem/code/nests.dm @@ -131,7 +131,9 @@ retaliated = FALSE visible_message(span_danger("[src] calms down.")) -///////////// CUSTOM SPAWNERS +/* +* CUSTOM SPAWNERS +*/ /obj/structure/mob_spawner/spiders name = "sticky cobwebs" diff --git a/modular_skyrat/modules/emotes/code/additionalemotes/overlay_emote.dm b/modular_skyrat/modules/emotes/code/additionalemotes/overlay_emote.dm index 2aebf9fa220..b987dc58075 100644 --- a/modular_skyrat/modules/emotes/code/additionalemotes/overlay_emote.dm +++ b/modular_skyrat/modules/emotes/code/additionalemotes/overlay_emote.dm @@ -93,7 +93,6 @@ else return FALSE -//// // These emotes hook into existing ones /datum/emote/living/sigh key = "sigh" diff --git a/modular_skyrat/modules/event_vote/code/event_chaos_system.dm b/modular_skyrat/modules/event_vote/code/event_chaos_system.dm index 7703c28496f..d8e10043860 100644 --- a/modular_skyrat/modules/event_vote/code/event_chaos_system.dm +++ b/modular_skyrat/modules/event_vote/code/event_chaos_system.dm @@ -193,9 +193,9 @@ /datum/round_event_control/revenant chaos_level = EVENT_CHAOS_MED -/////////////////////// -// HIGH CHAOS EVENTS // -/////////////////////// +/* +* HIGH CHAOS EVENTS +*/ /datum/round_event_control/slaughter chaos_level = EVENT_CHAOS_HIGH @@ -241,11 +241,11 @@ /datum/round_event_control/anomaly/anomaly_vortex chaos_level = EVENT_CHAOS_LOW +/* +* EVENT CHAOS OVERRIDES +* FOR SUBTYPES +*/ -/////////////////////////// -// EVENT CHAOS OVERRIDES // -// FOR SUBTYPES // -/////////////////////////// /datum/round_event_control/pirates/enclave chaos_level = EVENT_CHAOS_DISABLED diff --git a/modular_skyrat/modules/examinemore/code/examine_more.dm b/modular_skyrat/modules/examinemore/code/examine_more.dm index c7a9483246a..69eb47aaaba 100644 --- a/modular_skyrat/modules/examinemore/code/examine_more.dm +++ b/modular_skyrat/modules/examinemore/code/examine_more.dm @@ -117,9 +117,9 @@ would only be recognisable with someone that had the syndicate trait. composed_message += special_desc . += composed_message -////////// -//Examples: -////////// +/* +* EXAMPLES +*/ /obj/item/storage/backpack/duffelbag/syndie name = "duffel bag" diff --git a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm index d123bf4bef5..521965a0229 100644 --- a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm +++ b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm @@ -1,12 +1,13 @@ -///////// -// Overwrites all the security icons with our own bluesec versions; this means little to no mapping/spawning conflicts! -// (Also includes 'old' versions at the bottom of the file, for the purpose of crates/vendors/admin shenanigans. Can't remove them ENTIRELY after all!) -///////// +/* +* Overwrites all the security icons with our own bluesec versions; this means little to no mapping/spawning conflicts! +* (Also includes 'old' versions at the bottom of the file, for the purpose of crates/vendors/admin shenanigans. Can't remove them ENTIRELY after all!) +*/ /* -* PLASMAMEN -* This goes first due to simultaneously being easy to do, and complex to organize +* PLASMAMEN +* This goes first due to simultaneously being easy to do, and complex to organize */ + /obj/item/clothing/under/plasmaman/security icon = 'modular_skyrat/master_files/icons/obj/clothing/under/plasmaman.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/plasmaman.dmi' @@ -604,10 +605,14 @@ /obj/item/modular_computer/tablet/pda/heads/hos greyscale_colors = "#2B356D#1E1E1E" -//////////////////////////////////////////////////////////////////////////////////////////////////////////// -//A bunch of Re-overrides so that admins can keep using some redsec stuff; not all of them have this though! +/* +* A bunch of re-overrides so that admins can keep using some redsec stuff; not all of them have this though! +*/ + +/* +* EYES +*/ -//Eyes// /obj/item/clothing/glasses/hud/security/redsec icon = 'icons/obj/clothing/glasses.dmi' worn_icon = 'icons/mob/clothing/eyes.dmi' @@ -631,13 +636,19 @@ worn_icon = 'icons/mob/clothing/eyes.dmi' icon_state = "securityhudnight" -//Neck// +/* +* NECK +*/ + /obj/item/clothing/neck/cloak/hos/redsec icon = 'icons/obj/clothing/cloaks.dmi' worn_icon = 'icons/mob/clothing/neck.dmi' icon_state = "hoscloak" -//Back// +/* +* BACK +*/ + /obj/item/storage/backpack/security/redsec icon = 'icons/obj/storage.dmi' worn_icon = 'icons/mob/clothing/back.dmi' @@ -655,7 +666,10 @@ icon_state = "duffel-sec" current_skin = "duffel-sec" //prevents reskinning -//Belt// +/* +* BELT +*/ + /obj/item/storage/belt/security/redsec icon = 'icons/obj/clothing/belts.dmi' worn_icon = 'icons/mob/clothing/belt.dmi' @@ -664,7 +678,10 @@ worn_icon_state = "security" current_skin = "security" //prevents reskinning -//Head// +/* +* HEAD +*/ + /obj/item/clothing/head/helmet/sec/redsec icon = 'icons/obj/clothing/hats.dmi' worn_icon = 'icons/mob/clothing/head.dmi' @@ -675,7 +692,10 @@ flags_cover = HEADCOVERSEYES flags_inv = HIDEHAIR -//Uniform// +/* +* UNIFORM +*/ + /obj/item/clothing/under/rank/security/officer/redsec icon = 'icons/obj/clothing/under/security.dmi' worn_icon = 'icons/mob/clothing/under/security.dmi' @@ -702,7 +722,10 @@ worn_icon = 'icons/mob/clothing/under/security.dmi' icon_state = "hos_parade_fem" -//Winter Coat +/* +* WINTER COAT +*/ + /obj/item/clothing/head/hooded/winterhood/security/redsec icon = 'icons/obj/clothing/head/winterhood.dmi' worn_icon = 'icons/mob/clothing/head/winterhood.dmi' diff --git a/modular_skyrat/modules/goofsec/code/sol_fed.dm b/modular_skyrat/modules/goofsec/code/sol_fed.dm index 2c97d5e2bde..33a1a09e9ee 100644 --- a/modular_skyrat/modules/goofsec/code/sol_fed.dm +++ b/modular_skyrat/modules/goofsec/code/sol_fed.dm @@ -299,6 +299,10 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list( ID_to_give.update_icon() human_to_equip.sec_hud_set_ID() +/* +* POLICE +*/ + /datum/antagonist/ert/request_911/police name = "Marshal" role = "Marshal" @@ -325,6 +329,10 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list( id_trim = /datum/id_trim/solfed +/* +* BREACH CONTROL +*/ + /datum/antagonist/ert/request_911/atmos name = "Breach Control Technician" role = "Breach Control Technician" @@ -349,8 +357,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list( /obj/item/beamout_tool = 1) id_trim = /datum/id_trim/solfed -////////////////////////////// -/// Breach Control MODsuit /// +// Breach control MODsuit /obj/item/mod/control/pre_equipped/atmospheric/breach_control //Just a different kit as 811 wont be raiding Robotics; otherwise the same look (For now???) theme = /datum/mod_theme/atmospheric/breach_control applied_cell = /obj/item/stock_parts/cell/super @@ -366,8 +373,10 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list( /datum/mod_theme/atmospheric/breach_control //Implement a unique skin for this eventually ui_theme = "neutral" //Le yellow Sol -////////////////////////////// -////////////////////////////// + +/* +* EMT +*/ /datum/antagonist/ert/request_911/emt name = "Emergency Medical Technician" diff --git a/modular_skyrat/modules/gunhud/code/gun_hud.dm b/modular_skyrat/modules/gunhud/code/gun_hud.dm index 7d0e86d0d30..ff8e5a17853 100644 --- a/modular_skyrat/modules/gunhud/code/gun_hud.dm +++ b/modular_skyrat/modules/gunhud/code/gun_hud.dm @@ -1,15 +1,15 @@ -///////////////////////// -//Customizable ammo hud// -///////////////////////// +/* +* Customizable ammo hud +*/ /* -This hud is controlled namely by the ammo_hud component. Generally speaking this is inactive much like all other hud components until it's needed. -It does not do any calculations of it's own, you must do this externally. -If you wish to use this hud, use the ammo_hud component or create another one which interacts with it via the below procs. -proc/turn_off -proc/turn_on -proc/set_hud -Check the gun_hud.dmi for all available icons you can use. +* This hud is controlled namely by the ammo_hud component. Generally speaking this is inactive much like all other hud components until it's needed. +* It does not do any calculations of it's own, you must do this externally. +* If you wish to use this hud, use the ammo_hud component or create another one which interacts with it via the below procs. +* proc/turn_off +* proc/turn_on +* proc/set_hud +* Check the gun_hud.dmi for all available icons you can use. */ /atom/movable/screen/ammo_counter diff --git a/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm b/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm index f30f5559d1a..7dbdaaf0249 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm @@ -25,7 +25,10 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ else outfit.uniform = item_path -//////////////////////////////////////////////////////JUMPSUITS +/* +* JUMPSUITS +*/ + /datum/loadout_item/under/jumpsuit /datum/loadout_item/under/jumpsuit/greyscale @@ -213,7 +216,10 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ name = "Polychromic Sweater" item_path = /obj/item/clothing/under/misc/polysweater -/////////////////////////////////////////////////////////////MISC UNDERSUITS +/* +* MISC UNDERSUITS +*/ + /datum/loadout_item/under/miscellaneous //christmas stuff, remove afterword @@ -606,7 +612,10 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ item_path = /obj/item/clothing/under/misc/gear_harness/adam -////////////////////////////////////////////////////////////////FORMAL UNDERSUITS +/* +* FORMAL UNDERSUITS +*/ + /datum/loadout_item/under/formal /datum/loadout_item/under/formal/vic_dress diff --git a/modular_skyrat/modules/mapping/code/dungeon.dm b/modular_skyrat/modules/mapping/code/dungeon.dm index cbbe11f0d02..cfe33f1dcb4 100644 --- a/modular_skyrat/modules/mapping/code/dungeon.dm +++ b/modular_skyrat/modules/mapping/code/dungeon.dm @@ -1,6 +1,6 @@ -////////////////////// -// Walls // -////////////////////// +/* +* WALLS +*/ /turf/closed/indestructible/dungeon name = "stone wall" @@ -14,9 +14,9 @@ icon_state = "wall-corner" base_icon_state = "wall-corner" -////////////////////// -// Turfs // -////////////////////// +/* +* TURFS +*/ /turf/open/floor/plating/cobblestone gender = PLURAL @@ -45,9 +45,9 @@ baseturfs = /turf/open/floor/plating/cobblestone/sparse/planet planetary_atmos = TRUE -////////////////////// -// Fake Walls // -////////////////////// +/* +* FAKE WALLS +*/ /obj/structure/dungeon name = "stone wall with a hole in it!" diff --git a/modular_skyrat/modules/mapping/code/furniture.dm b/modular_skyrat/modules/mapping/code/furniture.dm index 2ae290af37f..0ef37a8d35a 100644 --- a/modular_skyrat/modules/mapping/code/furniture.dm +++ b/modular_skyrat/modules/mapping/code/furniture.dm @@ -1,5 +1,7 @@ -/////////////////////////////////////////// -///////////// FURNITURE ///////////// +/* +* FURNITURE +*/ + /obj/structure/decorative/shelf name = "shelf" desc = "A sturdy wooden shelf to store a variety of items on." @@ -50,13 +52,14 @@ /obj/structure/decorative/shelf/alcohol_assortment desc = "A sturdy wooden shelf with a variety of branded alcoholic drinks." icon_state = "shelf_11" -///////////// FURNITURE ///////////// -/////////////////////////////////////////// -///////////// LADDER ///////////// + +/* +* LADDER +*/ + // If you're curious to how this works, just put one down and it'll automatically detect ones in the same location above or below it. /obj/structure/ladder/wood name = "wooden ladder" desc = "It's kind of fun to go up or down these once in a while." icon = 'modular_skyrat/modules/mapping/icons/unique/furniture.dmi' icon_state = "ladder" -///////////// LADDER ///////////// diff --git a/modular_skyrat/modules/mapping/code/planet_turfs.dm b/modular_skyrat/modules/mapping/code/planet_turfs.dm index 33ba320b23a..1ffe4ea555d 100644 --- a/modular_skyrat/modules/mapping/code/planet_turfs.dm +++ b/modular_skyrat/modules/mapping/code/planet_turfs.dm @@ -29,9 +29,10 @@ initial_gas_mix = OPENTURF_DEFAULT_ATMOS baseturfs = /turf/open/misc/dirt/planet -///////////// GRASS TURFS ///////////// -/////////////////////////////////////////// -///////////// SNOW TURFS ///////////// +/* +* SNOW +*/ + /turf/open/misc/asteroid/snow/indestructible gender = PLURAL name = "snow" @@ -70,9 +71,9 @@ */ -/////////////////////////////////////////// -///////////// OTHER TURFS ///////////// -/////////////////////////////////////////// +/* +* OTHER +*/ /turf/closed/mineral/earth_like icon_state = "rock" @@ -121,9 +122,9 @@ /turf/closed/mineral/asteroid/has_air initial_gas_mix = OPENTURF_LOW_PRESSURE //one that WONT screw with atmos if its mapped somewhere -/////////////////////////////////////////// -///////////// HAZARD TURFS ///////////// -/////////////////////////////////////////// +/* +* HAZARD +*/ /turf/open/chasm/sandy //just a retexture of the other chasm. making this was nothing but painful. icon = 'modular_skyrat/modules/mapping/icons/turf/open/sandychasm.dmi' diff --git a/modular_skyrat/modules/mapping/code/pool.dm b/modular_skyrat/modules/mapping/code/pool.dm index 40ff5983d4f..65858702dbc 100644 --- a/modular_skyrat/modules/mapping/code/pool.dm +++ b/modular_skyrat/modules/mapping/code/pool.dm @@ -1,4 +1,12 @@ -///////////// OVERLAY EFFECTS ///////////// +/* +* OVERLAY EFFECTS +*/ + +/* +* Paradise, Tigercat2000 - Original idea for the pool and the sprites for the water overlay and the 'pool' floor tile. +* TGstation, Rohesie - Offered help in making this perform better by using vis contents instead of overlays. Thanks! +*/ + /obj/effect/overlay/water name = "water" icon = 'modular_skyrat/modules/mapping/icons/unique/pool.dmi' @@ -13,22 +21,14 @@ icon_state = "top" layer = BELOW_MOB_LAYER vis_flags = NONE -///////////// OVERLAY EFFECTS ///////////// -/////////////////////////////////////////// -///////////// INITIALISE ///////////// + /turf/open/water/overlay/Initialize() . = ..() var/obj/effect/overlay/water/water_overlay = new() var/obj/effect/overlay/water/top/water_top_overlay = new() vis_contents += water_overlay vis_contents += water_top_overlay -///////////// INITIALISE ///////////// -/////////////////////////////////////////// -///////////// GARBAGE CONTROL ///////////// -///////////// GARBAGE CONTROL ///////////// -/////////////////////////////////////////// -///////////// CLEANING BLOCK ///////////// /turf/open/water/overlay/Entered(atom/movable/AM) ..() wash_atom(AM) @@ -37,9 +37,7 @@ /turf/open/water/overlay/proc/wash_atom(atom/A) A.wash(CLEAN_RAD) // Clean radiation non-instantly A.wash(CLEAN_WASH) -///////////// CLEANING BLOCK ///////////// -/////////////////////////////////////////// -///////////// MOOD EVENT ///////////// + /turf/open/water/overlay/hotspring/Entered(atom/movable/AM) ..() SEND_SIGNAL(AM, COMSIG_ADD_MOOD_EVENT, "hotspring", /datum/mood_event/hotspring) @@ -52,9 +50,7 @@ description = span_nicegreen("I recently had a paddle in some nice warm water! It was so refreshing!\n") mood_change = 4 timeout = 20 MINUTES -///////////// MOOD EVENT ///////////// -/////////////////////////////////////////// -///////////// WATER TURFS ///////////// + // Planetside water, indestructible. /turf/open/water/overlay name = "shallow water" @@ -98,9 +94,3 @@ /turf/open/water/overlay/hotspring/planet/outdoors baseturfs = /turf/open/water/overlay/hotspring/planet/outdoors planetary_atmos = TRUE -///////////// WATER TURFS ///////////// -/////////////////////////////////////////// -///////////// CREDITS ///////////// -//• Paradise, Tigercat2000 - Original idea for the pool and the sprites for the water overlay and the 'pool' floor tile. -//• TGstation, Rohesie - Offered help in making this perform better by using vis contents instead of overlays. Thanks! -///////////// CREDITS ///////////// diff --git a/modular_skyrat/modules/microfusion/code/gun_types.dm b/modular_skyrat/modules/microfusion/code/gun_types.dm index 17804c84e75..95ca4615b1d 100644 --- a/modular_skyrat/modules/microfusion/code/gun_types.dm +++ b/modular_skyrat/modules/microfusion/code/gun_types.dm @@ -57,7 +57,10 @@ new /obj/item/stock_parts/cell/microfusion/advanced(src) new /obj/item/stock_parts/cell/microfusion/advanced(src) -//////////////MICROFUSION SPAWNERS +/* +* MICROFUSION SPAWNERS +*/ + /obj/effect/spawner/armory_spawn/microfusion icon_state = "random_rifle" gun_count = 4 diff --git a/modular_skyrat/modules/microfusion/code/phase_emitter.dm b/modular_skyrat/modules/microfusion/code/phase_emitter.dm index d9cdaeee15b..7db88d0c9a0 100644 --- a/modular_skyrat/modules/microfusion/code/phase_emitter.dm +++ b/modular_skyrat/modules/microfusion/code/phase_emitter.dm @@ -1,6 +1,9 @@ -////////////////////////////////////////////////////////////// PHASE EMITTERS /* -Basically the heart of the gun, can be upgraded. +* PHASE EMITTERS +*/ + +/* +* Basically the heart of the gun, can be upgraded. */ /obj/item/microfusion_phase_emitter name = "basic microfusion phase emitter" diff --git a/modular_skyrat/modules/modular_ert/code/trauma_team/trauma_team_outfit.dm b/modular_skyrat/modules/modular_ert/code/trauma_team/trauma_team_outfit.dm index ad89078794b..31c03e4ddcc 100644 --- a/modular_skyrat/modules/modular_ert/code/trauma_team/trauma_team_outfit.dm +++ b/modular_skyrat/modules/modular_ert/code/trauma_team/trauma_team_outfit.dm @@ -32,9 +32,9 @@ /obj/item/roller,\ ) -//////////////////// -/// UNIQUE ITEMS /// -//////////////////// +/* +* UNIQUE ITEMS +*/ //A box of VeyGun cells, because storage is hell and these take up a LOT more than they're worth. /obj/item/storage/box/plastic/medicells diff --git a/modular_skyrat/modules/modular_items/code/kinetic_crusher.dm b/modular_skyrat/modules/modular_items/code/kinetic_crusher.dm index 70e1ef90b4d..b85d0218936 100644 --- a/modular_skyrat/modules/modular_items/code/kinetic_crusher.dm +++ b/modular_skyrat/modules/modular_items/code/kinetic_crusher.dm @@ -1,4 +1,3 @@ -//////////////////////////Demonic Watcher - Start////////////////////////// /obj/item/crusher_trophy/demon_core name = "demonic core" desc = "The chipped core of a demonic watcher, it gently hums with weak bluespace energy." @@ -19,4 +18,3 @@ /mob/living/simple_animal/hostile/asteroid/ice_demon/spawn_crusher_loot() for(var/item_path in crusher_loot) new item_path(loc) -//////////////////////////Demonic Watcher - End////////////////////////// diff --git a/modular_skyrat/modules/modular_items/code/modular_clothing.dm b/modular_skyrat/modules/modular_items/code/modular_clothing.dm index 7190f76f9f5..1ebcfa4d7d4 100644 --- a/modular_skyrat/modules/modular_items/code/modular_clothing.dm +++ b/modular_skyrat/modules/modular_items/code/modular_clothing.dm @@ -1,6 +1,6 @@ -/////////////////// -// Clothing // -/////////////////// +/* +* CLOTHING +*/ /obj/item/clothing/under/rank/civilian/linen name = "linen shirt" diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/arousal_system.dm b/modular_skyrat/modules/modular_items/lewd_items/code/arousal_system.dm index b00936b23b9..c3aa25dc8be 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/arousal_system.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/arousal_system.dm @@ -20,7 +20,10 @@ #define STRAPON_TRAIT "strapon" -///////////-----Decals-----////////// +/* +* DECALS +*/ + /obj/effect/decal/cleanable/cum name = "cum" desc = "Ew... Gross." @@ -37,7 +40,10 @@ random_icon_states = list("femcum_1", "femcum_2", "femcum_3", "femcum_4") beauty = -50 -///////////-----Reagents-----/////////// +/* +* REAGENTS +*/ + /datum/reagent/consumable/girlcum name = "girlcum" description = "Uhh... Someone had fun." @@ -102,7 +108,9 @@ affected_mob.emote(pick("moan", "twitch_s")) return -///////////-----Initilaze------/////////// +/* +* INITIALISE +*/ /obj/item/organ/genital var/datum/reagents/internal_fluids @@ -151,7 +159,10 @@ apply_status_effect(/datum/status_effect/aroused) apply_status_effect(/datum/status_effect/body_fluid_regen) -///////////-----Verbs------/////////// +/* +* VERBS +*/ + /mob/living/carbon/human/verb/arousal_panel() set name = "Climax" set category = "IC" @@ -172,9 +183,9 @@ if(CONFIG_GET(flag/disable_erp_preferences)) verbs -= /mob/living/carbon/human/verb/arousal_panel -//////////// -///FLUIDS/// -//////////// +/* +* FLUIDS +*/ /datum/status_effect/body_fluid_regen id = "body fluid regen" @@ -211,9 +222,10 @@ else vagina.internal_fluids.remove_any(0.05) -///////////// -///AROUSAL/// -///////////// +/* +* AROUSAL +*/ + /mob/living/carbon/human/proc/get_arousal() return arousal @@ -283,7 +295,10 @@ affected_mob.adjustPleasure(temp_pleasure) affected_mob.adjustPain(temp_pain) -////Pain//// +/* +* PAIN +*/ + /mob/living/carbon/human/proc/get_pain() return pain @@ -310,7 +325,10 @@ pain -= abs(change_amount) pain = min(max(pain, 0), 100) -////Pleasure//// +/* +* PLEASURE +*/ + /mob/living/carbon/human/proc/get_pleasure() return pleasure @@ -340,9 +358,9 @@ var/amount = forced ? damage : damage * hit_percent * burnmod * affected_mob.physiology.burn_mod INVOKE_ASYNC(affected_mob, /mob/living/carbon/human/.proc/adjustPain, amount) -//////////// -///CLIMAX/// -//////////// +/* +* CLIMAX +*/ /datum/mood_event/orgasm description = span_purple("Woah... This pleasant tiredness... I love it.\n") @@ -553,9 +571,9 @@ affected_mob.adjustArousal(temp_arousal) affected_mob.adjustPleasure(temp_pleasure) -//////////////////////// -///SPANKING PROCEDURE/// -//////////////////////// +/* +* SPANKING +*/ //Hips are red after spanking /datum/status_effect/spanked @@ -576,9 +594,9 @@ description = span_purple("Ah, yes! More! Punish me!\n") timeout = 5 MINUTES -///////////////////// -///SUBSPACE EFFECT/// -///////////////////// +/* +* SUBSPACE EFFECT +*/ /datum/status_effect/subspace id = "subspace" @@ -619,9 +637,9 @@ description = span_purple("I'm tied! Cannot move! These ropes... Ah!~") mood_change = 0 // I don't want to doom the station to sonic-speed perverts, but still want to keep this as mood modifier. -/////////////////////// -///AROUSAL INDICATOR/// -/////////////////////// +/* +* AROUSAL INDICATOR +*/ /obj/item/organ/brain/on_life(delta_time, times_fired) //All your horny is here *points to the head* . = ..() @@ -720,9 +738,9 @@ if(arousal_alert?.pain_level in list("small", "medium", "high", "max")) arousal_alert.cut_overlay(arousal_alert.pain_overlay) -//////////////////////// -///CUM.DM ASSIMILATED/// -//////////////////////// +/* +* CUM FACE +*/ //you got cum on your face bro *licks it off* /datum/component/cumfaced diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm index 25284121154..bf5a51e41eb 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm @@ -264,9 +264,9 @@ else time_to_choke_left -= delta_time -//////////////////////////////// -//////////---FILTERS---///////// -//////////////////////////////// +/* +* FILTERS +*/ // Here goes code for lewd gasmask filter /obj/item/reagent_containers/glass/lewd_filter diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kink_collars.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kink_collars.dm index 11faf403719..0c61da9d692 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kink_collars.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kink_collars.dm @@ -1,6 +1,6 @@ -/////////////////// -///NORMAL COLLAR/// -/////////////////// +/* +* NORMAL COLLAR +*/ //To determine what kind of stuff we can put in collar. @@ -80,9 +80,9 @@ tagname = stripped_input(user, "Would you like to change the name on the tag?", "Name your new pet", "Spot", MAX_NAME_LEN) name = "[initial(name)] - [tagname]" -//////////////////////// -///COLLAR WITH A LOCK/// -//////////////////////// +/* +* LOCKED COLLAR +*/ /obj/item/clothing/neck/kink_collar/locked name = "locked collar" @@ -246,9 +246,9 @@ to_chat(user, span_warning("You fail to cut away the lock, cutting yourself in the process!")) target.apply_damage(rand(3, 5), BRUTE, BODY_ZONE_HEAD, wound_bonus = 30) -///////////////////////// -///MIND CONTROL COLLAR/// -///////////////////////// +/* +* MIND CONTROL COLLAR +*/ //Ok, first - it's not mind control. Just forcing someone to do emotes that user added to remote thingy. Just a funny illegal ERP toy. diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_shoes.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_shoes.dm index ba24acfcc4d..cc187540680 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_shoes.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_shoes.dm @@ -79,9 +79,9 @@ . = ..() AddComponent(/datum/component/squeak, list('modular_skyrat/modules/modular_items/lewd_items/sounds/highheel1.ogg' = 1, 'modular_skyrat/modules/modular_items/lewd_items/sounds/highheel2.ogg' = 1), 70) -///////////////// -///Latex socks/// -///////////////// +/* +* LATEX SOCKS +*/ /obj/item/clothing/shoes/latex_socks name = "latex socks" @@ -100,9 +100,9 @@ affected_mob.update_inv_shoes() affected_mob.hud_used.hidden_inventory_update() -////////////////// -///Domina heels/// -////////////////// +/* +* DOMINA HEELS +*/ /obj/item/clothing/shoes/dominaheels //added for Kubic request name = "dominant heels" diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/neckleash.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/neckleash.dm index 58d05821d2b..3bd384e2fdd 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/neckleash.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/neckleash.dm @@ -4,7 +4,10 @@ #define STATUS_EFFECT_LEASH_FREEPET /datum/status_effect/leash_freepet #define MOVESPEED_ID_LEASH "LEASH" -/////STATUS EFFECTS///// +/* +* STATUS EFFECTS +*/ + //These are mostly used as flags for the states each member can be in /datum/status_effect/leash_dom @@ -453,7 +456,10 @@ */ /* -///// OBJECT ///// +/* +* OBJECT +*/ + //The leash object itself //The component variables are used for hooks, used later. diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shackles.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shackles.dm index 904bcf2011f..b84e2d99640 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shackles.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shackles.dm @@ -21,9 +21,9 @@ var/color_changed = FALSE var/static/list/shackles_designs -////////////////////////////////////// -//here goes code for changing model.// -////////////////////////////////////// +/* +* MODEL CHANGES +*/ //create radial menu /obj/item/clothing/suit/straight_jacket/shackles/proc/populate_shackles_designs() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/attachable_vibrator.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/attachable_vibrator.dm index 39caeab480b..410cd65d408 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/attachable_vibrator.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/attachable_vibrator.dm @@ -1,6 +1,6 @@ -////////////////////////// -///Normal vibrating egg/// -////////////////////////// +/* +* VIBRATING EGG +*/ /obj/item/clothing/sextoy/eggvib name = "vibrating egg" @@ -136,9 +136,10 @@ target.adjustArousal(0.7 * delta_time) target.adjustPleasure(0.7 * delta_time) -////////////////////////// -///Signal vibrating egg/// -////////////////////////// +/* +* SIGNALLER CONTROLLED EGG +*/ + /obj/item/clothing/sextoy/eggvib/signalvib name = "signal vibrating egg" desc = "A vibrating sex toy with remote control capability. Use a signaller to turn it on." diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm index c5e107a65ca..50dec9121b8 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm @@ -1,7 +1,8 @@ #define AROUSAL_REGULAR_THRESHOLD 25 -////////////////// -///NORMAL DILDO/// -////////////////// + +/* +* NORMAL DILDO +*/ /obj/item/clothing/sextoy/dildo name = "dildo" @@ -157,9 +158,9 @@ 'modular_skyrat/modules/modular_items/lewd_items/sounds/bang5.ogg', 'modular_skyrat/modules/modular_items/lewd_items/sounds/bang6.ogg'), 100, TRUE, ignore_walls = FALSE) -/////////////////////// -///POLYCHROMIC DILDO/// -/////////////////////// +/* +* POLYCHROMIC // this doesn't even use polychromism I Want To Die +*/ GLOBAL_LIST_INIT(dildo_colors, list(//mostly neon colors "Cyan" = "#00f9ff", //cyan @@ -241,10 +242,9 @@ GLOBAL_LIST_INIT(dildo_colors, list(//mostly neon colors icon_state = "[initial(icon_state)]_[poly_size]" inhand_icon_state = "[initial(icon_state)]_[poly_size]" - -////////////////// -///DOUBLE DILDO/// -////////////////// +/* +* DOUBLE DILDO +*/ /obj/item/clothing/sextoy/dildo/double_dildo name = "double dildo" @@ -308,8 +308,6 @@ GLOBAL_LIST_INIT(dildo_colors, list(//mostly neon colors else to_chat(user, span_warning("You need to equip [src] before you can use it!")) -/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - /// Code for taking out/putting away the other end of the toy when one end is in you /obj/item/clothing/sextoy/dildo/double_dildo/proc/toggle(mob/living/carbon/human/user) playsound(user, 'modular_skyrat/modules/modular_items/lewd_items/sounds/latex.ogg', 40, TRUE, ignore_walls = FALSE) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/serviette.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/serviette.dm index 52152886cd4..8dbf91f68ba 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/serviette.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/serviette.dm @@ -1,9 +1,3 @@ -/////////////////////// -//CODE FOR SERVIETTES// -/////////////////////// - -//Kubic plz make it clean stuff. My arms grow from same place where grows my legs. - /obj/item/serviette name = "serviette" desc = "To clean all the mess." @@ -72,9 +66,9 @@ remove_item_from_storage(user) user.put_in_hands(used_serviette) -/////////////////////////// -//CODE FOR SERVIETTE PACK// -/////////////////////////// +/* +* SERVIETTE PACK +*/ /obj/item/serviette_pack name = "pack of serviettes" diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm index ea3c79f34de..9fb53a708f7 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm @@ -123,9 +123,9 @@ return user.visible_message(span_notice("[user] snuffs [src].")) -/////////////////////////////////////////////////// -//here goes things that required for wax dropping// -/////////////////////////////////////////////////// +/* +* WAX DROPPING +*/ /obj/item/bdsm_candle/attack(mob/living/carbon/human/attacked, mob/living/carbon/human/user) . = ..() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm index 5e7932a7464..5edc38e60c2 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm @@ -1,7 +1,3 @@ -/////////////// -///Vibroring/// -/////////////// - /obj/item/clothing/sextoy/vibroring name = "vibrating ring" desc = "A ring toy used to keep your erection going strong." diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm index 46940f3725a..e53603f34b4 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm @@ -9,9 +9,11 @@ max_integrity = 75 var/color_changed = FALSE // Variable to track the color change of the machine by the user. So that you can change it once. var/static/list/milkingmachine_designs - ////////////////////// - // Power management // - ////////////////////// + +/* +* POWER MANAGEMENT +*/ + var/obj/item/stock_parts/cell/cell = null // Current cell in machine var/charge_rate = 200 // Power charge per tick devided by delta_time (always about ~2) var/power_draw_rate = 65 // Power draw per tick multiplied by delta_time (always about ~2) @@ -19,43 +21,49 @@ var/power_draw_multiplier_list = list("off" = 0, "low" = 0.025, "medium" = 0.25, "hard" = 0.5) var/panel_open = FALSE // Сurrent maintenace panel state - ///////////////////////////// - // Machine operating modes // - ///////////////////////////// +/* +* OPERATING MODES +*/ + var/pump_state_list = list("pump_off", "pump_on") var/pump_state var/mode_list = list("off", "low", "medium", "hard") var/current_mode - ///////////////////////////////// - // Return sensation parameters // - ///////////////////////////////// + +/* +* SENSATION PARAMETERS +*/ + // Values are returned every tick, without additional modifiers var/arousal_amounts = list("off" = 0, "low" = 1, "medium" = 2, "hard" = 3) var/pleasure_amounts = list("off" = 0, "low" = 0.2, "medium" = 1, "hard" = 1.5) var/pain_amounts = list("off" = 0, "low" = 0, "medium" = 0.2, "hard" = 0.5) - ////////////////////// - // Fluid management // - ////////////////////// +/* +* FLUID MANAGEMENT +*/ + // Liquids are taken every tick, no additional modifiers var/milk_retrive_amount = list("off" = 0, "low" = 1, "medium" = 2, "hard" = 3) var/girlcum_retrive_amount = list("off" = 0, "low" = 1, "medium" = 2, "hard" = 3) var/semen_retrive_amount = list("off" = 0, "low" = 1, "medium" = 2, "hard" = 3) var/climax_retrive_multiplier = 2 // Climax intake volume multiplier - ////////////////////////// - // Vessels and parameters // - ////////////////////////// +/* +* VESSELS +*/ + var/max_vessel_capacity = 100 // Limits a max capacity of any internal vessel in machine var/obj/item/reagent_containers/milk_vessel var/obj/item/reagent_containers/girlcum_vessel var/obj/item/reagent_containers/semen_vessel var/obj/item/reagent_containers/current_vessel // Vessel selected in UI - //////////////////////////////////////////// - // Work object link cache for the machine // - //////////////////////////////////////////// +/* +* WORKED OBJECT +*/ + var/obj/item/organ/genital/current_selected_organ = null // Organ selected in UI var/obj/item/reagent_containers/glass/beaker = null // Beaker inserted in machine var/mob/living/carbon/human/current_mob = null // Mob buckled to the machine @@ -70,12 +78,13 @@ var/testicles_size = null // Machine colors - var/machine_color_list = list("pink", "teal") // Применить ссылки на список везде, где можно + var/machine_color_list = list("pink", "teal") var/machine_color - ////////////////////////////////////////// - // Stuff for visualizing machine states // - ////////////////////////////////////////// +/* +* STATE MANAGEMENT +*/ + // Cell power capacity indicator var/indicator_state_list = list("indicator_off", "indicator_low", "indicator_medium", "indicator_high") var/indicator_state @@ -89,9 +98,10 @@ var/lock_state = "open" - ///////////////////// - // Overlay Objects // - ///////////////////// +/* +* OVERLAYS +*/ + var/mutable_appearance/vessel_overlay var/mutable_appearance/indicator_overlay var/mutable_appearance/locks_overlay @@ -157,9 +167,10 @@ populate_milkingmachine_designs() START_PROCESSING(SSobj, src) -//////////////////////////////// -// Managing object appearance // -//////////////////////////////// +/* +* APPEARANCE MANAGEMENT +*/ + // Define color options for the menu /obj/structure/chair/milking_machine/proc/populate_milkingmachine_designs() milkingmachine_designs = list( @@ -188,9 +199,6 @@ return FALSE return TRUE -////////////////////////////////////////////////////////// -// Override block to change the standard chair behavior // -////////////////////////////////////////////////////////// // Another plug to disable rotation /obj/structure/chair/milking_machine/attack_tk(mob/user) return FALSE @@ -374,9 +382,11 @@ . = ..() return -////////////////////////////////////// -// Milking machine main logic block // -////////////////////////////////////// + +/* +* MAIN LOGIC +*/ + // Empty Hand Attack Handler /obj/structure/chair/milking_machine/attack_hand(mob/user) // If the panel is open and the hand is empty, then we take out the battery, otherwise standard processing @@ -841,18 +851,19 @@ update_icon_state() update_icon() -//////////////////////////////////////////////////// -/// Milking machine interface handler block /// -//////////////////////////////////////////////////// +/* +* INTERFACE +*/ + // Handler for clicking an empty hand on a machine /obj/structure/chair/milking_machine/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) - // // Standard behavior. Uncomment for UI debugging - // if(!ui) - // ui = new(user, src, "MilkingMachine", name) - // ui.open() - // /////////////////////////////////////////////////////////// + /* Standard behavior. Uncomment for UI debugging + if(!ui) + ui = new(user, src, "MilkingMachine", name) + ui.open() + */ //Block the interface if we are in the machine. Use in production if(LAZYLEN(buckled_mobs)) @@ -868,7 +879,6 @@ ui = new(user, src, "MilkingMachine", name) ui.open() return - /////////////////////////////////////// // Interface data filling handler /obj/structure/chair/milking_machine/ui_data(mob/user) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_quirks.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_quirks.dm index 6292245c360..a2104703abf 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_quirks.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_quirks.dm @@ -1,10 +1,6 @@ -////////////////////////// -///CODE FOR LEWD QUIRKS/// -////////////////////////// - -///////////////// -///BIMBO TRAIT/// -///////////////// +/* +* BIMBO +*/ /datum/brain_trauma ///Whether the trauma will be displayed on a scanner or kiosk @@ -174,9 +170,9 @@ /datum/mood_event/bimbo description = span_purple("So-o... Help..less... Lo-ve it!\n") -/////////////// -///MASOCHISM/// -/////////////// +/* +* MASOCHISM +*/ /datum/quirk/masochism name = "Masochism" @@ -200,9 +196,9 @@ REMOVE_TRAIT(affected_human, TRAIT_MASOCHISM, LEWDQUIRK_TRAIT) affected_human.pain_limit = 0 -//////////////// -///NEVERBONER/// -//////////////// +/* +* NEVERBONER +*/ /datum/brain_trauma/special/neverboner name = "Loss of libido" @@ -221,9 +217,9 @@ var/mob/living/carbon/human/affected_human = owner REMOVE_TRAIT(affected_human, TRAIT_NEVERBONER, APHRO_TRAIT) -//////////// -///SADISM/// -//////////// +/* +* SADISM +*/ /datum/quirk/sadism name = "Sadism" @@ -316,9 +312,10 @@ /datum/mood_event/sadistic description = span_purple("Others' suffering makes me happier\n") -////////////////// -///EMPATH BOUNS/// -////////////////// +/* +* EMPATH BONUS +*/ + /mob/living/carbon/human/examine(mob/user) . = ..() var/mob/living/examiner = user diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/bdsm_furniture.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/bdsm_furniture.dm index 17d2cc7353d..eabd5411603 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/bdsm_furniture.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/bdsm_furniture.dm @@ -56,9 +56,9 @@ . = ..() unbuckle_all_mobs(TRUE) -///////////////////// -//X-Stand code here// -///////////////////// +/* +* X-STAND +*/ /obj/structure/chair/x_stand name = "x stand" @@ -249,9 +249,9 @@ current_mob.update_abstract_handcuffed() current_mob = null -/////////////////////////// -//xstand construction kit// -/////////////////////////// +/* +* X-STAND CONSTRUCTION KIT +*/ /obj/item/x_stand_kit name = "xstand construction kit" diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm index 5afe27a2bc8..ead0bcacdee 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm @@ -159,9 +159,9 @@ qdel(src) return -//////////////////////////////////// -///CODE FOR TINY PILLOW FURNITURE/// -//////////////////////////////////// +/* +* TINY +*/ /obj/structure/bed/pillow_tiny name = "pillow" @@ -244,9 +244,9 @@ else return ..() -///////////////////////////////////// -///CODE FOR SMALL PILLOW FURNITURE/// -///////////////////////////////////// +/* +* SMALL +*/ /obj/structure/chair/pillow_small name = "small pillow pile" @@ -369,9 +369,9 @@ /obj/structure/chair/pillow_small/MouseDrop(over_object, src_location, over_location) return -///////////////////////// -///CODE FOR PILLOW BED/// -///////////////////////// +/* +* BED +*/ /obj/structure/bed/pillow_large name = "large pillow pile" diff --git a/modular_skyrat/modules/modular_weapons/code/autolathe_designs.dm b/modular_skyrat/modules/modular_weapons/code/autolathe_designs.dm index 23d59345159..7adbf6c3621 100644 --- a/modular_skyrat/modules/modular_weapons/code/autolathe_designs.dm +++ b/modular_skyrat/modules/modular_weapons/code/autolathe_designs.dm @@ -1,10 +1,6 @@ -//////////////////////// -//ID: MODULAR_WEAPONS // -//////////////////////// - -//////////////////////// -// AMMO // -//////////////////////// +/* +* AMMO +*/ // .32 - 15 damage pistol round. diff --git a/modular_skyrat/modules/modular_weapons/code/automatic.dm b/modular_skyrat/modules/modular_weapons/code/automatic.dm index 5599ee8ca09..7af7e411b23 100644 --- a/modular_skyrat/modules/modular_weapons/code/automatic.dm +++ b/modular_skyrat/modules/modular_weapons/code/automatic.dm @@ -1,8 +1,6 @@ -//////////////////////// -//ID: MODULAR_WEAPONS // -//////////////////////// - -// Magazines +/* +* MAGAZINES +*/ /obj/item/ammo_box/magazine/multi_sprite/cfa_wildcat name = "CFA Wildcat magazine (.34)" @@ -30,11 +28,12 @@ /obj/item/ammo_box/magazine/multi_sprite/cfa_wildcat/empty start_empty = 1 -/////////////// -// Wildcat // -/////////////// -// 3rnd burst .32 calibre, 15 damage. -// Fills the role of a low damage, high magazine capacity magdump gun. +/* +* WILDCAT +* 3rnd burst .32 calibre, 15 damage. +* Fills the role of a low damage, high magazine capacity magdump gun. +*/ + /obj/item/gun/ballistic/automatic/cfa_wildcat name = "\improper CFA Wildcat" desc = "A robust roller-delayed SMG chambered for .34 ammunition." @@ -58,9 +57,9 @@ /obj/item/gun/ballistic/automatic/cfa_wildcat/no_mag spawnwithmagazine = FALSE -/////////////// -// MP7 // -/////////////// +/* +* CFA LYNX +*/ /obj/item/gun/ballistic/automatic/cfa_lynx name = "\improper CFA Lynx" diff --git a/modular_skyrat/modules/modular_weapons/code/energy.dm b/modular_skyrat/modules/modular_weapons/code/energy.dm index d958d39df99..8d6c6f92355 100644 --- a/modular_skyrat/modules/modular_weapons/code/energy.dm +++ b/modular_skyrat/modules/modular_weapons/code/energy.dm @@ -1,7 +1,9 @@ -////////////////////// -// Bolt Responder // -////////////////////// -// A mini disabler with 12 shot capacity in comparison to the normal disabler's 20. +/* +* BOLT RESPONDER +* A mini disabler +* 12 shot capacity VS normal disabler's 20. +*/ + /obj/item/gun/energy/disabler/bolt_disabler name = "Bolt Responder" @@ -24,10 +26,11 @@ set_gun_light(new /obj/item/flashlight/seclite(src)) return ..() -////////////////////// -// CFA Phalanx // -////////////////////// -// Similar to the HoS's laser. Fires a bouncing non-lethal, lethal and knockdown projectile. +/* +* CFA PHALANX +* Similar to the HoS's laser +* Fires a bouncing non-lethal, lethal and knockdown projectile. +*/ /obj/item/gun/energy/e_gun/cfa_phalanx name = "\improper Mk.II Phalanx plasma blaster" @@ -42,10 +45,11 @@ has_gun_safety = FALSE cell_type = /obj/item/stock_parts/cell/hos_gun -////////////////////// -// CFA Paladin // -////////////////////// -// Identical to a heavy laser. +/* +* CFA PALADIN +* Identical to a heavy laser. +*/ + /obj/item/gun/energy/laser/cfa_paladin name = "\improper Mk.IV Paladin plasma carbine" @@ -57,10 +61,11 @@ charge_sections = 5 has_gun_safety = FALSE -////////////////////// -// Bounce Disabler // -////////////////////// -// It's a disabler that will always ricochet. +/* +* BOUNCE DISABLER +* A disabler that will always ricochet. +*/ + /obj/item/ammo_casing/energy/disabler/bounce projectile_type = /obj/projectile/beam/disabler/bounce @@ -91,14 +96,14 @@ ricochet_chance = 130 ricochet_decay_damage = 0.9 +// Allows the projectile to reflect on walls like how bullets ricochet. /obj/projectile/beam/disabler/bounce/check_ricochet_flag(atom/A) return TRUE -// Allows the projectile to reflect on walls like how bullets ricochet. -////////////////////// -// Bounce Laser // -////////////////////// -// It's a laser that will always ricochet. +/* +* BOUNCE LASER +* A laser that will always ricochet. +*/ /obj/item/ammo_casing/energy/laser/bounce projectile_type = /obj/projectile/beam/laser/bounce @@ -120,14 +125,14 @@ ricochet_chance = 130 ricochet_decay_damage = 0.9 +// Allows the projectile to reflect on walls like how bullets ricochet. /obj/projectile/beam/laser/bounce/check_ricochet_flag(atom/A) return TRUE -// Allows the projectile to reflect on walls like how bullets ricochet. -////////////////////// -// Knockdown Bolt // -////////////////////// -// A taser that had the same stamina impact as a disabler, but a five-second knockdown and taser hitter effects. +/* +* KNOCKDOWN BOLT +* A taser that had the same stamina impact as a disabler, but a five-second knockdown and taser hitter effects. +*/ /obj/item/ammo_casing/energy/electrode/knockdown projectile_type = /obj/projectile/energy/electrode/knockdown @@ -144,10 +149,13 @@ stamina = 30 range = 6 -////////////////////// -// Single Laser // -////////////////////// -// Has an unique sprite, it's a low-powered laser for rapid fire. Pea-shooter tier. +/* +* SINGLE LASER +* Has an unique sprite +* Low-powered laser for rapid fire +* Pea-shooter tier. +*/ + /obj/item/ammo_casing/energy/laser/single projectile_type = /obj/projectile/beam/laser/single @@ -165,10 +173,11 @@ speed = 0.5 armour_penetration = 10 -////////////////////// -// Double Laser // -////////////////////// -// Visually, this fires two lasers. In code, it's just one. It's fast and great for turrets. +/* +* DOUBLE LASER +* Visually, this fires two lasers. In code, it's just one. +* It's fast and great for turrets. +*/ /obj/item/ammo_casing/energy/laser/double projectile_type = /obj/projectile/beam/laser/double @@ -187,11 +196,11 @@ speed = 0.5 armour_penetration = 10 -////////////////////// -// Energy Bullets // -////////////////////// -// Ballistic gunplay but it allows us to target a different part of the armour block. -// Also allows the benefits of lasers (blobs strains, xenos) over bullets to be used with ballistic gunplay. +/* +* ENERGY BULLETS +* Ballistic gunplay but it allows us to target a different part of the armour block. +* Also allows the benefits of lasers (blobs strains, xenos) over bullets to be used with ballistic gunplay. +*/ /obj/item/ammo_casing/caseless/laser name = "type I plasma projectile" diff --git a/modular_skyrat/modules/modular_weapons/code/modular_projectiles.dm b/modular_skyrat/modules/modular_weapons/code/modular_projectiles.dm index 0cbb9a9eca3..89fd7aa06d9 100644 --- a/modular_skyrat/modules/modular_weapons/code/modular_projectiles.dm +++ b/modular_skyrat/modules/modular_weapons/code/modular_projectiles.dm @@ -1,9 +1,6 @@ -//////////////////////// -//ID: MODULAR_WEAPONS // -//////////////////////// - -//////////////////////// -////// .32 ACP ////// +/* +* .32 ACP +*/ /obj/item/ammo_casing/c32 name = ".32 bullet casing" @@ -56,9 +53,9 @@ fire_stacks = 1 wound_bonus = -90 -////// .32 ACP ////// -//////////////////////// -///// 10mm Magnum ///// +/* +* 10mm MAGNUM +*/ /obj/item/ammo_casing/c10mm/rubber name = "10mm Magnum rubber bullet casing" @@ -79,9 +76,9 @@ sharpness = NONE embedding = null -///// 10mm Magnum ///// -//////////////////////// -////// .45 ACP ////// +/* +* .45 ACP +*/ /obj/item/ammo_casing/c45/rubber name = ".45 rubber bullet casing" @@ -101,9 +98,9 @@ embedding = null wound_bonus = -50 -////// .45 ACP ////// -//////////////////////// -///// HK 4.6x30mm ///// +/* +* HK 4.6x30mm +*/ /obj/projectile/bullet/c46x30mm_rubber name = "4.6x30mm rubber bullet" @@ -124,9 +121,10 @@ projectile_type = /obj/projectile/bullet/c46x30mm_rubber harmful = FALSE -///// HK 4.6x30mm ///// -//////////////////////// -//// 5.56x30mm MARS //// +/* +* 5.56x30mm MARS +*/ + /obj/item/ammo_casing/a556/rubber name = "5.56mm rubber bullet casing" @@ -159,9 +157,9 @@ name = "5.56mm AP bullet" armour_penetration = 60 -//// 5.56x30mm MARS //// -//////////////////////// -////// 7.62 ////// +/* +* 7.62 +*/ /obj/item/ammo_casing/a762/rubber name = "7.62 rubber bullet casing" @@ -183,10 +181,11 @@ sharpness = NONE embedding = null -////// 7.62 ////// -//////////////////////// -///// 5.56x45mm ///// -// Very good at piercing armour at short range, not as good at going through armour at over 100m. But this is SS13... +/* +* 5.56x45mm +* Very good at piercing armour at short range +* Not as good at going through armour at over 100m. But this is SS13... +*/ /// The 5.56 you see pretty much everyone under NATO use. #define CALIBER_A556x45 "a556x45" @@ -205,10 +204,11 @@ wound_bonus = 20 bare_wound_bonus = 10 -///// 5.56x45mm ///// -//////////////////////// -////// .34 ACP ////// -// Why? Blame CFA, they want their bullets to be *proprietary* +/* +* .34 ACP +* Why? Blame CFA, they want their bullets to be *proprietary* +*/ + /obj/item/ammo_casing/c34 name = ".34 bullet casing" desc = "A .34 bullet casing." @@ -260,9 +260,9 @@ fire_stacks = 1 wound_bonus = -90 -////// .34 ACP ////// -//////////////////////// -////// 4.2x30mm ////// +/* +* 4.2x30mm +*/ /obj/item/ammo_casing/c42x30mm name = "4.2x30mm bullet casing" @@ -317,9 +317,9 @@ projectile_type = /obj/projectile/bullet/c42x30mm_rubber harmful = FALSE -////// 4.2x30mm ////// -//////////////////////// -////// 12mm ////// +/* +* 12mm +*/ /obj/item/ammo_casing/c12mm name = "12mm Magnum bullet casing" @@ -379,10 +379,9 @@ sharpness = NONE embedding = null -////// 12mm ////// -//////////////////////// -////// 6.8x43mm ////// - +/* +* 6.8x43mm +*/ /obj/item/ammo_casing/a68 name = "6.8mm bullet casing" @@ -397,5 +396,3 @@ armour_penetration = 10 wound_bonus = -45 wound_falloff_tile = 0 - -////// 6.8x43mm ////// diff --git a/modular_skyrat/modules/modular_weapons/code/pistol.dm b/modular_skyrat/modules/modular_weapons/code/pistol.dm index 61f64db38ff..ee2d59b6839 100644 --- a/modular_skyrat/modules/modular_weapons/code/pistol.dm +++ b/modular_skyrat/modules/modular_weapons/code/pistol.dm @@ -1,10 +1,6 @@ -//////////////////////// -//ID: MODULAR_WEAPONS // -//////////////////////// - -//////////////////////// -// PISTOLS // -//////////////////////// +/* +* PISTOLS +*/ /obj/item/gun/ballistic/automatic/pistol/cfa_snub name = "CFA Snub" @@ -38,9 +34,10 @@ /obj/item/gun/ballistic/automatic/pistol/cfa_ruby/empty spawnwithmagazine = FALSE -//////////////////////// -// AMMO // -//////////////////////// +/* +* AMMO +*/ + /obj/item/ammo_box/magazine/multi_sprite/cfa_snub name = "CFA Snub magazine (4.2x30mm)" desc = "An advanced magazine with smart type displays. Alt+click to reskin it." diff --git a/modular_skyrat/modules/modular_weapons/code/revolver.dm b/modular_skyrat/modules/modular_weapons/code/revolver.dm index 19f6f4e0f3e..5089ad6dbc3 100644 --- a/modular_skyrat/modules/modular_weapons/code/revolver.dm +++ b/modular_skyrat/modules/modular_weapons/code/revolver.dm @@ -1,21 +1,17 @@ -//////////////////////// -//ID: MODULAR_WEAPONS // -//////////////////////// - -/////////////// -// REVOLVERS // -/////////////// -// Revolving rifles! We have three versions. An improvised slower firing one, a normal one, and a golden premium one. -// The gold rifle uses .45, it's only 5 more points of damage unfortunately. Fun hint: A box of .45 bullets functions the same as a speedloader. -// +/* +* REVOLVERS +* Revolving rifles! We have three versions. An improvised slower firing one, a normal one, and a golden premium one. +* The gold rifle uses .45, it's only 5 more points of damage unfortunately. +* Fun hint: A box of .45 bullets functions the same as a speedloader. +*/ /obj/item/gun/ballistic/revolver/rifle name = "\improper .38 revolving rifle" desc = "A revolving rifle chambered in .38. " icon = 'modular_skyrat/modules/modular_weapons/icons/obj/guns/projectile40x32.dmi' icon_state = "revolving-rifle" - mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38 //This is just a detective's revolver but it's too big for bags.. - pixel_x = -4 // It's centred on a 40x32 pixel spritesheet. + mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38 //This is just a detective's revolver but it's too big for bags.. + pixel_x = -4 // It's centred on a 40x32 pixel spritesheet. w_class = WEIGHT_CLASS_BULKY weapon_weight = WEAPON_HEAVY // The entire purpose of this is that it's a bulky rifle instead of a revolver. slot_flags = ITEM_SLOT_BELT diff --git a/modular_skyrat/modules/modular_weapons/code/rifle.dm b/modular_skyrat/modules/modular_weapons/code/rifle.dm index 2747e08e1c8..72f9933a207 100644 --- a/modular_skyrat/modules/modular_weapons/code/rifle.dm +++ b/modular_skyrat/modules/modular_weapons/code/rifle.dm @@ -1,13 +1,8 @@ -//////////////////////// -//ID: MODULAR_WEAPONS // -//////////////////////// - -//////////////////////// -// IMPROVISED RIFLE // -//////////////////////// -// There was an improvised rifle on Cit/Skyrat, it's pretty cool so here it is too. -// We're using a slightly modified sprite designed around a Short Magazine Lee Enfield (SMLE) Mk.III -// +/* +* IMPROVISED RIFLE +* There was an improvised rifle on Cit/Skyrat, it's pretty cool so here it is too. +* We're using a slightly modified sprite designed around a Short Magazine Lee Enfield (SMLE) Mk.III +*/ /obj/item/ammo_box/magazine/internal/boltaction/improvised max_ammo = 1 @@ -28,12 +23,12 @@ pixel_x = -8 weapon_weight = WEAPON_HEAVY // It's big. -//////////////////////// -// IMPROVISED SHOTGUN // -//////////////////////// -// We're using the rifle because we want the bolt action so we can pretend it's a break action gun. -// On Skyrat/Cit there was a need to tone improvised weapons down due to their incredible ease of access. -// This is the same nerf, but drastically more fun. We now need two hands to fire and we have a slightly slower action. +/* +* IMPROVISED SHOTGUN +* We're using the rifle because we want the bolt action so we can pretend it's a break action gun. +* On Skyrat/Cit there was a need to tone improvised weapons down due to their incredible ease of access. +* This is the same nerf, but drastically more fun. We now need two hands to fire and we have a slightly slower action. +*/ /obj/item/gun/ballistic/rifle/ishotgun name = "improvised shotgun" @@ -113,9 +108,9 @@ sawn_off = TRUE slot_flags = ITEM_SLOT_BELT -//////////////////////// -// CFA RIFLE // -//////////////////////// +/* +* CFA RIFLE +*/ /obj/item/gun/ballistic/automatic/cfa_rifle name = "Cantanheim 6.8mm rifle" diff --git a/modular_skyrat/modules/mutants/code/mutant_cure.dm b/modular_skyrat/modules/mutants/code/mutant_cure.dm index 7990ad2369b..6be8dcaa794 100644 --- a/modular_skyrat/modules/mutants/code/mutant_cure.dm +++ b/modular_skyrat/modules/mutants/code/mutant_cure.dm @@ -322,8 +322,11 @@ #undef RECOMBINATION_STEP_TIME #undef RECOMBINATION_STEP_AMOUNT +/* +* Infection stuff +* You didn't think I wouldn't include this did you? +*/ -//////////////////////////////Infection stuff - You didn't think I wouldn't include this did you? /datum/reagent/hnz name = "HNZ-1" description = "HNZ-1 is a highly experimental viral bioterror agent \ diff --git a/modular_skyrat/modules/planets/code/rockplanet.dm b/modular_skyrat/modules/planets/code/rockplanet.dm index 0e05158620c..5169688a066 100644 --- a/modular_skyrat/modules/planets/code/rockplanet.dm +++ b/modular_skyrat/modules/planets/code/rockplanet.dm @@ -1,4 +1,6 @@ -////////////////////////MAP GENERATOR//////////////////////////////// +/* +* MAP GENERATOR +*/ /datum/map_generator/cave_generator/rockplanet open_turf_types = list(/turf/open/misc/asteroid/lowpressure = 1) diff --git a/modular_skyrat/modules/sec_haul/code/guns/ammo.dm b/modular_skyrat/modules/sec_haul/code/guns/ammo.dm index fb1437ad012..34b98f4495f 100644 --- a/modular_skyrat/modules/sec_haul/code/guns/ammo.dm +++ b/modular_skyrat/modules/sec_haul/code/guns/ammo.dm @@ -9,9 +9,9 @@ design_ids = list("smartgun") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 3000) -////////////////////// -//6mm -////////////////////// +/* +* 6mm +*/ /obj/item/ammo_box/advanced/b6mm name = "6.3mm ammo box" @@ -32,9 +32,9 @@ icon_state = "box10mm-hv" ammo_type = /obj/item/ammo_casing/b6mm/ihdf -////////////////////// -//9mm -////////////////////// +/* +* 9mm +*/ /obj/item/ammo_box/advanced/b9mm name = "9x19mm FMJ box" @@ -61,9 +61,9 @@ icon_state = "pistol_hv" ammo_type = /obj/item/ammo_casing/b9mm/ihdf -////////////////////// -//10mm -////////////////////// +/* +* 10mm +*/ /obj/item/ammo_box/advanced/b10mm name = "10mm auto box" @@ -90,9 +90,9 @@ icon_state = "box50-hv" ammo_type = /obj/item/ammo_casing/b10mm/ihdf -////////////////////// -//12mm -////////////////////// +/* +* 12mm +*/ /obj/item/ammo_box/advanced/b12mm name = "12.7x30mm FMJ box" @@ -113,9 +113,10 @@ icon_state = "magnum_p" ammo_type = /obj/item/ammo_casing/b12mm/hp -////////////////////// -//SMARTGUN -////////////////////// +/* +* S.M.A.R.T. RIFLE +*/ + /datum/design/smartgun name = "\improper S.M.A.R.T. Rifle Shock-Rails" id = "smartgun" @@ -133,9 +134,10 @@ multiple_sprites = AMMO_BOX_PER_BULLET max_ammo = 4 -//////////////////// -//MULTI SPRITE MAGS -/////////////////// +/* +* MULTI-SPRITE MAGS +*/ + /obj/item/ammo_box/magazine/multi_sprite icon = 'modular_skyrat/modules/sec_haul/icons/guns/mags.dmi' desc = "An advanced magazine with smart type displays. Alt+click to reskin it." @@ -206,9 +208,9 @@ if(stored_ammo.len) . += "[initial(icon_state)]_[round_type]" -//////////////////////////// -///////////14 GAUGE///////// -//////////////////////////// +/* +* 14 GAUGE +*/ /obj/item/ammo_casing/s14gauge name = "14 gauge shotgun slug" diff --git a/modular_skyrat/modules/sec_haul/code/guns/armory_spawns.dm b/modular_skyrat/modules/sec_haul/code/guns/armory_spawns.dm index 6f78cf18e28..c1421a742e0 100644 --- a/modular_skyrat/modules/sec_haul/code/guns/armory_spawns.dm +++ b/modular_skyrat/modules/sec_haul/code/guns/armory_spawns.dm @@ -61,7 +61,10 @@ new /obj/item/storage/box/rubbershot(src) new /obj/item/storage/box/rubbershot(src) -//////////////////////////AMMO BOXES +/* +* AMMO BOXES +*/ + /obj/item/storage/box/ammo_box name = "ammo box" desc = "A box filled with ammunition." diff --git a/modular_skyrat/modules/sec_haul/code/guns/bullets.dm b/modular_skyrat/modules/sec_haul/code/guns/bullets.dm index 16864368854..6e0572a9817 100644 --- a/modular_skyrat/modules/sec_haul/code/guns/bullets.dm +++ b/modular_skyrat/modules/sec_haul/code/guns/bullets.dm @@ -2,9 +2,11 @@ icon = 'modular_skyrat/modules/sec_haul/icons/guns/projectiles.dmi' icon_state = "bullet" -////////////6.3mm/////////// -//FLECHETTE | FRAGMENTING | DISSUASIVE// -////////////////////////// +/* +* 6.3mm +* FLECHETTE | FRAGMENTING | DISSUASIVE +*/ + /obj/item/ammo_casing/b6mm name = "6.3mm flechette casing" desc = "A spent flechette." @@ -59,9 +61,11 @@ embedding = list(embed_chance=60, fall_chance=3, jostle_chance=4, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10) weak_against_armour = TRUE -///////////9x19mm///////////////// -//FMJ | JHP | IHDF | RUBBER// -/////////////////////////////// +/* +* 9x19mm +* FMJ | JHP | IHDF | RUBBER +*/ + /obj/item/ammo_casing/b9mm name = "9x19mm peacekeeper FMJ casing" desc = "A 9x19mm bullet casing with a low powder load to prevent breaches." @@ -126,9 +130,11 @@ sharpness = NONE embedding = null -//////////10x25mm///////////////// -//Auto | JHP | IHDF | RUBBER// -/////////////////////////////// +/* +* 10x25mm +* Auto | JHP | IHDF | RUBBER +*/ + /obj/item/ammo_casing/b10mm name = "10mm auto casing" desc = "A 10mm Auto casing." @@ -197,9 +203,11 @@ damage_type = STAMINA embedding = list(embed_chance=0, fall_chance=3, jostle_chance=4, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10) -///////////12.7x30mm///////// -//FMJ | JHP | BEANBAG// -//////////////////////// +/* +* 12.7x30mm +* FMJ | JHP | BEANBAG +*/ + /obj/item/ammo_casing/b12mm name = "12.7x30mm FMJ casing" desc = "A 12.7x30mm FMJ casing." @@ -253,9 +261,10 @@ embedding = list(embed_chance=75, fall_chance=3, jostle_chance=4, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10) weak_against_armour = TRUE -///////////.577S///////// -// FMJ // -//////////////////////// +/* +* .577S +* FMJ +*/ /obj/item/ammo_casing/b577 name = ".577 Snider bullet casing" @@ -309,9 +318,11 @@ icon_state = "smartgun_embed" embedding = null -///////4.73x33mm CASELESS////// -//FMJ | JHP | IHDF | RUBBER// -/////////////////////////////// +/* +* 4.73x33mm CASELESS +* FMJ | JHP | IHDF | RUBBER +*/ + /obj/item/ammo_casing/caseless/b473 name = "4.73x33mm FMJ bullet" desc = "A 4.73x33mm FMJ bullet." @@ -380,9 +391,9 @@ damage_type = STAMINA embedding = list(embed_chance=0, fall_chance=3, jostle_chance=4, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10) -//////////////////////////// -///////////14 GAUGE///////// -//////////////////////////// +/* +* 14 GAUGE +*/ /obj/projectile/bullet/s14gauge_slug name = "12g shotgun slug" diff --git a/modular_skyrat/modules/sec_haul/code/guns/guns.dm b/modular_skyrat/modules/sec_haul/code/guns/guns.dm index 6b2eae458c6..f3906eba825 100644 --- a/modular_skyrat/modules/sec_haul/code/guns/guns.dm +++ b/modular_skyrat/modules/sec_haul/code/guns/guns.dm @@ -14,7 +14,10 @@ if(!emp_damageable) . += "It has an EMP prevention system." -//////////////////GLOCK +/* +* GLOCK +*/ + /obj/item/gun/ballistic/automatic/pistol/g17 name = "\improper GK-17" desc = "A weapon from bygone times, this has been made to look like an old, blocky firearm from the 21st century. Let's hope it's more reliable. Chambered in 9x19mm Peacekeeper." @@ -114,8 +117,10 @@ emp_damageable = FALSE fire_delay = 0.9 company_flag = null +/* +* PDH 40x32 +*/ -////////////////PDH 40x32 /obj/item/gun/ballistic/automatic/pistol/pdh name = "\improper PDH-6H 'Osprey'" desc = "A modern ballistics sidearm, used primarily by the military, however this one has had a paintjob to match command. It's chambered in 12.7x30mm." @@ -196,8 +201,10 @@ multiple_sprites = AMMO_BOX_FULL_EMPTY_BASIC possible_types = list("lethal" = AMMO_TYPE_LETHAL) +/* +* PDH PEACEKEEPER +*/ -///////////////////////////PDH PEACEKEEPER /obj/item/gun/ballistic/automatic/pistol/pdh/peacekeeper name = "\improper PDH-6B" desc = "A modern ballistic sidearm, used primarily by law enforcement, chambered in 9x19mm Peacekeeper." @@ -230,7 +237,10 @@ ammo_type = /obj/item/ammo_casing/b9mm/rubber round_type = AMMO_TYPE_RUBBER -///////////////////////LADON 40x32 +/* +* LADON 40x32 +*/ + /obj/item/gun/ballistic/automatic/pistol/ladon name = "\improper Ladon pistol" desc = "Modern handgun based off the PDH series, chambered in 10mm Auto." @@ -274,7 +284,10 @@ ammo_type = /obj/item/ammo_casing/b10mm/rubber round_type = AMMO_TYPE_RUBBER -/////////////////////MAKAROV +/* +* MAKAROV +*/ + /obj/item/gun/ballistic/automatic/pistol/makarov name = "\improper R-C 'Makarov'" desc = "A mediocre pocket-sized handgun of seemingly Russian origin, chambered in 10mm Auto." @@ -311,7 +324,9 @@ ammo_type = /obj/item/ammo_casing/b10mm/rubber round_type = AMMO_TYPE_RUBBER -////////////////////////////MK58 +/* +* MK-58 +*/ /obj/item/gun/ballistic/automatic/pistol/mk58 name = "\improper MK-58" @@ -351,7 +366,10 @@ ammo_type = /obj/item/ammo_casing/b9mm/rubber round_type = AMMO_TYPE_RUBBER -//////////////////////FIREFLY +/* +* FIREFLY +*/ + /obj/item/gun/ballistic/automatic/pistol/firefly name = "\improper P-92 'Firefly'" desc = "A 9mm (Peacekeeper) sidearm made by Armadyne's Medical Directive, with a heavy front for weak wrists. A small warning label on the back says it's not fit for surgical work." @@ -389,8 +407,10 @@ /obj/item/ammo_box/magazine/multi_sprite/firefly/ihdf ammo_type = /obj/item/ammo_casing/b9mm/ihdf round_type = AMMO_TYPE_IHDF +/* +* CROON 40x32 +*/ -/////////////////////CROON 40x32 /obj/item/gun/ballistic/automatic/croon name = "\improper DT-4 'Croon'" desc = "A low-quality 6.3mm reproduction of a popular SMG model, jams like a bitch. Although crude and unofficial, it gets the job done." @@ -435,7 +455,10 @@ ammo_type = /obj/item/ammo_casing/b6mm/ihdf round_type = AMMO_TYPE_IHDF -///////////////////////////Dozer +/* +* DOZER +*/ + /obj/item/gun/ballistic/automatic/dozer name = "\improper DZR-9 'Dozer'" desc = "The DZR-9, a notorious 9x25mm PDW that lives up to its nickname." @@ -482,7 +505,10 @@ ammo_type = /obj/item/ammo_casing/c9mm/fire round_type = AMMO_TYPE_INCENDIARY -/////////////////DMR 40x32 +/* +* DMR 40x32 +*/ + /obj/item/gun/ballistic/automatic/dmr name = "\improper M557 'Ripper' Gen-2" desc = "An incredibly powerful marksman rifle with an internal stabilization gymbal. It's chambered in .577 Snider." @@ -515,7 +541,10 @@ max_ammo = 25 multiple_sprites = AMMO_BOX_FULL_EMPTY_BASIC -/////////////////////////////////////////////ZETA +/* +* ZETA +*/ + /obj/item/gun/ballistic/revolver/zeta name = "\improper Zeta-6 'Spurchamber'" desc = "A fairly common double-action six-shooter chambered for 10mm Magnum." @@ -548,7 +577,10 @@ /obj/item/ammo_box/revolver/zeta/full start_empty = FALSE -/////////////////////////////////////////////////////////REVOLUTION +/* +* REVOLUTION +*/ + /obj/item/gun/ballistic/revolver/revolution name = "\improper Revolution-8 'Spurmaster'" desc = "The Zeta 6's distant cousin, sporting an eight-round competition grade cylinder chambered for 9mm Peacekeeper." @@ -581,7 +613,10 @@ /obj/item/ammo_box/revolver/revolution/full start_empty = FALSE -/////////////////SMARTGUN 40x32 +/* +* S.M.A.R.T. RIFLE +*/ + /obj/item/gun/ballistic/automatic/smartgun name = "\improper OP-15 'S.M.A.R.T.' rifle" desc = "Suppressive Manual Action Reciprocating Taser rifle. A modified version of an Armadyne heavy machine gun fitted to fire miniature shock-bolts." @@ -674,9 +709,9 @@ new /obj/item/ammo_box/magazine/smartgun(src) new /obj/item/ammo_box/magazine/smartgun(src) -////////////////////////////////////////////////////////// -/////////////////KRAUT SPACE MAGIC G11//////////////////// -////////////////////////////////////////////////////////// +/* +* G11 +*/ /obj/item/gun/ballistic/automatic/g11 name = "\improper G11 K-490" @@ -722,9 +757,9 @@ ammo_type = /obj/item/ammo_casing/caseless/b473/ihdf round_type = AMMO_TYPE_IHDF -///////////////////////////////////////////////// -//////////////////SHOTGUNS/////////////////////// -///////////////////////////////////////////////// +/* +* SHOTGUNS +*/ /obj/item/gun/ballistic/shotgun/m23 name = "\improper Model 23-37" @@ -819,11 +854,14 @@ /obj/item/ammo_box/magazine/sas14/stunslug ammo_type = /obj/item/ammo_casing/s14gauge/stunslug -///////////////////////////////////////////////// -///////////////Un-Goofed Guns//////////////////// -///////////////////////////////////////////////// +/* +* UN-GOOFED GUNS +*/ + +/* +* NORWIND +*/ -/////////////////////NORWIND /obj/item/gun/ballistic/automatic/norwind name = "\improper M112 'Norwind'" desc = "A rare M112 DMR rechambered to 12.7x30mm for peacekeeping work, it comes with a scope for medium-long range engagements. A bayonet lug is visible." @@ -877,7 +915,10 @@ ammo_type = /obj/item/ammo_casing/b12mm/rubber round_type = AMMO_TYPE_RUBBER -/////////////////////VINTOREZ +/* +* VINTOREZ +*/ + /obj/item/gun/ballistic/automatic/vintorez name = "\improper VKC 'Vintorez'" desc = "The VKC Vintorez is a lightweight integrally-suppressed scoped carbine usually employed in stealth operations. It was rechambered to 9x19mm for peacekeeping work." @@ -931,7 +972,9 @@ ammo_type = /obj/item/ammo_casing/b9mm/rubber round_type = AMMO_TYPE_RUBBER -/////////////////////PCR +/* +* PCR-9 +*/ /obj/item/gun/ballistic/automatic/pcr name = "\improper PCR-9 SMG" @@ -1027,7 +1070,10 @@ ammo_type = /obj/item/ammo_casing/b10mm/rubber round_type = AMMO_TYPE_RUBBER -/////////////////DTR +/* +* DTR-6 +*/ + /obj/item/gun/ballistic/automatic/ostwind name = "\improper DTR-6 Rifle" desc = "A 6.3mm special-purpose rifle designed for specific situations." diff --git a/modular_skyrat/modules/sec_haul/code/guns/token_system/gunsets.dm b/modular_skyrat/modules/sec_haul/code/guns/token_system/gunsets.dm index 798b20ff2ec..70d1162a51d 100644 --- a/modular_skyrat/modules/sec_haul/code/guns/token_system/gunsets.dm +++ b/modular_skyrat/modules/sec_haul/code/guns/token_system/gunsets.dm @@ -1,6 +1,6 @@ -/////////////// -//GUNSET BOXES -////////////// +/* +* GUNSET BOXES +*/ /obj/item/storage/box/gunset name = "gun supply box" @@ -42,16 +42,18 @@ opened = !opened update_icon() -/////////////////// -//GUN SETS -////////////////// +/* +* GUN SETS +*/ +/* +* SIDEARMS +*/ -///////////////// -//SIDEARM TOKEN GUNSETS -//////////////// +/* +* G-17 +*/ -//G-17 /obj/item/storage/box/gunset/glock17 name = "GK-17 supply box" @@ -67,7 +69,10 @@ new /obj/item/ammo_box/magazine/multi_sprite/g17(src) new /obj/item/ammo_box/magazine/multi_sprite/g17(src) -//LADON +/* +* LADON +*/ + /obj/item/storage/box/gunset/ladon name = "p-3 ladon supply box" @@ -82,7 +87,10 @@ new /obj/item/ammo_box/magazine/multi_sprite/ladon(src) new /obj/item/ammo_box/magazine/multi_sprite/ladon(src) -//DOZER +/* +* DOZER +*/ + /obj/item/storage/box/gunset/dozer name = "dozer supply box" @@ -96,7 +104,10 @@ new /obj/item/ammo_box/magazine/multi_sprite/dozer(src) new /obj/item/ammo_box/magazine/multi_sprite/dozer(src) -//PDH +/* +* PDH +*/ + /obj/item/storage/box/gunset/pdh_peacekeeper name = "9x19mm handgun supply box" desc = "Ideally contains a fast-firing 9x19mm Pistol." @@ -112,7 +123,10 @@ new /obj/item/ammo_box/magazine/multi_sprite/pdh_peacekeeper(src) new /obj/item/ammo_box/magazine/multi_sprite/pdh_peacekeeper(src) -// MK-58 +/* +* MK-58 +*/ + /obj/item/storage/box/gunset/mk58 name = "mk-58 supply box" @@ -127,7 +141,10 @@ new /obj/item/ammo_box/magazine/multi_sprite/mk58(src) new /obj/item/ammo_box/magazine/multi_sprite/mk58(src) -//CROON +/* +* CROON +*/ + /obj/item/storage/box/gunset/croon name = "weathered supply box" desc = "Ideally contains a cheap 6mm SMG." @@ -143,7 +160,10 @@ new /obj/item/ammo_box/magazine/multi_sprite/croon(src) new /obj/item/ammo_box/magazine/multi_sprite/croon(src) -//MAKAROV +/* +* MAKAROV +*/ + /obj/item/storage/box/gunset/makarov name = "makarov supply box" @@ -159,7 +179,10 @@ new /obj/item/ammo_box/magazine/multi_sprite/makarov(src) new /obj/item/ammo_box/magazine/multi_sprite/makarov(src) -//ZETA +/* +* ZETA +*/ + /obj/item/storage/box/gunset/zeta name = "10mm Magnum revolver supply box" desc = "Ideally contains a slow-firing revolver that packs a punch." @@ -172,7 +195,10 @@ new /obj/item/ammo_box/revolver/zeta(src) new /obj/item/ammo_box/c10mm(src) -//REVOLUTION +/* +* REVOLUTION +*/ + /obj/item/storage/box/gunset/revolution name = "revolution supply box" @@ -184,11 +210,14 @@ new /obj/item/ammo_box/revolver/revolution(src) new /obj/item/ammo_box/advanced/b9mm(src) -///////////////// -//PRIMARY TOKEN GUNSETS -//////////////// +/* +* PRIMARIES +*/ + +/* +* PCR-9 +*/ -///////PCR-9 /obj/item/storage/box/gunset/pcr name = "9mm SMG supply box" desc = "Ideally contains a 9x19mm SMG with decent firerate." @@ -204,7 +233,9 @@ new /obj/item/ammo_box/magazine/multi_sprite/pcr(src) new /obj/item/ammo_box/magazine/multi_sprite/pcr(src) -////M112 +/* +* NORWIND +*/ /obj/item/storage/box/gunset/norwind name = "12.7x30mm DMR supply box." @@ -221,7 +252,9 @@ new /obj/item/ammo_box/magazine/multi_sprite/norwind(src) new /obj/item/ammo_box/magazine/multi_sprite/norwind(src) -//////DTR-6 +/* +* OSTWIND +*/ /obj/item/storage/box/gunset/ostwind name = "6mm SPR box." @@ -238,7 +271,9 @@ new /obj/item/ammo_box/magazine/multi_sprite/ostwind(src) new /obj/item/ammo_box/magazine/multi_sprite/ostwind(src) -////////PITBULL +/* +* PITBULL +*/ /obj/item/storage/box/gunset/pitbull name = "10mm PDW supply box" @@ -255,11 +290,14 @@ new /obj/item/ammo_box/magazine/multi_sprite/pitbull(src) new /obj/item/ammo_box/magazine/multi_sprite/pitbull(src) -///////////////// -//JOB SPECIFIC GUNSETS -//////////////// +/* +* JOB-SPECIFIC +*/ + +/* +* CAPTAIN +*/ -//CAPTAIN /obj/item/storage/box/gunset/pdh_captain name = "pdh 'socom' supply box" w_class = WEIGHT_CLASS_NORMAL @@ -275,7 +313,10 @@ new /obj/item/ammo_box/magazine/multi_sprite/pdh(src) new /obj/item/ammo_box/magazine/multi_sprite/pdh(src) -//HOS +/* +* HOS +*/ + /obj/item/storage/box/gunset/glock18_hos name = "GK-18 supply box" desc = "Ideally contains a fast-firing 9x19mm pistol made out of cheap plastic." @@ -292,7 +333,10 @@ new /obj/item/ammo_box/magazine/multi_sprite/g18(src) new /obj/item/ammo_box/magazine/multi_sprite/g18/ihdf(src) -//HOP +/* +* HOP +*/ + /obj/item/storage/box/gunset/pdh name = "pdh 'osprey' supply box" w_class = WEIGHT_CLASS_NORMAL @@ -308,7 +352,10 @@ new /obj/item/ammo_box/magazine/multi_sprite/pdh(src) new /obj/item/ammo_box/magazine/multi_sprite/pdh(src) -//CORPO +/* +* CORPO +*/ + /obj/item/storage/box/gunset/pdh_corpo name = "pdh 'corporate' supply box" w_class = WEIGHT_CLASS_NORMAL @@ -323,7 +370,7 @@ new /obj/item/ammo_box/magazine/multi_sprite/pdh_corpo(src) new /obj/item/ammo_box/magazine/multi_sprite/pdh_corpo(src) -//////KRAUT SPACE MAGIC! +// KRAUT SPACE MAGIC! /obj/item/storage/box/gunset/g11 name = "g11 supply box" @@ -338,7 +385,10 @@ new /obj/item/ammo_box/magazine/multi_sprite/g11(src) new /obj/item/ammo_box/magazine/multi_sprite/g11(src) -//SECURITY MEDIC +/* +* SEC MEDIC +*/ + /obj/item/storage/box/gunset/firefly name = "9x19mm special pistol supply box" desc = "Ideally contains a special 9x19mm Pistol." @@ -354,7 +404,10 @@ new /obj/item/ammo_box/magazine/multi_sprite/firefly(src) new /obj/item/ammo_box/magazine/multi_sprite/firefly(src) -//LASER +/* +* LASER +*/ + /obj/item/storage/box/gunset/laser name = "laser gun supply box" @@ -368,7 +421,10 @@ . = ..() new /obj/item/gun/energy/e_gun(src) -//PEPPERBALLS +/* +* PEPPERBALLS +*/ + /obj/item/storage/box/gunset/pepperball name = "pepperball supply box" w_class = WEIGHT_CLASS_NORMAL @@ -384,9 +440,10 @@ new /obj/item/ammo_box/magazine/pepperball(src) -///////////////// -//SHOTGUN GUNSETS -//////////////// +/* +* SHOTGUNS +*/ + /obj/item/storage/box/gunset/m23 name = "m23 supply box" diff --git a/modular_skyrat/modules/sec_haul/code/guns/token_system/token_system.dm b/modular_skyrat/modules/sec_haul/code/guns/token_system/token_system.dm index 7108ab8479f..a3507db9627 100644 --- a/modular_skyrat/modules/sec_haul/code/guns/token_system/token_system.dm +++ b/modular_skyrat/modules/sec_haul/code/guns/token_system/token_system.dm @@ -1,7 +1,6 @@ - -////////////////// -//TOKEN SYSTEM -///////////////// +/* +* GUN VENDOR +*/ /obj/machinery/gun_vendor name = "Armadyne weapons dispensary" @@ -60,9 +59,9 @@ /obj/machinery/gun_vendor/no_alert requires_alert = FALSE -//////////////////// -//TOKENS -//////////////////// +/* +* TOKENS +*/ /obj/item/armament_token icon = 'modular_skyrat/modules/sec_haul/icons/guns/gunsets.dmi' @@ -73,7 +72,10 @@ /obj/item/armament_token/proc/get_available_gunsets() return FALSE -//Sidearm +/* +* SIDEARMS +*/ + /obj/item/armament_token/sidearm name = "sidearm armament holochip" desc = "A holochip used in any armament vendor, this is for sidearms. Do not bend." @@ -107,7 +109,7 @@ ), ) -//BAD BOY! +// BAD BOY! /obj/item/armament_token/sidearm_blackmarket name = "blackmarket armament holochip" desc = "A holochip used in any armament vendor, this is for |bad people|. Do not bend." @@ -132,7 +134,10 @@ ) -//Primary +/* +* PRIMARIES +*/ + /obj/item/armament_token/primary name = "primary armament holochip" desc = "A holochip used in any armament vendor, this is for main arms. Do not bend." diff --git a/modular_skyrat/modules/singularity_engine/code/particle_accelerator/generator.dm b/modular_skyrat/modules/singularity_engine/code/particle_accelerator/generator.dm index 76810b1dcfc..9a44c1f3f73 100644 --- a/modular_skyrat/modules/singularity_engine/code/particle_accelerator/generator.dm +++ b/modular_skyrat/modules/singularity_engine/code/particle_accelerator/generator.dm @@ -1,4 +1,7 @@ -/////SINGULARITY SPAWNER +/* +* SINGULARITY SPAWNER +*/ + /obj/machinery/the_singularitygen name = "gravitational singularity generator" desc = "An odd device which produces a Gravitational Singularity when set up." diff --git a/modular_skyrat/modules/singularity_engine/code/particle_accelerator/particle_accelerator.dm b/modular_skyrat/modules/singularity_engine/code/particle_accelerator/particle_accelerator.dm index 392c4ddf2a2..4275ce0f255 100644 --- a/modular_skyrat/modules/singularity_engine/code/particle_accelerator/particle_accelerator.dm +++ b/modular_skyrat/modules/singularity_engine/code/particle_accelerator/particle_accelerator.dm @@ -152,10 +152,9 @@ return 1 return 0 -/////////// -// PARTS // -/////////// - +/* +* PARTS +*/ /obj/structure/particle_accelerator/end_cap name = "alpha particle generation array" diff --git a/modular_skyrat/modules/verbs/code/subtle.dm b/modular_skyrat/modules/verbs/code/subtle.dm index 3dd7ca230be..0b946ccf66f 100644 --- a/modular_skyrat/modules/verbs/code/subtle.dm +++ b/modular_skyrat/modules/verbs/code/subtle.dm @@ -63,8 +63,9 @@ else user.visible_message(message = subtle_message, self_message = subtle_message, vision_distance = 1, separation = space) - -///////////////// SUBTLE 2: NO GHOST BOOGALOO +/* +* SUBTLE 2: NO GHOST BOOGALOO +*/ /datum/emote/living/subtler key = "subtler" @@ -124,7 +125,10 @@ else user.visible_message(message = subtler_message, self_message = subtler_message, vision_distance = 1, ignored_mobs = GLOB.dead_mob_list, separation = space) -///////////////// VERB CODE +/* +* VERB CODE +*/ + /mob/living/proc/subtle_keybind() var/message = input(src, "", "subtle") as text|null if(!length(message)) @@ -134,21 +138,24 @@ /mob/living/verb/subtle() set name = "Subtle" set category = "IC" - if(GLOB.say_disabled) //This is here to try to identify lag problems + if(GLOB.say_disabled) // This is here to try to identify lag problems to_chat(usr, span_danger("Speech is currently admin-disabled.")) return usr.emote("subtle") -///////////////// VERB CODE 2 +/* +* VERB CODE 2 +*/ + /mob/living/verb/subtler() set name = "Subtler Anti-Ghost" set category = "IC" - if(GLOB.say_disabled) //This is here to try to identify lag problems + if(GLOB.say_disabled) // This is here to try to identify lag problems to_chat(usr, span_danger("Speech is currently admin-disabled.")) return usr.emote("subtler") -//This is bad code. +// This is bad code. /atom/proc/audible_message_subtler(message, deaf_message, hearing_distance = DEFAULT_MESSAGE_RANGE, list/ignored_mobs, self_message, audible_message_flags = NONE, separation = " ") var/list/hearers = get_hearers_in_view(hearing_distance, src) if(self_message)