From e174881f69649e13ce3ea54f10b0e6cbc3defb9e Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Tue, 18 Mar 2025 16:37:54 +0100 Subject: [PATCH] enable greps properly (#10454) --- modular_chomp/code/coalesce_ch.dm | 2 +- .../code/datums/autolathe/general_ch.dm | 2 +- .../code/datums/supplypacks/medical.dm | 2 +- .../code/datums/supplypacks/science.dm | 2 +- .../code/datums/supplypacks/security.dm | 2 +- .../{ => code}/datums/tgs_event_handler.dm | 0 .../code/game/machinery/autolathe_armory.dm | 2 +- .../game/machinery/bluespace_denier.dm | 0 .../{ => code}/game/machinery/buttons.dm | 0 .../code/game/machinery/food_replicator.dm | 2 +- .../{ => code}/game/machinery/traptiles.dm | 2 +- .../{ => code}/game/machinery/turrets.dm | 2 +- .../game/mecha/mecha_construction_paths.dm | 2 +- modular_chomp/code/game/mecha/mecha_parts.dm | 2 +- modular_chomp/code/game/mecha/secert/hades.dm | 2 +- .../game/objects}/effects/simple_portals.dm | 0 .../game/objects}/effects/spawner.dm | 0 .../game/objects/effects/spiders.dm | 2 +- .../game/objects/effects/step_triggers.dm | 0 .../items/clockwork/ratvarian_spear.dm | 1 - .../objects/items/weapons/storage/backpack.dm | 2 +- .../code/game/objects/structures/flora.dm | 2 +- .../objects/structures/tyr_project_props.dm | 2 +- .../{ => code}/game/objects/trash_eating.dm | 0 .../game/turfs/simulated/blackholeturfs.dm | 2 +- .../turfs/simulated}/shuttlewall_types.dm | 0 .../game/turfs/simulated}/shuttlewalls.dm | 0 .../turfs/simulated}/shuttlewalls_attacks.dm | 0 .../turfs/simulated}/shuttlewalls_icon.dm | 2 +- .../loadout/loadout_general.dm | 2 +- .../preference_setup/loadout/loadout_shoes.dm | 2 +- .../code/modules/clothing/head/misc.dm | 2 +- .../rig/modules/specific/mounted_gun.dm | 2 +- .../modules/clothing/spacesuits/rig/other.dm | 2 +- .../modules/clothing/spacesuits/void/void.dm | 2 +- .../code/modules/clothing/suits/armor.dm | 2 +- .../code/modules/economy/cash_register.dm | 2 +- .../code/modules/event/dangerinfestation.dm | 2 +- .../modules/event/heavydangerinfestation.dm | 2 +- .../code/modules/hydro/plantsstorage.dm | 2 +- .../code/modules/materials/materials/gems.dm | 2 +- .../materials/materials/metals/metals.dm | 2 +- .../materials/organic/animal_products.dm | 2 +- modular_chomp/code/modules/mining/tools.dm | 2 +- .../simple_mob/subtypes/horror/Master.dm | 4 +-- .../subtypes/humanoid/eclipse/lore.dm | 2 +- .../subtypes/humanoid/eclipse/mechas.dm | 2 +- .../subtypes/humanoid/starhunters/passive.dm | 2 +- .../simple_mob/subtypes/mechanical/disbot.dm | 2 +- .../subtypes/mechanical/hivebot/hivebot.dm | 2 +- .../mechanical/hivebot/orginalAlts.dm | 2 +- .../subtypes/mechanical/hivebot/tank.dm | 2 +- .../subtypes/mechanical/mecha/gygax.dm | 2 +- .../living/simple_mob/subtypes/vore/ashy.dm | 2 +- .../simple_mob/subtypes/vore/cave_lamia.dm | 2 +- .../simple_mob/subtypes/vore/smokestar.dm | 2 +- modular_chomp/code/modules/paperwork/pen.dm | 2 +- modular_chomp/code/modules/planet/sif.dm | 2 +- .../code/modules/projectiles/guns/alts.dm | 2 +- .../code/modules/projectiles/guns/phase.dm | 2 +- .../code/modules/projectiles/guns/special.dm | 2 +- .../code/modules/projectiles/guns/staffs.dm | 2 +- modular_chomp/code/modules/spells/spells.dm | 2 +- modular_chomp/code/modules/tickets/tickets.dm | 2 +- modular_chomp/code/modules/weapons/melee.dm | 2 +- modular_chomp/code/modules/weapons/staves.dm | 2 +- .../xenobio/machinery/monkey_processor.dm | 2 +- .../icons/mob/screen_full_vore_ch_credits.txt | 2 -- .../maps/overmap/aegis_carrier/aegis_objs.dm | 2 +- .../relic_base/items/clothing/sc_accessory.dm | 2 +- .../maps/relic_base/items/clothing/sc_suit.dm | 2 +- .../relic_base/loadout/loadout_accessories.dm | 2 +- .../maps/relic_base/loadout/loadout_head.dm | 2 +- .../maps/relic_base/loadout/loadout_vr.dm | 2 +- .../maps/relic_base/relicbase_elevator.dm | 2 +- .../maps/relic_base/relicbase_events.dm | 2 +- .../maps/relic_base/relicbase_jobs.dm | 2 +- modular_chomp/maps/relic_base/shuttles/ert.dm | 2 +- .../maps/relic_base/shuttles/heist.dm | 2 +- .../maps/relic_base/shuttles/merc.dm | 2 +- .../maps/relic_base/shuttles/ninja.dm | 2 +- .../relic_base/submaps/gateway/BaseBlep.dm | 2 +- .../submaps/gateway/hiddeneclipse.dm | 2 +- .../relic_base/submaps/gateway/maddnesslab.dm | 2 +- .../items/clothing/sc_accessory.dm | 2 +- .../southern_cross/shuttles/crew_shuttles.dm | 2 +- .../maps/southern_cross/shuttles/ert.dm | 2 +- .../maps/southern_cross/shuttles/heist.dm | 2 +- .../maps/southern_cross/shuttles/merc.dm | 2 +- .../maps/southern_cross/shuttles/ninja.dm | 2 +- .../southern_cross/southern_cross_events.dm | 2 +- .../submaps/gateway/BaseBlep.dm | 2 +- .../submaps/gateway/carpfarm.dm | 2 +- .../submaps/gateway/hiddeneclipse.dm | 2 +- .../submaps/gateway/maddnesslab.dm | 2 +- .../mountains/mountains_areas.dm | 2 +- .../surface_submaps/plains/plains_areas.dm | 2 +- .../surface_submaps/valley/valley_areas.dm | 2 +- .../valleyend/valleyend_areas.dm | 2 +- .../wilderness/wilderness_areas.dm | 2 +- .../maps/virgo_minitest/virgo_minitest.dm | 2 +- .../virgo_minitest/virgo_minitest_defines.dm | 2 +- modular_chomp/read this.txt | 2 +- tools/ci/validate_files.sh | 4 +-- vorestation.dme | 28 +++++++++---------- 105 files changed, 108 insertions(+), 111 deletions(-) rename modular_chomp/{ => code}/datums/tgs_event_handler.dm (100%) rename modular_chomp/{ => code}/game/machinery/bluespace_denier.dm (100%) rename modular_chomp/{ => code}/game/machinery/buttons.dm (100%) rename modular_chomp/{ => code}/game/machinery/traptiles.dm (92%) rename modular_chomp/{ => code}/game/machinery/turrets.dm (98%) rename modular_chomp/{game => code/game/objects}/effects/simple_portals.dm (100%) rename modular_chomp/{game => code/game/objects}/effects/spawner.dm (100%) rename modular_chomp/{ => code}/game/objects/effects/spiders.dm (97%) rename modular_chomp/{ => code}/game/objects/effects/step_triggers.dm (100%) rename modular_chomp/{ => code}/game/objects/trash_eating.dm (100%) rename modular_chomp/{game/turfs => code/game/turfs/simulated}/shuttlewall_types.dm (100%) rename modular_chomp/{game/turfs => code/game/turfs/simulated}/shuttlewalls.dm (100%) rename modular_chomp/{game/turfs => code/game/turfs/simulated}/shuttlewalls_attacks.dm (100%) rename modular_chomp/{game/turfs => code/game/turfs/simulated}/shuttlewalls_icon.dm (99%) diff --git a/modular_chomp/code/coalesce_ch.dm b/modular_chomp/code/coalesce_ch.dm index 837dcf03f2..2d40ccff9c 100644 --- a/modular_chomp/code/coalesce_ch.dm +++ b/modular_chomp/code/coalesce_ch.dm @@ -2,4 +2,4 @@ for (var/arg in args) if (arg) return arg - return null \ No newline at end of file + return null diff --git a/modular_chomp/code/datums/autolathe/general_ch.dm b/modular_chomp/code/datums/autolathe/general_ch.dm index 358daa96af..fed77ccc9f 100644 --- a/modular_chomp/code/datums/autolathe/general_ch.dm +++ b/modular_chomp/code/datums/autolathe/general_ch.dm @@ -1,3 +1,3 @@ /datum/category_item/autolathe/general/radio_subspace name = "subspace radio" - path =/obj/item/radio/subspace \ No newline at end of file + path =/obj/item/radio/subspace diff --git a/modular_chomp/code/datums/supplypacks/medical.dm b/modular_chomp/code/datums/supplypacks/medical.dm index 21981f41bb..45b17699ba 100644 --- a/modular_chomp/code/datums/supplypacks/medical.dm +++ b/modular_chomp/code/datums/supplypacks/medical.dm @@ -14,4 +14,4 @@ ) cost = 50 containertype = /obj/structure/closet/crate/secure/veymed - containername = "Surgery Kit Bag crate" \ No newline at end of file + containername = "Surgery Kit Bag crate" diff --git a/modular_chomp/code/datums/supplypacks/science.dm b/modular_chomp/code/datums/supplypacks/science.dm index 3e49f84bf3..688d53ea75 100644 --- a/modular_chomp/code/datums/supplypacks/science.dm +++ b/modular_chomp/code/datums/supplypacks/science.dm @@ -5,4 +5,4 @@ ) cost = 45 containertype = /obj/structure/closet/crate/ward - containername = "Borg-O's crate" \ No newline at end of file + containername = "Borg-O's crate" diff --git a/modular_chomp/code/datums/supplypacks/security.dm b/modular_chomp/code/datums/supplypacks/security.dm index 3ad356fb86..46d0402887 100644 --- a/modular_chomp/code/datums/supplypacks/security.dm +++ b/modular_chomp/code/datums/supplypacks/security.dm @@ -34,4 +34,4 @@ ) cost = 150 containertype = /obj/structure/closet/crate/secure/gear - containername = "Expirmental Capture crate" \ No newline at end of file + containername = "Expirmental Capture crate" diff --git a/modular_chomp/datums/tgs_event_handler.dm b/modular_chomp/code/datums/tgs_event_handler.dm similarity index 100% rename from modular_chomp/datums/tgs_event_handler.dm rename to modular_chomp/code/datums/tgs_event_handler.dm diff --git a/modular_chomp/code/game/machinery/autolathe_armory.dm b/modular_chomp/code/game/machinery/autolathe_armory.dm index 162ba59e9a..8c26df8c50 100644 --- a/modular_chomp/code/game/machinery/autolathe_armory.dm +++ b/modular_chomp/code/game/machinery/autolathe_armory.dm @@ -27,4 +27,4 @@ data["recipes"] = recipes data["categories"] = categories - return data \ No newline at end of file + return data diff --git a/modular_chomp/game/machinery/bluespace_denier.dm b/modular_chomp/code/game/machinery/bluespace_denier.dm similarity index 100% rename from modular_chomp/game/machinery/bluespace_denier.dm rename to modular_chomp/code/game/machinery/bluespace_denier.dm diff --git a/modular_chomp/game/machinery/buttons.dm b/modular_chomp/code/game/machinery/buttons.dm similarity index 100% rename from modular_chomp/game/machinery/buttons.dm rename to modular_chomp/code/game/machinery/buttons.dm diff --git a/modular_chomp/code/game/machinery/food_replicator.dm b/modular_chomp/code/game/machinery/food_replicator.dm index dfed5ecaee..71a6a0b6c8 100644 --- a/modular_chomp/code/game/machinery/food_replicator.dm +++ b/modular_chomp/code/game/machinery/food_replicator.dm @@ -172,7 +172,7 @@ icon_state = "destroyed" if(panel_open) add_overlay("panel_open") - if(stat & NOPOWER|EMPED) + if(stat & (NOPOWER|EMPED)) add_overlay("poweroff") if(printing) add_overlay("printing") diff --git a/modular_chomp/game/machinery/traptiles.dm b/modular_chomp/code/game/machinery/traptiles.dm similarity index 92% rename from modular_chomp/game/machinery/traptiles.dm rename to modular_chomp/code/game/machinery/traptiles.dm index 2d6c20776e..a30de65c5b 100644 --- a/modular_chomp/game/machinery/traptiles.dm +++ b/modular_chomp/code/game/machinery/traptiles.dm @@ -30,4 +30,4 @@ shock(L, 100, target_zone) - L.add_modifier(/datum/modifier/entangled, 3 SECONDS) \ No newline at end of file + L.add_modifier(/datum/modifier/entangled, 3 SECONDS) diff --git a/modular_chomp/game/machinery/turrets.dm b/modular_chomp/code/game/machinery/turrets.dm similarity index 98% rename from modular_chomp/game/machinery/turrets.dm rename to modular_chomp/code/game/machinery/turrets.dm index df54a3585d..66f5aed283 100644 --- a/modular_chomp/game/machinery/turrets.dm +++ b/modular_chomp/code/game/machinery/turrets.dm @@ -82,4 +82,4 @@ board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_DATA = 8, TECH_ARCANE = 3) req_components = list( - /obj/item/stack/cable_coil = 30) \ No newline at end of file + /obj/item/stack/cable_coil = 30) diff --git a/modular_chomp/code/game/mecha/mecha_construction_paths.dm b/modular_chomp/code/game/mecha/mecha_construction_paths.dm index 558f778d16..2b7a41e20a 100644 --- a/modular_chomp/code/game/mecha/mecha_construction_paths.dm +++ b/modular_chomp/code/game/mecha/mecha_construction_paths.dm @@ -273,4 +273,4 @@ /datum/construction/reversible/mecha/hades/spawn_result() ..() feedback_inc("mecha_hades_created",1) - return \ No newline at end of file + return diff --git a/modular_chomp/code/game/mecha/mecha_parts.dm b/modular_chomp/code/game/mecha/mecha_parts.dm index bc9b6f1695..12d801dde4 100644 --- a/modular_chomp/code/game/mecha/mecha_parts.dm +++ b/modular_chomp/code/game/mecha/mecha_parts.dm @@ -43,4 +43,4 @@ name = "stange peripheral circuit" /obj/item/circuitboard/mecha/hades/main - name = "stange control circuit" \ No newline at end of file + name = "stange control circuit" diff --git a/modular_chomp/code/game/mecha/secert/hades.dm b/modular_chomp/code/game/mecha/secert/hades.dm index 666ca9b4f6..88f6e55f2e 100644 --- a/modular_chomp/code/game/mecha/secert/hades.dm +++ b/modular_chomp/code/game/mecha/secert/hades.dm @@ -27,4 +27,4 @@ /obj/effect/decal/mecha_wreckage/hades name = "Hades Wreckage" icon = 'modular_chomp/icons/mecha/mechas.dmi' - icon_state = "hades_broken" //to change \ No newline at end of file + icon_state = "hades_broken" //to change diff --git a/modular_chomp/game/effects/simple_portals.dm b/modular_chomp/code/game/objects/effects/simple_portals.dm similarity index 100% rename from modular_chomp/game/effects/simple_portals.dm rename to modular_chomp/code/game/objects/effects/simple_portals.dm diff --git a/modular_chomp/game/effects/spawner.dm b/modular_chomp/code/game/objects/effects/spawner.dm similarity index 100% rename from modular_chomp/game/effects/spawner.dm rename to modular_chomp/code/game/objects/effects/spawner.dm diff --git a/modular_chomp/game/objects/effects/spiders.dm b/modular_chomp/code/game/objects/effects/spiders.dm similarity index 97% rename from modular_chomp/game/objects/effects/spiders.dm rename to modular_chomp/code/game/objects/effects/spiders.dm index 7ed3e96573..1042ffa36a 100644 --- a/modular_chomp/game/objects/effects/spiders.dm +++ b/modular_chomp/code/game/objects/effects/spiders.dm @@ -33,4 +33,4 @@ grow_as = list(/mob/living/simple_mob/animal/giant_spider/space, /mob/living/simple_mob/animal/giant_spider/nurse/space, /mob/living/simple_mob/animal/giant_spider/hunter/space, /mob/living/simple_mob/animal/giant_spider/frost/space, /mob/living/simple_mob/animal/giant_spider/electric/space, /mob/living/simple_mob/animal/giant_spider/lurker/space, /mob/living/simple_mob/animal/giant_spider/pepper/space, /mob/living/simple_mob/animal/giant_spider/thermic/space, /mob/living/simple_mob/animal/giant_spider/tunneler/space, - /mob/living/simple_mob/animal/giant_spider/webslinger/space) \ No newline at end of file + /mob/living/simple_mob/animal/giant_spider/webslinger/space) diff --git a/modular_chomp/game/objects/effects/step_triggers.dm b/modular_chomp/code/game/objects/effects/step_triggers.dm similarity index 100% rename from modular_chomp/game/objects/effects/step_triggers.dm rename to modular_chomp/code/game/objects/effects/step_triggers.dm diff --git a/modular_chomp/code/game/objects/items/clockwork/ratvarian_spear.dm b/modular_chomp/code/game/objects/items/clockwork/ratvarian_spear.dm index 8d1365b956..39e10dde10 100644 --- a/modular_chomp/code/game/objects/items/clockwork/ratvarian_spear.dm +++ b/modular_chomp/code/game/objects/items/clockwork/ratvarian_spear.dm @@ -14,4 +14,3 @@ attack_verb = list("stabbed", "poked", "slashed") hitsound = 'sound/weapons/bladeslice.ogg' w_class = ITEMSIZE_HUGE - diff --git a/modular_chomp/code/game/objects/items/weapons/storage/backpack.dm b/modular_chomp/code/game/objects/items/weapons/storage/backpack.dm index 4fd3da4895..c182ebf182 100644 --- a/modular_chomp/code/game/objects/items/weapons/storage/backpack.dm +++ b/modular_chomp/code/game/objects/items/weapons/storage/backpack.dm @@ -14,4 +14,4 @@ name = "Taur Duty Vest (Heavy)" desc = "An armored vest with the armor modules replaced with various handy compartments with decent storage capacity. Useless for protection though. Holds more than its lighter cousin.." max_storage_space = INVENTORY_DUFFLEBAG_SPACE - slowdown = 0.5 \ No newline at end of file + slowdown = 0.5 diff --git a/modular_chomp/code/game/objects/structures/flora.dm b/modular_chomp/code/game/objects/structures/flora.dm index b359386af2..a136e8eb7a 100644 --- a/modular_chomp/code/game/objects/structures/flora.dm +++ b/modular_chomp/code/game/objects/structures/flora.dm @@ -27,4 +27,4 @@ max_health = 250 pixel_x = -48 pixel_y = -12 - shake_animation_degrees = 2 \ No newline at end of file + shake_animation_degrees = 2 diff --git a/modular_chomp/code/game/objects/structures/tyr_project_props.dm b/modular_chomp/code/game/objects/structures/tyr_project_props.dm index 7e3f40fa10..9e60b11333 100644 --- a/modular_chomp/code/game/objects/structures/tyr_project_props.dm +++ b/modular_chomp/code/game/objects/structures/tyr_project_props.dm @@ -299,4 +299,4 @@ prob(1);/obj/structure/outcrop/platinum/tyr, prob(5);/obj/structure/outcrop/weathered_gate, prob(3);/obj/structure/outcrop/hydrogen, - prob(1);/obj/structure/outcrop/lead/tyr) \ No newline at end of file + prob(1);/obj/structure/outcrop/lead/tyr) diff --git a/modular_chomp/game/objects/trash_eating.dm b/modular_chomp/code/game/objects/trash_eating.dm similarity index 100% rename from modular_chomp/game/objects/trash_eating.dm rename to modular_chomp/code/game/objects/trash_eating.dm diff --git a/modular_chomp/code/game/turfs/simulated/blackholeturfs.dm b/modular_chomp/code/game/turfs/simulated/blackholeturfs.dm index 77f1410b28..4f2742a229 100644 --- a/modular_chomp/code/game/turfs/simulated/blackholeturfs.dm +++ b/modular_chomp/code/game/turfs/simulated/blackholeturfs.dm @@ -9,4 +9,4 @@ icon_state = "tile2" /turf/simulated/floor/blackhole/grate - icon_state = "tile3" \ No newline at end of file + icon_state = "tile3" diff --git a/modular_chomp/game/turfs/shuttlewall_types.dm b/modular_chomp/code/game/turfs/simulated/shuttlewall_types.dm similarity index 100% rename from modular_chomp/game/turfs/shuttlewall_types.dm rename to modular_chomp/code/game/turfs/simulated/shuttlewall_types.dm diff --git a/modular_chomp/game/turfs/shuttlewalls.dm b/modular_chomp/code/game/turfs/simulated/shuttlewalls.dm similarity index 100% rename from modular_chomp/game/turfs/shuttlewalls.dm rename to modular_chomp/code/game/turfs/simulated/shuttlewalls.dm diff --git a/modular_chomp/game/turfs/shuttlewalls_attacks.dm b/modular_chomp/code/game/turfs/simulated/shuttlewalls_attacks.dm similarity index 100% rename from modular_chomp/game/turfs/shuttlewalls_attacks.dm rename to modular_chomp/code/game/turfs/simulated/shuttlewalls_attacks.dm diff --git a/modular_chomp/game/turfs/shuttlewalls_icon.dm b/modular_chomp/code/game/turfs/simulated/shuttlewalls_icon.dm similarity index 99% rename from modular_chomp/game/turfs/shuttlewalls_icon.dm rename to modular_chomp/code/game/turfs/simulated/shuttlewalls_icon.dm index 5fa9ec3325..4340b5ca80 100644 --- a/modular_chomp/game/turfs/shuttlewalls_icon.dm +++ b/modular_chomp/code/game/turfs/simulated/shuttlewalls_icon.dm @@ -149,4 +149,4 @@ return 0 /turf/simulated/shuttlewalls/proc/can_join_with_low_wall(var/obj/structure/low_wall/WF) - return FALSE \ No newline at end of file + return FALSE diff --git a/modular_chomp/code/modules/client/preference_setup/loadout/loadout_general.dm b/modular_chomp/code/modules/client/preference_setup/loadout/loadout_general.dm index d0367e6c5c..0a3c531e7b 100644 --- a/modular_chomp/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/modular_chomp/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -23,4 +23,4 @@ "Pill Bottle (Bliss)" = /obj/item/storage/pill_bottle/happy, "Pill Bottle (Aphrodisiac)" = /obj/item/storage/pill_bottle/aphrodisiac ) - gear_tweaks += new/datum/gear_tweak/path(medications) \ No newline at end of file + gear_tweaks += new/datum/gear_tweak/path(medications) diff --git a/modular_chomp/code/modules/client/preference_setup/loadout/loadout_shoes.dm b/modular_chomp/code/modules/client/preference_setup/loadout/loadout_shoes.dm index 2277fb03ea..7f9d134ca2 100644 --- a/modular_chomp/code/modules/client/preference_setup/loadout/loadout_shoes.dm +++ b/modular_chomp/code/modules/client/preference_setup/loadout/loadout_shoes.dm @@ -11,4 +11,4 @@ "extra large jackboots" = /obj/item/clothing/shoes/mech_shoes/mister_x, "visible extra large jackboots" = /obj/item/clothing/shoes/mech_shoes/mister_x/visible ) - gear_tweaks += new/datum/gear_tweak/path(mechshoes) \ No newline at end of file + gear_tweaks += new/datum/gear_tweak/path(mechshoes) diff --git a/modular_chomp/code/modules/clothing/head/misc.dm b/modular_chomp/code/modules/clothing/head/misc.dm index 932931d232..28e061ffaf 100644 --- a/modular_chomp/code/modules/clothing/head/misc.dm +++ b/modular_chomp/code/modules/clothing/head/misc.dm @@ -5,4 +5,4 @@ icon = 'modular_chomp/icons/inventory/head/mob_angel_halo.dmi' default_worn_icon = 'modular_chomp/icons/inventory/head/mob_angel_halo.dmi' icon_state = "angel_halo" -//Angel Halo End \ No newline at end of file +//Angel Halo End diff --git a/modular_chomp/code/modules/clothing/spacesuits/rig/modules/specific/mounted_gun.dm b/modular_chomp/code/modules/clothing/spacesuits/rig/modules/specific/mounted_gun.dm index 25f904a827..b73fa13d2f 100644 --- a/modular_chomp/code/modules/clothing/spacesuits/rig/modules/specific/mounted_gun.dm +++ b/modular_chomp/code/modules/clothing/spacesuits/rig/modules/specific/mounted_gun.dm @@ -5,4 +5,4 @@ usable = 0 interface_name = "mounted phase rifle" interface_desc = "A forearm-mounted suit-powered phase rifle." - gun_type = /obj/item/gun/energy/locked/phasegun/rifle/unlocked/mounted \ No newline at end of file + gun_type = /obj/item/gun/energy/locked/phasegun/rifle/unlocked/mounted diff --git a/modular_chomp/code/modules/clothing/spacesuits/rig/other.dm b/modular_chomp/code/modules/clothing/spacesuits/rig/other.dm index eea8332467..93ce5fa720 100644 --- a/modular_chomp/code/modules/clothing/spacesuits/rig/other.dm +++ b/modular_chomp/code/modules/clothing/spacesuits/rig/other.dm @@ -1,2 +1,2 @@ /obj/item/rig/ert/janitor - req_access = null \ No newline at end of file + req_access = null diff --git a/modular_chomp/code/modules/clothing/spacesuits/void/void.dm b/modular_chomp/code/modules/clothing/spacesuits/void/void.dm index ec0423dbab..841046ead1 100644 --- a/modular_chomp/code/modules/clothing/spacesuits/void/void.dm +++ b/modular_chomp/code/modules/clothing/spacesuits/void/void.dm @@ -3,4 +3,4 @@ /obj/item/clothing/suit/space/void species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_RAPALA, SPECIES_VASILISSAN, SPECIES_ALRAUNE, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA, SPECIES_XENOMORPH_HYBRID) - sprite_sheets = CH_SPECIES_SPRITE_SHEETS_SUIT_MOB \ No newline at end of file + sprite_sheets = CH_SPECIES_SPRITE_SHEETS_SUIT_MOB diff --git a/modular_chomp/code/modules/clothing/suits/armor.dm b/modular_chomp/code/modules/clothing/suits/armor.dm index 9ac2db608d..bfe59ef775 100644 --- a/modular_chomp/code/modules/clothing/suits/armor.dm +++ b/modular_chomp/code/modules/clothing/suits/armor.dm @@ -23,4 +23,4 @@ icon_override = 'modular_chomp/icons/mob/viper_suit_ch.dmi' icon_state = "viper_suit" armor = list(melee = 35, bullet = 35, laser = 35, energy = 35, bomb = 25, bio = 20, rad = 20) - body_parts_covered = HEAD|UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS \ No newline at end of file + body_parts_covered = HEAD|UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS diff --git a/modular_chomp/code/modules/economy/cash_register.dm b/modular_chomp/code/modules/economy/cash_register.dm index 7b4e3366f2..0e3392a136 100644 --- a/modular_chomp/code/modules/economy/cash_register.dm +++ b/modular_chomp/code/modules/economy/cash_register.dm @@ -20,4 +20,4 @@ /obj/machinery/cash_register/civilian req_access = list() - req_one_access = list(access_kitchen,access_bar,access_hydroponics,access_heads) \ No newline at end of file + req_one_access = list(access_kitchen,access_bar,access_hydroponics,access_heads) diff --git a/modular_chomp/code/modules/event/dangerinfestation.dm b/modular_chomp/code/modules/event/dangerinfestation.dm index 27c6d9d12c..f297dd8353 100644 --- a/modular_chomp/code/modules/event/dangerinfestation.dm +++ b/modular_chomp/code/modules/event/dangerinfestation.dm @@ -94,4 +94,4 @@ #undef DANGER_CRAB #undef DANGER_ICE -#undef DANGER_RAY \ No newline at end of file +#undef DANGER_RAY diff --git a/modular_chomp/code/modules/event/heavydangerinfestation.dm b/modular_chomp/code/modules/event/heavydangerinfestation.dm index 9bf1bbe5ae..0b42d1d671 100644 --- a/modular_chomp/code/modules/event/heavydangerinfestation.dm +++ b/modular_chomp/code/modules/event/heavydangerinfestation.dm @@ -121,4 +121,4 @@ #undef DANGER_ICE #undef DANGER_RAY #undef DANGER_EEL -#undef DANGER_TURTLE \ No newline at end of file +#undef DANGER_TURTLE diff --git a/modular_chomp/code/modules/hydro/plantsstorage.dm b/modular_chomp/code/modules/hydro/plantsstorage.dm index f9bd137443..aeba34b751 100644 --- a/modular_chomp/code/modules/hydro/plantsstorage.dm +++ b/modular_chomp/code/modules/hydro/plantsstorage.dm @@ -117,4 +117,4 @@ /obj/item/seeds/lustflower = 2, /obj/item/seeds/pitcherseed = 3, /obj/item/seeds/cinnamon = 3 - ) //CHOMPEdit - Seed list altered to include extra seeds available in seed_storage_vr.dm. Added cinnamon. \ No newline at end of file + ) //CHOMPEdit - Seed list altered to include extra seeds available in seed_storage_vr.dm. Added cinnamon. diff --git a/modular_chomp/code/modules/materials/materials/gems.dm b/modular_chomp/code/modules/materials/materials/gems.dm index be79be43ce..609ded1d29 100644 --- a/modular_chomp/code/modules/materials/materials/gems.dm +++ b/modular_chomp/code/modules/materials/materials/gems.dm @@ -4,4 +4,4 @@ /datum/material/morphium //buffed protection - protectiveness = 65 \ No newline at end of file + protectiveness = 65 diff --git a/modular_chomp/code/modules/materials/materials/metals/metals.dm b/modular_chomp/code/modules/materials/materials/metals/metals.dm index 1f956b143d..07371cfaa0 100644 --- a/modular_chomp/code/modules/materials/materials/metals/metals.dm +++ b/modular_chomp/code/modules/materials/materials/metals/metals.dm @@ -50,4 +50,4 @@ /datum/material/osmium //Adjusted hardness, reflective, and protection hardness = 65 protectiveness = 30 - reflectivity = 0.1 \ No newline at end of file + reflectivity = 0.1 diff --git a/modular_chomp/code/modules/materials/materials/organic/animal_products.dm b/modular_chomp/code/modules/materials/materials/organic/animal_products.dm index 5ba22a5bec..27d84c94b8 100644 --- a/modular_chomp/code/modules/materials/materials/organic/animal_products.dm +++ b/modular_chomp/code/modules/materials/materials/organic/animal_products.dm @@ -41,4 +41,4 @@ hardness = 40 protectiveness = 40 reflectivity = 0.6 - conductivity = 0.5 \ No newline at end of file + conductivity = 0.5 diff --git a/modular_chomp/code/modules/mining/tools.dm b/modular_chomp/code/modules/mining/tools.dm index 50c808944e..df93f10f41 100644 --- a/modular_chomp/code/modules/mining/tools.dm +++ b/modular_chomp/code/modules/mining/tools.dm @@ -20,4 +20,4 @@ /obj/item/kinetic_crusher - requires_wield = FALSE \ No newline at end of file + requires_wield = FALSE diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/horror/Master.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/horror/Master.dm index 0cd595aeba..ecb4e2b6c9 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/horror/Master.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/horror/Master.dm @@ -2,11 +2,11 @@ say_list_type = /datum/say_list/cyber_horror/master ai_holder_type = /datum/ai_holder/simple_mob/ranged/kiting/horrormaster //The final boss of every Gradius game - + /datum/say_list/cyber_horror/master threaten_sound = 'modular_chomp/sound/mob/robots/MasterSee.ogg' /datum/ai_holder/simple_mob/ranged/kiting/horrormaster threaten = TRUE threaten_delay = 1 SECOND - threaten_timeout = 30 SECONDS \ No newline at end of file + threaten_timeout = 30 SECONDS diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/lore.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/lore.dm index 308248aa08..df0b82f854 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/lore.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/lore.dm @@ -150,4 +150,4 @@ contemparies, all the while wielding expirmental frost weaponry to deadly \ effecieny. Rare and vaulable pieces in the Eclipse's army, they are rarely seen \ but when utilized, that area is of high priority. " - value = CATALOGUER_REWARD_MEDIUM \ No newline at end of file + value = CATALOGUER_REWARD_MEDIUM diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/mechas.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/mechas.dm index 92231f7514..3a85c80973 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/mechas.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/mechas.dm @@ -1387,4 +1387,4 @@ uptwo_rightfour(target) downtwo_leftfour(target) downtwo_rightfour(target) - attackcycle = next_cycle \ No newline at end of file + attackcycle = next_cycle diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/starhunters/passive.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/starhunters/passive.dm index a65d00a1ce..70b5518a6f 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/starhunters/passive.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/starhunters/passive.dm @@ -125,4 +125,4 @@ /obj/item/seeds/jurlmah = 125, /obj/item/seeds/amauri = 125, /obj/item/seeds/gelthi = 125, - /obj/item/seeds/vale = 125) \ No newline at end of file + /obj/item/seeds/vale = 125) diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/disbot.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/disbot.dm index 5f0c0da1b3..7a22ef30a2 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/disbot.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/disbot.dm @@ -9,4 +9,4 @@ /datum/ai_holder/simple_mob/melee/disbot threaten = TRUE threaten_delay = 1 SECOND - threaten_timeout = 30 SECONDS \ No newline at end of file + threaten_timeout = 30 SECONDS diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm index bada67f153..cb1ec4700f 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm @@ -1,4 +1,4 @@ /mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser name = "laser hivebot" desc = "A robot with a photonic weapon integrated into itself." - projectiletype = /obj/item/projectile/energy/mob/drone \ No newline at end of file + projectiletype = /obj/item/projectile/energy/mob/drone diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/orginalAlts.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/orginalAlts.dm index 123d69fbb9..0b5cd0cddf 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/orginalAlts.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/orginalAlts.dm @@ -13,4 +13,4 @@ projectiletype = /obj/item/projectile/energy/declone /mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege - projectiletype = /obj/item/projectile/arc //Polaris, don't make the same mob twice. \ No newline at end of file + projectiletype = /obj/item/projectile/arc //Polaris, don't make the same mob twice. diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/tank.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/tank.dm index bb1290b440..c9eebda546 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/tank.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/tank.dm @@ -2,4 +2,4 @@ /mob/living/simple_mob/mechanical/hivebot/tank icon = 'modular_chomp/icons/mob/hivebot.dmi' icon_state = "blue" - icon_living = "blue" \ No newline at end of file + icon_living = "blue" diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/gygax.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/gygax.dm index b6da1d6024..51543e0ea3 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/gygax.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/gygax.dm @@ -26,4 +26,4 @@ /datum/ai_holder/simple_mob/ranged/kiting/threatening/drone_aerostat threaten_delay = 20 SECOND - threaten_timeout = 30 SECONDS \ No newline at end of file + threaten_timeout = 30 SECONDS diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/ashy.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/ashy.dm index 89f7f3bdbe..498497daec 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/ashy.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/ashy.dm @@ -11,4 +11,4 @@ see_in_dark = 8 minbodytemp = 0 maxbodytemp = 30000 - min_oxy = 0 \ No newline at end of file + min_oxy = 0 diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/cave_lamia.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/cave_lamia.dm index 1109eb8e33..d02103eb6c 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/cave_lamia.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/cave_lamia.dm @@ -14,4 +14,4 @@ melee_damage_lower = 5 melee_damage_upper = 5 vore_upper_transfer_chance = 75 - ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive // Aggressive! \ No newline at end of file + ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive // Aggressive! diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/smokestar.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/smokestar.dm index a65db2413f..e855e981b6 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/smokestar.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/smokestar.dm @@ -50,4 +50,4 @@ light_color = "#1F000F" glow_range = 5 glow_intensity = -1 - ai_holder_type = /datum/ai_holder/simple_mob/melee/hit_and_run \ No newline at end of file + ai_holder_type = /datum/ai_holder/simple_mob/melee/hit_and_run diff --git a/modular_chomp/code/modules/paperwork/pen.dm b/modular_chomp/code/modules/paperwork/pen.dm index 74f3c3f291..152576fec6 100644 --- a/modular_chomp/code/modules/paperwork/pen.dm +++ b/modular_chomp/code/modules/paperwork/pen.dm @@ -27,4 +27,4 @@ if(!istype(M)) return - M.Weaken(stun_duration) \ No newline at end of file + M.Weaken(stun_duration) diff --git a/modular_chomp/code/modules/planet/sif.dm b/modular_chomp/code/modules/planet/sif.dm index 9423c43267..e7d5f21e66 100644 --- a/modular_chomp/code/modules/planet/sif.dm +++ b/modular_chomp/code/modules/planet/sif.dm @@ -361,7 +361,7 @@ wind_low = 4 flight_failure_modifier = 100 effect_message = span_warning("Extreme rain is crushing you!") - + imminent_transition_message = "A fatal monsoon approaches." var/next_lightning_strike = 0 // world.time when lightning will strike. diff --git a/modular_chomp/code/modules/projectiles/guns/alts.dm b/modular_chomp/code/modules/projectiles/guns/alts.dm index 01270194d1..cf6c91a8ce 100644 --- a/modular_chomp/code/modules/projectiles/guns/alts.dm +++ b/modular_chomp/code/modules/projectiles/guns/alts.dm @@ -1,2 +1,2 @@ /obj/item/gun/energy/zip/craftable - battery_lock = 1 //makeshift gun has flaws \ No newline at end of file + battery_lock = 1 //makeshift gun has flaws diff --git a/modular_chomp/code/modules/projectiles/guns/phase.dm b/modular_chomp/code/modules/projectiles/guns/phase.dm index d5b020a44a..743d6ef046 100644 --- a/modular_chomp/code/modules/projectiles/guns/phase.dm +++ b/modular_chomp/code/modules/projectiles/guns/phase.dm @@ -3,4 +3,4 @@ self_recharge = 1 use_external_power = 1 recharge_time = 10 - one_handed_penalty = 0 \ No newline at end of file + one_handed_penalty = 0 diff --git a/modular_chomp/code/modules/projectiles/guns/special.dm b/modular_chomp/code/modules/projectiles/guns/special.dm index dcb52ad8c3..45c31bee07 100644 --- a/modular_chomp/code/modules/projectiles/guns/special.dm +++ b/modular_chomp/code/modules/projectiles/guns/special.dm @@ -10,4 +10,4 @@ combustion = FALSE modifier_type_to_apply = /datum/modifier/entangled - modifier_duration = 0.5 MINUTE \ No newline at end of file + modifier_duration = 0.5 MINUTE diff --git a/modular_chomp/code/modules/projectiles/guns/staffs.dm b/modular_chomp/code/modules/projectiles/guns/staffs.dm index 8e419aff1d..e2456bcece 100644 --- a/modular_chomp/code/modules/projectiles/guns/staffs.dm +++ b/modular_chomp/code/modules/projectiles/guns/staffs.dm @@ -38,4 +38,4 @@ /obj/item/gun/magic/firestaff/vrwizard/nuclear description_info = "A high powered staff that burns through energy quickly but unleashes high energy bolts." projectile_type = /obj/item/projectile/energy/nuclearblast - color = "#660066" \ No newline at end of file + color = "#660066" diff --git a/modular_chomp/code/modules/spells/spells.dm b/modular_chomp/code/modules/spells/spells.dm index 0699c7b54e..dee3af075d 100644 --- a/modular_chomp/code/modules/spells/spells.dm +++ b/modular_chomp/code/modules/spells/spells.dm @@ -166,4 +166,4 @@ if(isliving(hit_atom)) var/mob/living/L = hit_atom L.add_modifier(/datum/modifier/mend_occult, 150) //No need to change this, it does the job - qdel(src) \ No newline at end of file + qdel(src) diff --git a/modular_chomp/code/modules/tickets/tickets.dm b/modular_chomp/code/modules/tickets/tickets.dm index 672e5f55a7..7a427c0d15 100644 --- a/modular_chomp/code/modules/tickets/tickets.dm +++ b/modular_chomp/code/modules/tickets/tickets.dm @@ -571,7 +571,7 @@ GLOBAL_DATUM_INIT(tickets, /datum/tickets, new) return if(handler == key_name(usr, FALSE, TRUE)) - to_chat(span_red("You are already handling this ticket.")) + to_chat(usr, span_red("You are already handling this ticket.")) return var/msg = span_red("Your AdminHelp is being handled by [key_name(usr,FALSE,FALSE)] please be patient.") diff --git a/modular_chomp/code/modules/weapons/melee.dm b/modular_chomp/code/modules/weapons/melee.dm index a72afee289..03f8646c6a 100644 --- a/modular_chomp/code/modules/weapons/melee.dm +++ b/modular_chomp/code/modules/weapons/melee.dm @@ -9,4 +9,4 @@ force = 35 attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") can_cleave = TRUE - icon_state = "scythe0" \ No newline at end of file + icon_state = "scythe0" diff --git a/modular_chomp/code/modules/weapons/staves.dm b/modular_chomp/code/modules/weapons/staves.dm index 08c6eb6d48..87d2dbbcb8 100644 --- a/modular_chomp/code/modules/weapons/staves.dm +++ b/modular_chomp/code/modules/weapons/staves.dm @@ -50,4 +50,4 @@ charge_tick = 0 can_charge = TRUE - projectile_type = /obj/item/projectile/beam/inversion \ No newline at end of file + projectile_type = /obj/item/projectile/beam/inversion diff --git a/modular_chomp/code/modules/xenobio/machinery/monkey_processor.dm b/modular_chomp/code/modules/xenobio/machinery/monkey_processor.dm index 0b411b7260..2a37e3271f 100644 --- a/modular_chomp/code/modules/xenobio/machinery/monkey_processor.dm +++ b/modular_chomp/code/modules/xenobio/machinery/monkey_processor.dm @@ -46,4 +46,4 @@ if(H.stat != DEAD) return FALSE return TRUE - return FALSE \ No newline at end of file + return FALSE diff --git a/modular_chomp/icons/mob/screen_full_vore_ch_credits.txt b/modular_chomp/icons/mob/screen_full_vore_ch_credits.txt index 31337e7d52..bac463b163 100644 --- a/modular_chomp/icons/mob/screen_full_vore_ch_credits.txt +++ b/modular_chomp/icons/mob/screen_full_vore_ch_credits.txt @@ -66,5 +66,3 @@ VBOanim_gullet2 VBOanim_intestine1 VBOanim_belly3 VBO_anim_intestine2 - - diff --git a/modular_chomp/maps/overmap/aegis_carrier/aegis_objs.dm b/modular_chomp/maps/overmap/aegis_carrier/aegis_objs.dm index e88e27022f..70f5687f9a 100644 --- a/modular_chomp/maps/overmap/aegis_carrier/aegis_objs.dm +++ b/modular_chomp/maps/overmap/aegis_carrier/aegis_objs.dm @@ -3,4 +3,4 @@ desc = "A metallic overhang that supports an elevated platform." icon = 'modular_chomp/maps/overmap/aegis_carrier/aegis_icons/greyledge.dmi' icon_modifier = "grey_" - icon_state = "grey_railing0" \ No newline at end of file + icon_state = "grey_railing0" diff --git a/modular_chomp/maps/relic_base/items/clothing/sc_accessory.dm b/modular_chomp/maps/relic_base/items/clothing/sc_accessory.dm index f47c344fcd..c4eff3b579 100644 --- a/modular_chomp/maps/relic_base/items/clothing/sc_accessory.dm +++ b/modular_chomp/maps/relic_base/items/clothing/sc_accessory.dm @@ -11,4 +11,4 @@ icon_state = "pilot_webbing2" sprite_sheets = list( SPECIES_TESHARI = 'icons/inventory/accessory/mob_teshari.dmi' - ) \ No newline at end of file + ) diff --git a/modular_chomp/maps/relic_base/items/clothing/sc_suit.dm b/modular_chomp/maps/relic_base/items/clothing/sc_suit.dm index cec3eca91e..a8ef60cb7b 100644 --- a/modular_chomp/maps/relic_base/items/clothing/sc_suit.dm +++ b/modular_chomp/maps/relic_base/items/clothing/sc_suit.dm @@ -10,4 +10,4 @@ sprite_sheets = list( SPECIES_TESHARI = 'maps/southern_cross/icons/mob/species/teshari/sc_suit.dmi' ) - min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE \ No newline at end of file + min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE diff --git a/modular_chomp/maps/relic_base/loadout/loadout_accessories.dm b/modular_chomp/maps/relic_base/loadout/loadout_accessories.dm index 94a79b3cf2..8ae4b734e2 100644 --- a/modular_chomp/maps/relic_base/loadout/loadout_accessories.dm +++ b/modular_chomp/maps/relic_base/loadout/loadout_accessories.dm @@ -31,4 +31,4 @@ /datum/gear/accessory/holster display_name = "holster selection (Security, CD, HoP)" path = /obj/item/clothing/accessory/holster - allowed_roles = list("Site Manager","Head of Personnel","Security Officer","Warden","Head of Security","Detective","Explorer") \ No newline at end of file + allowed_roles = list("Site Manager","Head of Personnel","Security Officer","Warden","Head of Security","Detective","Explorer") diff --git a/modular_chomp/maps/relic_base/loadout/loadout_head.dm b/modular_chomp/maps/relic_base/loadout/loadout_head.dm index bf35942c10..cbf7d63c26 100644 --- a/modular_chomp/maps/relic_base/loadout/loadout_head.dm +++ b/modular_chomp/maps/relic_base/loadout/loadout_head.dm @@ -1,4 +1,4 @@ /datum/gear/head/pilot display_name = "helmet, pilot (Pilot)" path = /obj/item/clothing/head/ompilot/alt //VOREStation Edit - allowed_roles = list("Pilot") \ No newline at end of file + allowed_roles = list("Pilot") diff --git a/modular_chomp/maps/relic_base/loadout/loadout_vr.dm b/modular_chomp/maps/relic_base/loadout/loadout_vr.dm index 45b886e8b4..4f6e567eda 100644 --- a/modular_chomp/maps/relic_base/loadout/loadout_vr.dm +++ b/modular_chomp/maps/relic_base/loadout/loadout_vr.dm @@ -16,4 +16,4 @@ /datum/gear/head/pilot/mbill display_name = "helmet, major bill's (Pilot)" path = /obj/item/clothing/head/pilot_vr/mbill - allowed_roles = list("Pilot") \ No newline at end of file + allowed_roles = list("Pilot") diff --git a/modular_chomp/maps/relic_base/relicbase_elevator.dm b/modular_chomp/maps/relic_base/relicbase_elevator.dm index 7cfb12400d..8dd20a9e7d 100644 --- a/modular_chomp/maps/relic_base/relicbase_elevator.dm +++ b/modular_chomp/maps/relic_base/relicbase_elevator.dm @@ -11,4 +11,4 @@ areas_to_use = list( /area/turbolift/port_deck_one, /area/turbolift/port_deck_two - ) \ No newline at end of file + ) diff --git a/modular_chomp/maps/relic_base/relicbase_events.dm b/modular_chomp/maps/relic_base/relicbase_events.dm index 0fdce99136..5ad3a6c6d9 100644 --- a/modular_chomp/maps/relic_base/relicbase_events.dm +++ b/modular_chomp/maps/relic_base/relicbase_events.dm @@ -20,4 +20,4 @@ /area/rnd/xenobiology/xenoflora_storage, /area/rnd/xenobiology/xenoflora_isolation ) - ignore_blast_doors = TRUE // Needed to avoid a breach. \ No newline at end of file + ignore_blast_doors = TRUE // Needed to avoid a breach. diff --git a/modular_chomp/maps/relic_base/relicbase_jobs.dm b/modular_chomp/maps/relic_base/relicbase_jobs.dm index 17c4513443..586193a715 100644 --- a/modular_chomp/maps/relic_base/relicbase_jobs.dm +++ b/modular_chomp/maps/relic_base/relicbase_jobs.dm @@ -98,4 +98,4 @@ var/const/access_explorer = 43 economic_modifier = 4 access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_eva, access_maint_tunnels, access_external_airlocks, access_psychiatrist, access_explorer) minimal_access = list(access_medical, access_medical_equip, access_morgue, access_explorer) - outfit_type = /decl/hierarchy/outfit/job/medical/sar \ No newline at end of file + outfit_type = /decl/hierarchy/outfit/job/medical/sar diff --git a/modular_chomp/maps/relic_base/shuttles/ert.dm b/modular_chomp/maps/relic_base/shuttles/ert.dm index a748f9702b..d4ea6dd013 100644 --- a/modular_chomp/maps/relic_base/shuttles/ert.dm +++ b/modular_chomp/maps/relic_base/shuttles/ert.dm @@ -27,4 +27,4 @@ "d3_near_w", "outpost_nw", "outpost_s" - ) \ No newline at end of file + ) diff --git a/modular_chomp/maps/relic_base/shuttles/heist.dm b/modular_chomp/maps/relic_base/shuttles/heist.dm index 0c2fff9c7a..82aedf9d34 100644 --- a/modular_chomp/maps/relic_base/shuttles/heist.dm +++ b/modular_chomp/maps/relic_base/shuttles/heist.dm @@ -28,4 +28,4 @@ "d2_near_se", "d2_near_sw", "d3_near_w" - ) \ No newline at end of file + ) diff --git a/modular_chomp/maps/relic_base/shuttles/merc.dm b/modular_chomp/maps/relic_base/shuttles/merc.dm index d6bcc1d2e8..51da81132a 100644 --- a/modular_chomp/maps/relic_base/shuttles/merc.dm +++ b/modular_chomp/maps/relic_base/shuttles/merc.dm @@ -53,4 +53,4 @@ "d2_near_se", "d2_near_sw", "d3_near_w" - ) \ No newline at end of file + ) diff --git a/modular_chomp/maps/relic_base/shuttles/ninja.dm b/modular_chomp/maps/relic_base/shuttles/ninja.dm index e693f13aa4..f76272d52c 100644 --- a/modular_chomp/maps/relic_base/shuttles/ninja.dm +++ b/modular_chomp/maps/relic_base/shuttles/ninja.dm @@ -27,4 +27,4 @@ "d2_near_sw", "d3_near_w", "d3_near_se", - ) \ No newline at end of file + ) diff --git a/modular_chomp/maps/relic_base/submaps/gateway/BaseBlep.dm b/modular_chomp/maps/relic_base/submaps/gateway/BaseBlep.dm index 7b84fb1cd4..1baabe9695 100644 --- a/modular_chomp/maps/relic_base/submaps/gateway/BaseBlep.dm +++ b/modular_chomp/maps/relic_base/submaps/gateway/BaseBlep.dm @@ -33,4 +33,4 @@ requires_power = 0 //Because dumb Vr errors -/area/vr \ No newline at end of file +/area/vr diff --git a/modular_chomp/maps/relic_base/submaps/gateway/hiddeneclipse.dm b/modular_chomp/maps/relic_base/submaps/gateway/hiddeneclipse.dm index 8513edc26a..666ec56141 100644 --- a/modular_chomp/maps/relic_base/submaps/gateway/hiddeneclipse.dm +++ b/modular_chomp/maps/relic_base/submaps/gateway/hiddeneclipse.dm @@ -63,4 +63,4 @@ /area/awaymission/hiddeneclipse/theabyss name = "Strange Void" - requires_power = 0 \ No newline at end of file + requires_power = 0 diff --git a/modular_chomp/maps/relic_base/submaps/gateway/maddnesslab.dm b/modular_chomp/maps/relic_base/submaps/gateway/maddnesslab.dm index 058ddd64fa..d85e22dac2 100644 --- a/modular_chomp/maps/relic_base/submaps/gateway/maddnesslab.dm +++ b/modular_chomp/maps/relic_base/submaps/gateway/maddnesslab.dm @@ -145,4 +145,4 @@ So locked it behind a buttons in our research wings
And hey if you're hearing this, take care of my drake please.
Ashy is a good one.
- "} \ No newline at end of file + "} diff --git a/modular_chomp/maps/southern_cross/items/clothing/sc_accessory.dm b/modular_chomp/maps/southern_cross/items/clothing/sc_accessory.dm index f47c344fcd..c4eff3b579 100644 --- a/modular_chomp/maps/southern_cross/items/clothing/sc_accessory.dm +++ b/modular_chomp/maps/southern_cross/items/clothing/sc_accessory.dm @@ -11,4 +11,4 @@ icon_state = "pilot_webbing2" sprite_sheets = list( SPECIES_TESHARI = 'icons/inventory/accessory/mob_teshari.dmi' - ) \ No newline at end of file + ) diff --git a/modular_chomp/maps/southern_cross/shuttles/crew_shuttles.dm b/modular_chomp/maps/southern_cross/shuttles/crew_shuttles.dm index ab054c55f6..a992004fa4 100644 --- a/modular_chomp/maps/southern_cross/shuttles/crew_shuttles.dm +++ b/modular_chomp/maps/southern_cross/shuttles/crew_shuttles.dm @@ -283,4 +283,4 @@ return "Attention, [master.my_shuttle.visible_name] has departed the Wilderness Area." */ -End Chompstation Edit */ \ No newline at end of file +End Chompstation Edit */ diff --git a/modular_chomp/maps/southern_cross/shuttles/ert.dm b/modular_chomp/maps/southern_cross/shuttles/ert.dm index a748f9702b..d4ea6dd013 100644 --- a/modular_chomp/maps/southern_cross/shuttles/ert.dm +++ b/modular_chomp/maps/southern_cross/shuttles/ert.dm @@ -27,4 +27,4 @@ "d3_near_w", "outpost_nw", "outpost_s" - ) \ No newline at end of file + ) diff --git a/modular_chomp/maps/southern_cross/shuttles/heist.dm b/modular_chomp/maps/southern_cross/shuttles/heist.dm index 0c2fff9c7a..82aedf9d34 100644 --- a/modular_chomp/maps/southern_cross/shuttles/heist.dm +++ b/modular_chomp/maps/southern_cross/shuttles/heist.dm @@ -28,4 +28,4 @@ "d2_near_se", "d2_near_sw", "d3_near_w" - ) \ No newline at end of file + ) diff --git a/modular_chomp/maps/southern_cross/shuttles/merc.dm b/modular_chomp/maps/southern_cross/shuttles/merc.dm index d6bcc1d2e8..51da81132a 100644 --- a/modular_chomp/maps/southern_cross/shuttles/merc.dm +++ b/modular_chomp/maps/southern_cross/shuttles/merc.dm @@ -53,4 +53,4 @@ "d2_near_se", "d2_near_sw", "d3_near_w" - ) \ No newline at end of file + ) diff --git a/modular_chomp/maps/southern_cross/shuttles/ninja.dm b/modular_chomp/maps/southern_cross/shuttles/ninja.dm index e693f13aa4..f76272d52c 100644 --- a/modular_chomp/maps/southern_cross/shuttles/ninja.dm +++ b/modular_chomp/maps/southern_cross/shuttles/ninja.dm @@ -27,4 +27,4 @@ "d2_near_sw", "d3_near_w", "d3_near_se", - ) \ No newline at end of file + ) diff --git a/modular_chomp/maps/southern_cross/southern_cross_events.dm b/modular_chomp/maps/southern_cross/southern_cross_events.dm index 0fdce99136..5ad3a6c6d9 100644 --- a/modular_chomp/maps/southern_cross/southern_cross_events.dm +++ b/modular_chomp/maps/southern_cross/southern_cross_events.dm @@ -20,4 +20,4 @@ /area/rnd/xenobiology/xenoflora_storage, /area/rnd/xenobiology/xenoflora_isolation ) - ignore_blast_doors = TRUE // Needed to avoid a breach. \ No newline at end of file + ignore_blast_doors = TRUE // Needed to avoid a breach. diff --git a/modular_chomp/maps/southern_cross/submaps/gateway/BaseBlep.dm b/modular_chomp/maps/southern_cross/submaps/gateway/BaseBlep.dm index 7b84fb1cd4..1baabe9695 100644 --- a/modular_chomp/maps/southern_cross/submaps/gateway/BaseBlep.dm +++ b/modular_chomp/maps/southern_cross/submaps/gateway/BaseBlep.dm @@ -33,4 +33,4 @@ requires_power = 0 //Because dumb Vr errors -/area/vr \ No newline at end of file +/area/vr diff --git a/modular_chomp/maps/southern_cross/submaps/gateway/carpfarm.dm b/modular_chomp/maps/southern_cross/submaps/gateway/carpfarm.dm index 9cf1f91f39..9e8e989fb2 100644 --- a/modular_chomp/maps/southern_cross/submaps/gateway/carpfarm.dm +++ b/modular_chomp/maps/southern_cross/submaps/gateway/carpfarm.dm @@ -22,4 +22,4 @@ carp attracted to vibrations. killed dimitri. yuri thought good idea to jury-rig hoverpods with lasers. not good idea. \ very bad idea. only pissed them off. giant white carp appeared. killed ivan. then giant carp cracked yuri pod like \ eggshell and swallowed yuri.

