From 391a71ba304fae75fa682176c20aa3e8accec0c0 Mon Sep 17 00:00:00 2001 From: Thunder12345 Date: Wed, 28 Jul 2021 09:46:25 +0100 Subject: [PATCH] removes all misc files/folders from the projectiles module (#60478) Co-authored-by: Thunder12345 --- .../caseless/{misc.dm => energy.dm} | 8 ------- .../ammunition/caseless/harpoon.dm | 5 +++++ .../internal/{misc.dm => meathook.dm} | 0 .../guns/{misc => ballistic}/bow.dm | 0 .../guns/{misc => energy}/beam_rifle.dm | 0 .../guns/{misc => special}/blastcannon.dm | 0 .../guns/{misc => special}/chem_gun.dm | 0 .../{misc => special}/grenade_launcher.dm | 0 .../guns/{misc => special}/medbeam.dm | 0 .../guns/{misc => special}/syringe_gun.dm | 0 .../energy/{misc.dm => decloner.dm} | 8 ------- .../projectiles/projectile/energy/ninja.dm | 7 ++++++ tgstation.dme | 22 ++++++++++--------- 13 files changed, 24 insertions(+), 26 deletions(-) rename code/modules/projectiles/ammunition/caseless/{misc.dm => energy.dm} (62%) create mode 100644 code/modules/projectiles/ammunition/caseless/harpoon.dm rename code/modules/projectiles/boxes_magazines/internal/{misc.dm => meathook.dm} (100%) rename code/modules/projectiles/guns/{misc => ballistic}/bow.dm (100%) rename code/modules/projectiles/guns/{misc => energy}/beam_rifle.dm (100%) rename code/modules/projectiles/guns/{misc => special}/blastcannon.dm (100%) rename code/modules/projectiles/guns/{misc => special}/chem_gun.dm (100%) rename code/modules/projectiles/guns/{misc => special}/grenade_launcher.dm (100%) rename code/modules/projectiles/guns/{misc => special}/medbeam.dm (100%) rename code/modules/projectiles/guns/{misc => special}/syringe_gun.dm (100%) rename code/modules/projectiles/projectile/energy/{misc.dm => decloner.dm} (64%) create mode 100644 code/modules/projectiles/projectile/energy/ninja.dm diff --git a/code/modules/projectiles/ammunition/caseless/misc.dm b/code/modules/projectiles/ammunition/caseless/energy.dm similarity index 62% rename from code/modules/projectiles/ammunition/caseless/misc.dm rename to code/modules/projectiles/ammunition/caseless/energy.dm index be500bf6645..9461bc4b153 100644 --- a/code/modules/projectiles/ammunition/caseless/misc.dm +++ b/code/modules/projectiles/ammunition/caseless/energy.dm @@ -7,11 +7,3 @@ projectile_type = /obj/projectile/beam fire_sound = 'sound/weapons/laser.ogg' firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/energy - - // Harpoons (Ballistic Harpoon Gun) - -/obj/item/ammo_casing/caseless/harpoon - name = "harpoon" - caliber = CALIBER_HARPOON - icon_state = "magspear" - projectile_type = /obj/projectile/bullet/harpoon diff --git a/code/modules/projectiles/ammunition/caseless/harpoon.dm b/code/modules/projectiles/ammunition/caseless/harpoon.dm new file mode 100644 index 00000000000..5f1b402cf7f --- /dev/null +++ b/code/modules/projectiles/ammunition/caseless/harpoon.dm @@ -0,0 +1,5 @@ +/obj/item/ammo_casing/caseless/harpoon + name = "harpoon" + caliber = CALIBER_HARPOON + icon_state = "magspear" + projectile_type = /obj/projectile/bullet/harpoon diff --git a/code/modules/projectiles/boxes_magazines/internal/misc.dm b/code/modules/projectiles/boxes_magazines/internal/meathook.dm similarity index 100% rename from code/modules/projectiles/boxes_magazines/internal/misc.dm rename to code/modules/projectiles/boxes_magazines/internal/meathook.dm diff --git a/code/modules/projectiles/guns/misc/bow.dm b/code/modules/projectiles/guns/ballistic/bow.dm similarity index 100% rename from code/modules/projectiles/guns/misc/bow.dm rename to code/modules/projectiles/guns/ballistic/bow.dm diff --git a/code/modules/projectiles/guns/misc/beam_rifle.dm b/code/modules/projectiles/guns/energy/beam_rifle.dm similarity index 100% rename from code/modules/projectiles/guns/misc/beam_rifle.dm rename to code/modules/projectiles/guns/energy/beam_rifle.dm diff --git a/code/modules/projectiles/guns/misc/blastcannon.dm b/code/modules/projectiles/guns/special/blastcannon.dm similarity index 100% rename from code/modules/projectiles/guns/misc/blastcannon.dm rename to code/modules/projectiles/guns/special/blastcannon.dm diff --git a/code/modules/projectiles/guns/misc/chem_gun.dm b/code/modules/projectiles/guns/special/chem_gun.dm similarity index 100% rename from code/modules/projectiles/guns/misc/chem_gun.dm rename to code/modules/projectiles/guns/special/chem_gun.dm diff --git a/code/modules/projectiles/guns/misc/grenade_launcher.dm b/code/modules/projectiles/guns/special/grenade_launcher.dm similarity index 100% rename from code/modules/projectiles/guns/misc/grenade_launcher.dm rename to code/modules/projectiles/guns/special/grenade_launcher.dm diff --git a/code/modules/projectiles/guns/misc/medbeam.dm b/code/modules/projectiles/guns/special/medbeam.dm similarity index 100% rename from code/modules/projectiles/guns/misc/medbeam.dm rename to code/modules/projectiles/guns/special/medbeam.dm diff --git a/code/modules/projectiles/guns/misc/syringe_gun.dm b/code/modules/projectiles/guns/special/syringe_gun.dm similarity index 100% rename from code/modules/projectiles/guns/misc/syringe_gun.dm rename to code/modules/projectiles/guns/special/syringe_gun.dm diff --git a/code/modules/projectiles/projectile/energy/misc.dm b/code/modules/projectiles/projectile/energy/decloner.dm similarity index 64% rename from code/modules/projectiles/projectile/energy/misc.dm rename to code/modules/projectiles/projectile/energy/decloner.dm index 79ee634a3e6..1b117111198 100644 --- a/code/modules/projectiles/projectile/energy/misc.dm +++ b/code/modules/projectiles/projectile/energy/decloner.dm @@ -9,11 +9,3 @@ /obj/projectile/energy/declone/weak damage = 9 irradiate = 30 - -/obj/projectile/energy/dart //ninja throwing dart - name = "dart" - icon_state = "toxin" - damage = 5 - damage_type = TOX - paralyze = 100 - range = 7 diff --git a/code/modules/projectiles/projectile/energy/ninja.dm b/code/modules/projectiles/projectile/energy/ninja.dm new file mode 100644 index 00000000000..901cde426b5 --- /dev/null +++ b/code/modules/projectiles/projectile/energy/ninja.dm @@ -0,0 +1,7 @@ +/obj/projectile/energy/dart //ninja throwing dart + name = "dart" + icon_state = "toxin" + damage = 5 + damage_type = TOX + paralyze = 100 + range = 7 diff --git a/tgstation.dme b/tgstation.dme index 7bf7031c62d..db9eec7fe04 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3088,8 +3088,9 @@ #include "code\modules\projectiles\ammunition\ballistic\smg.dm" #include "code\modules\projectiles\ammunition\ballistic\sniper.dm" #include "code\modules\projectiles\ammunition\caseless\_caseless.dm" +#include "code\modules\projectiles\ammunition\caseless\energy.dm" #include "code\modules\projectiles\ammunition\caseless\foam.dm" -#include "code\modules\projectiles\ammunition\caseless\misc.dm" +#include "code\modules\projectiles\ammunition\caseless\harpoon.dm" #include "code\modules\projectiles\ammunition\caseless\rocket.dm" #include "code\modules\projectiles\ammunition\energy\_energy.dm" #include "code\modules\projectiles\ammunition\energy\ebow.dm" @@ -3116,7 +3117,7 @@ #include "code\modules\projectiles\boxes_magazines\internal\_cylinder.dm" #include "code\modules\projectiles\boxes_magazines\internal\_internal.dm" #include "code\modules\projectiles\boxes_magazines\internal\grenade.dm" -#include "code\modules\projectiles\boxes_magazines\internal\misc.dm" +#include "code\modules\projectiles\boxes_magazines\internal\meathook.dm" #include "code\modules\projectiles\boxes_magazines\internal\revolver.dm" #include "code\modules\projectiles\boxes_magazines\internal\rifle.dm" #include "code\modules\projectiles\boxes_magazines\internal\shotgun.dm" @@ -3125,12 +3126,14 @@ #include "code\modules\projectiles\guns\energy.dm" #include "code\modules\projectiles\guns\magic.dm" #include "code\modules\projectiles\guns\ballistic\automatic.dm" +#include "code\modules\projectiles\guns\ballistic\bow.dm" #include "code\modules\projectiles\guns\ballistic\launchers.dm" #include "code\modules\projectiles\guns\ballistic\pistol.dm" #include "code\modules\projectiles\guns\ballistic\revolver.dm" #include "code\modules\projectiles\guns\ballistic\rifle.dm" #include "code\modules\projectiles\guns\ballistic\shotgun.dm" #include "code\modules\projectiles\guns\ballistic\toy.dm" +#include "code\modules\projectiles\guns\energy\beam_rifle.dm" #include "code\modules\projectiles\guns\energy\dueling.dm" #include "code\modules\projectiles\guns\energy\energy_gun.dm" #include "code\modules\projectiles\guns\energy\kinetic_accelerator.dm" @@ -3142,13 +3145,11 @@ #include "code\modules\projectiles\guns\energy\stun.dm" #include "code\modules\projectiles\guns\magic\staff.dm" #include "code\modules\projectiles\guns\magic\wand.dm" -#include "code\modules\projectiles\guns\misc\beam_rifle.dm" -#include "code\modules\projectiles\guns\misc\blastcannon.dm" -#include "code\modules\projectiles\guns\misc\bow.dm" -#include "code\modules\projectiles\guns\misc\chem_gun.dm" -#include "code\modules\projectiles\guns\misc\grenade_launcher.dm" -#include "code\modules\projectiles\guns\misc\medbeam.dm" -#include "code\modules\projectiles\guns\misc\syringe_gun.dm" +#include "code\modules\projectiles\guns\special\blastcannon.dm" +#include "code\modules\projectiles\guns\special\chem_gun.dm" +#include "code\modules\projectiles\guns\special\grenade_launcher.dm" +#include "code\modules\projectiles\guns\special\medbeam.dm" +#include "code\modules\projectiles\guns\special\syringe_gun.dm" #include "code\modules\projectiles\projectile\beams.dm" #include "code\modules\projectiles\projectile\bullets.dm" #include "code\modules\projectiles\projectile\magic.dm" @@ -3166,9 +3167,10 @@ #include "code\modules\projectiles\projectile\bullets\sniper.dm" #include "code\modules\projectiles\projectile\bullets\special.dm" #include "code\modules\projectiles\projectile\energy\_energy.dm" +#include "code\modules\projectiles\projectile\energy\decloner.dm" #include "code\modules\projectiles\projectile\energy\ebow.dm" -#include "code\modules\projectiles\projectile\energy\misc.dm" #include "code\modules\projectiles\projectile\energy\net_snare.dm" +#include "code\modules\projectiles\projectile\energy\ninja.dm" #include "code\modules\projectiles\projectile\energy\nuclear_particle.dm" #include "code\modules\projectiles\projectile\energy\stun.dm" #include "code\modules\projectiles\projectile\energy\tesla.dm"