no food. can't call help. carp chewed comms relay. 2 weeks since then. \ - can't eat carp. is poison.

avenge comrades. avenge me. i die in glory.

-markov" \ No newline at end of file + can't eat carp. is poison.

avenge comrades. avenge me. i die in glory.

-markov" diff --git a/modular_chomp/maps/southern_cross/submaps/gateway/hiddeneclipse.dm b/modular_chomp/maps/southern_cross/submaps/gateway/hiddeneclipse.dm index 8513edc26a..666ec56141 100644 --- a/modular_chomp/maps/southern_cross/submaps/gateway/hiddeneclipse.dm +++ b/modular_chomp/maps/southern_cross/submaps/gateway/hiddeneclipse.dm @@ -63,4 +63,4 @@ /area/awaymission/hiddeneclipse/theabyss name = "Strange Void" - requires_power = 0 \ No newline at end of file + requires_power = 0 diff --git a/modular_chomp/maps/southern_cross/submaps/gateway/maddnesslab.dm b/modular_chomp/maps/southern_cross/submaps/gateway/maddnesslab.dm index 058ddd64fa..d85e22dac2 100644 --- a/modular_chomp/maps/southern_cross/submaps/gateway/maddnesslab.dm +++ b/modular_chomp/maps/southern_cross/submaps/gateway/maddnesslab.dm @@ -145,4 +145,4 @@ So locked it behind a buttons in our research wings
And hey if you're hearing this, take care of my drake please.
Ashy is a good one.
- "} \ No newline at end of file + "} diff --git a/modular_chomp/maps/submaps/surface_submaps/mountains/mountains_areas.dm b/modular_chomp/maps/submaps/surface_submaps/mountains/mountains_areas.dm index 5dffdaafc9..5985fc7392 100644 --- a/modular_chomp/maps/submaps/surface_submaps/mountains/mountains_areas.dm +++ b/modular_chomp/maps/submaps/surface_submaps/mountains/mountains_areas.dm @@ -175,4 +175,4 @@ /area/submap/cave/oregrubdeposit name = "POI Caves - Oregrub Deposit" - ambience = AMBIENCE_SPACE \ No newline at end of file + ambience = AMBIENCE_SPACE diff --git a/modular_chomp/maps/submaps/surface_submaps/plains/plains_areas.dm b/modular_chomp/maps/submaps/surface_submaps/plains/plains_areas.dm index 8dd7d6f4d0..bbb827f1c4 100644 --- a/modular_chomp/maps/submaps/surface_submaps/plains/plains_areas.dm +++ b/modular_chomp/maps/submaps/surface_submaps/plains/plains_areas.dm @@ -143,4 +143,4 @@ name = "POI Plains - Rocky Crevice" /area/submap/peninsula - name = "POI Plains - Peninsula" \ No newline at end of file + name = "POI Plains - Peninsula" diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/valley_areas.dm b/modular_chomp/maps/submaps/surface_submaps/valley/valley_areas.dm index a17d91c2a0..4e3b09cdae 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/valley_areas.dm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/valley_areas.dm @@ -225,4 +225,4 @@ /area/submap/terraforming name = "Poi Valley - Terraforming" - ambience = AMBIENCE_RUINS \ No newline at end of file + ambience = AMBIENCE_RUINS diff --git a/modular_chomp/maps/submaps/surface_submaps/valleyend/valleyend_areas.dm b/modular_chomp/maps/submaps/surface_submaps/valleyend/valleyend_areas.dm index d2dbeaa909..d86417f3c2 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valleyend/valleyend_areas.dm +++ b/modular_chomp/maps/submaps/surface_submaps/valleyend/valleyend_areas.dm @@ -13,4 +13,4 @@ /area/submap/thehive name = "Poi Valley End - The Hive" - ambience = AMBIENCE_RUINS \ No newline at end of file + ambience = AMBIENCE_RUINS diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/wilderness_areas.dm b/modular_chomp/maps/submaps/surface_submaps/wilderness/wilderness_areas.dm index 7e8fd0c900..e52a45bc7d 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/wilderness_areas.dm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/wilderness_areas.dm @@ -237,4 +237,4 @@ /area/submap/VolcanicFissure name = "POI Wilderness - Volcanic Fissure" - ambience = AMBIENCE_RUINS \ No newline at end of file + ambience = AMBIENCE_RUINS diff --git a/modular_chomp/maps/virgo_minitest/virgo_minitest.dm b/modular_chomp/maps/virgo_minitest/virgo_minitest.dm index 4a7f68fbaf..0f71287a21 100644 --- a/modular_chomp/maps/virgo_minitest/virgo_minitest.dm +++ b/modular_chomp/maps/virgo_minitest/virgo_minitest.dm @@ -16,4 +16,4 @@ #warn A map has already been included, ignoring Virgo_minitest -#endif \ No newline at end of file +#endif diff --git a/modular_chomp/maps/virgo_minitest/virgo_minitest_defines.dm b/modular_chomp/maps/virgo_minitest/virgo_minitest_defines.dm index ec26a64351..837fda7354 100644 --- a/modular_chomp/maps/virgo_minitest/virgo_minitest_defines.dm +++ b/modular_chomp/maps/virgo_minitest/virgo_minitest_defines.dm @@ -78,4 +78,4 @@ new /datum/random_map/automata/cave_system(null, 1, 1, Z_LEVEL_MAIN_VIRGO_TESTING, world.maxx, world.maxy) new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_MAIN_VIRGO_TESTING, 64, 64) */ - return 1 \ No newline at end of file + return 1 diff --git a/modular_chomp/read this.txt b/modular_chomp/read this.txt index d5a5e58260..5a44f3d4f4 100644 --- a/modular_chomp/read this.txt +++ b/modular_chomp/read this.txt @@ -11,4 +11,4 @@ Ideally, the point of this is to make it slightly easier to differentiate chomp When should you use this? Mostly for chomp exclusive stuff, otherwise if it's expected to be a part of upstream as well, probably in the base files. From now on, any code I completely rewrite from virgo, I'll be including in this set of folders. --BlackMajor \ No newline at end of file +-BlackMajor diff --git a/tools/ci/validate_files.sh b/tools/ci/validate_files.sh index 4bf4b65ef5..e40decdc2b 100755 --- a/tools/ci/validate_files.sh +++ b/tools/ci/validate_files.sh @@ -21,7 +21,7 @@ if command -v rg >/dev/null 2>&1; then if [ ! rg -P '' >/dev/null 2>&1 ] ; then pcre2_support=0 fi - code_files="code/**/**.dm" + code_files="code/**/**.dm modular_chomp/code/**/**.dm" # CHOMPEdit - Modular code map_files="maps/**/**.dmm" modular_map_files="modular_chomp/maps/**/**.dmm" # CHOMPEdit - Modular maps # shuttle_map_files="_maps/shuttles/**.dmm" @@ -29,7 +29,7 @@ if command -v rg >/dev/null 2>&1; then else pcre2_support=0 grep=grep - code_files="-r --include=code/**/**.dm" + code_files="-r --include=code/**/**.dm --include=modular_chomp/code/**/**.dm" # CHOMPEdit - Modular code map_files="-r --include=maps/**/**.dmm" modular_map_files="-r --include=modular_chomp/maps/**/**.dmm" # CHOMPEdit - Modular maps # shuttle_map_files="-r --include=_maps/shuttles/**.dmm" diff --git a/vorestation.dme b/vorestation.dme index 86af304ccb..59eecebb20 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4793,6 +4793,7 @@ #include "modular_chomp\code\_onclick\hud\alert.dm" #include "modular_chomp\code\ATMOSPHERICS\atmospherics.dm" #include "modular_chomp\code\datums\http.dm" +#include "modular_chomp\code\datums\tgs_event_handler.dm" #include "modular_chomp\code\datums\autolathe\engineering_ch.dm" #include "modular_chomp\code\datums\autolathe\general_ch.dm" #include "modular_chomp\code\datums\components\dry.dm" @@ -4824,21 +4825,30 @@ #include "modular_chomp\code\game\jobs\job\silicon.dm" #include "modular_chomp\code\game\machinery\airconditioner_ch.dm" #include "modular_chomp\code\game\machinery\autolathe_armory.dm" +#include "modular_chomp\code\game\machinery\buttons.dm" +#include "modular_chomp\code\game\machinery\bluespace_denier.dm" #include "modular_chomp\code\game\machinery\cryopod.dm" #include "modular_chomp\code\game\machinery\door_control.dm" #include "modular_chomp\code\game\machinery\food_replicator.dm" #include "modular_chomp\code\game\machinery\holosign.dm" +#include "modular_chomp\code\game\machinery\turrets.dm" +#include "modular_chomp\code\game\machinery\traptiles.dm" #include "modular_chomp\code\game\machinery\paradox.dm" #include "modular_chomp\code\game\machinery\portable_turret.dm" #include "modular_chomp\code\game\machinery\vending.dm" #include "modular_chomp\code\game\machinery\virtual_reality\vr_console.dm" #include "modular_chomp\code\game\mecha\mecha_construction_paths.dm" +#include "modular_chomp\code\game\objects\trash_eating.dm" #include "modular_chomp\code\game\mecha\mecha_parts.dm" #include "modular_chomp\code\game\mecha\secert\hades.dm" #include "modular_chomp\code\game\objects\items.dm" #include "modular_chomp\code\game\objects\mob_spawner.dm" +#include "modular_chomp\code\game\objects\effects\step_triggers.dm" +#include "modular_chomp\code\game\objects\effects\spiders.dm" #include "modular_chomp\code\game\objects\effects\dark_growth.dm" #include "modular_chomp\code\game\objects\effects\explosion.dm" +#include "modular_chomp\code\game\objects\effects\simple_portals.dm" +#include "modular_chomp\code\game\objects\effects\spawner.dm" #include "modular_chomp\code\game\objects\items\contraband.dm" #include "modular_chomp\code\game\objects\items\target_toy.dm" #include "modular_chomp\code\game\objects\items\clockwork\ratvarian_spear.dm" @@ -4857,6 +4867,10 @@ #include "modular_chomp\code\game\objects\random\misc.dm" #include "modular_chomp\code\game\objects\structures\desert_planet_structures.dm" #include "modular_chomp\code\game\objects\structures\flora.dm" +#include "modular_chomp\code\game\turfs\simulated\shuttlewalls.dm" +#include "modular_chomp\code\game\turfs\simulated\shuttlewalls_icon.dm" +#include "modular_chomp\code\game\turfs\simulated\shuttlewalls_attacks.dm" +#include "modular_chomp\code\game\turfs\simulated\shuttlewall_types.dm" #include "modular_chomp\code\game\objects\structures\loot_pile.dm" #include "modular_chomp\code\game\objects\structures\tyr_project_props.dm" #include "modular_chomp\code\game\objects\structures\watercloset_ch.dm" @@ -5145,20 +5159,6 @@ #include "modular_chomp\code\modules\xenobio\machinery\monkey_processor.dm" #include "modular_chomp\code\ZAS\Fire.dm" #include "modular_chomp\code\ZAS\Fire_acts.dm" -#include "modular_chomp\datums\tgs_event_handler.dm" -#include "modular_chomp\game\effects\simple_portals.dm" -#include "modular_chomp\game\effects\spawner.dm" -#include "modular_chomp\game\machinery\bluespace_denier.dm" -#include "modular_chomp\game\machinery\buttons.dm" -#include "modular_chomp\game\machinery\traptiles.dm" -#include "modular_chomp\game\machinery\turrets.dm" -#include "modular_chomp\game\objects\trash_eating.dm" -#include "modular_chomp\game\objects\effects\spiders.dm" -#include "modular_chomp\game\objects\effects\step_triggers.dm" -#include "modular_chomp\game\turfs\shuttlewall_types.dm" -#include "modular_chomp\game\turfs\shuttlewalls.dm" -#include "modular_chomp\game\turfs\shuttlewalls_attacks.dm" -#include "modular_chomp\game\turfs\shuttlewalls_icon.dm" #include "modular_chomp\icons\turf\flooring\flooring_premade.dm" #include "modular_chomp\maps\overmap\aegis_carrier\aegis_objs.dm" #include "modular_chomp\maps\overmap\om_ships\offmap.dm"