From 619a64173f65279e0c3690f9d7e1f109bd13f878 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Fri, 6 Jul 2018 13:56:06 -0400 Subject: [PATCH 01/10] Hopefully this will add in the missing WT-550 Toxin Ammo for sec to use! (Combat medics will use this to heal slime's more then likely as well) --- code/modules/projectiles/boxes_magazines/external/smg.dm | 4 ++++ code/modules/research/designs/weapon_designs.dm | 8 ++++++++ code/modules/research/techweb/all_nodes.dm | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/boxes_magazines/external/smg.dm b/code/modules/projectiles/boxes_magazines/external/smg.dm index c6dc004879..dcb07e7608 100644 --- a/code/modules/projectiles/boxes_magazines/external/smg.dm +++ b/code/modules/projectiles/boxes_magazines/external/smg.dm @@ -14,6 +14,10 @@ icon_state = "46x30mmtA-20" ammo_type = /obj/item/ammo_casing/c46x30mm/ap +/obj/item/ammo_box/magazine/wt550m9/wttx + name = "wt550 magazine (Toxin Tipped 4.6x30mm)" + ammo_type = /obj/item/ammo_casing/c46x30mmtox + /obj/item/ammo_box/magazine/wt550m9/wtap/update_icon() ..() icon_state = "46x30mmtA-[round(ammo_count(),4)]" diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index 2fcb20a498..bd2d25a552 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -230,6 +230,14 @@ build_path = /obj/item/ammo_box/magazine/wt550m9/wtap departmental_flags = DEPARTMENTAL_FLAG_SECURITY +/datum/design/mag_oldsmg/tx_mag + name = "WT-550 Auto Gun Uranium Magazine (4.6x30mm TX)" + desc = "A 20 round uranium tipped magazine for the out of date security WT-550 Auto Rifle" + id = "mag_oldsmg_tx" + materials = list(MAT_METAL = 6000, MAT_SILVER = 600, MAT_URANIUM = 2000) + build_path = /obj/item/ammo_box/magazine/wt550m9/wttx + departmental_flags = DEPARTMENTAL_FLAG_SECURITY + /datum/design/mag_oldsmg/ic_mag name = "WT-550 Auto Gun Incendiary Magazine (4.6x30mm IC)" desc = "A 20 round armour piercing magazine for the out of date security WT-550 Auto Rifle" diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 0472bb9e7a..54f70eaaab 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -588,7 +588,7 @@ display_name = "Ballistic Weaponry" description = "This isn't research.. This is reverse-engineering!" prereq_ids = list("weaponry") - design_ids = list("mag_oldsmg", "mag_oldsmg_ap", "mag_oldsmg_ic") + design_ids = list("mag_oldsmg", "mag_oldsmg_ap", "mag_oldsmg_ic", "mag_oldsmg_tx") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 From b3ecedff4f8bba62c0aa3a5db3972e90585e78e6 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 6 Jul 2018 14:49:28 -0400 Subject: [PATCH 02/10] Update weapon_designs.dm --- code/modules/research/designs/weapon_designs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index bd2d25a552..f01d1d0297 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -236,7 +236,7 @@ id = "mag_oldsmg_tx" materials = list(MAT_METAL = 6000, MAT_SILVER = 600, MAT_URANIUM = 2000) build_path = /obj/item/ammo_box/magazine/wt550m9/wttx - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENTAL_FLAG_SECURITY /datum/design/mag_oldsmg/ic_mag name = "WT-550 Auto Gun Incendiary Magazine (4.6x30mm IC)" From 64b1fca976e90a7fbe49e5d167ee44b93d74cf4d Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 6 Jul 2018 14:59:26 -0400 Subject: [PATCH 03/10] Update weapon_designs.dm --- code/modules/research/designs/weapon_designs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index f01d1d0297..9ac79d7dd6 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -236,7 +236,7 @@ id = "mag_oldsmg_tx" materials = list(MAT_METAL = 6000, MAT_SILVER = 600, MAT_URANIUM = 2000) build_path = /obj/item/ammo_box/magazine/wt550m9/wttx - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENTAL_FLAG_SECURITY /datum/design/mag_oldsmg/ic_mag name = "WT-550 Auto Gun Incendiary Magazine (4.6x30mm IC)" From d764f5128a59310a3c9fc0acdfd6b28322216f66 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Fri, 6 Jul 2018 15:49:19 -0400 Subject: [PATCH 04/10] Adds in the ammo and the bullet! --- code/modules/projectiles/ammunition/ballistic/smg.dm | 5 +++++ code/modules/projectiles/projectile/bullets/smg.dm | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/code/modules/projectiles/ammunition/ballistic/smg.dm b/code/modules/projectiles/ammunition/ballistic/smg.dm index 3be419c933..a5a71f575c 100644 --- a/code/modules/projectiles/ammunition/ballistic/smg.dm +++ b/code/modules/projectiles/ammunition/ballistic/smg.dm @@ -16,6 +16,11 @@ desc = "A 4.6x30mm incendiary bullet casing." projectile_type = /obj/item/projectile/bullet/incendiary/c46x30mm +/obj/item/ammo_casing/c46x30mm/tx + name = "Toxin Tipped 4.6x30mm bullet casing." + desc = "A Toxin Tipped 4.6x30mm bullet casing." + projectile_type = /obj/item/projectile/bullet/c46x30mm + // .45 (M1911 + C20r) /obj/item/ammo_casing/c45 diff --git a/code/modules/projectiles/projectile/bullets/smg.dm b/code/modules/projectiles/projectile/bullets/smg.dm index 50532a5977..8c4fd7eb4e 100644 --- a/code/modules/projectiles/projectile/bullets/smg.dm +++ b/code/modules/projectiles/projectile/bullets/smg.dm @@ -24,3 +24,8 @@ name = "4.6x30mm incendiary bullet" damage = 10 fire_stacks = 1 + +/obj/item/projectile/bullet/c46x30mm_tx + name = "toxin tipped 4.6x30mm bullet" + damage = 15 + damage_type = TOX \ No newline at end of file From 71c259b0c4e0c5ea4ac616bddf5809c0e38a371b Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Fri, 6 Jul 2018 17:33:07 -0400 Subject: [PATCH 05/10] MoModularized, plz don't yell at me --- code/modules/projectiles/ammunition/ballistic/smg.dm | 5 ----- .../code/modules/projectiles/ammunition/ballistic/smg.dm | 5 +++++ .../modules/projectiles/boxes_magazines/external/smg.dm | 3 +++ .../code/modules/projectiles/bullets/bullets/smg.dm | 4 ++++ .../research/designs/weapon_designs/weapon_designs.dm | 7 +++++++ modular_citadel/code/modules/research/techweb/all_nodes.dm | 3 +++ tgstation.dme | 5 +++++ 7 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 modular_citadel/code/modules/projectiles/ammunition/ballistic/smg.dm create mode 100644 modular_citadel/code/modules/projectiles/boxes_magazines/external/smg.dm create mode 100644 modular_citadel/code/modules/projectiles/bullets/bullets/smg.dm create mode 100644 modular_citadel/code/modules/research/designs/weapon_designs/weapon_designs.dm diff --git a/code/modules/projectiles/ammunition/ballistic/smg.dm b/code/modules/projectiles/ammunition/ballistic/smg.dm index a5a71f575c..3be419c933 100644 --- a/code/modules/projectiles/ammunition/ballistic/smg.dm +++ b/code/modules/projectiles/ammunition/ballistic/smg.dm @@ -16,11 +16,6 @@ desc = "A 4.6x30mm incendiary bullet casing." projectile_type = /obj/item/projectile/bullet/incendiary/c46x30mm -/obj/item/ammo_casing/c46x30mm/tx - name = "Toxin Tipped 4.6x30mm bullet casing." - desc = "A Toxin Tipped 4.6x30mm bullet casing." - projectile_type = /obj/item/projectile/bullet/c46x30mm - // .45 (M1911 + C20r) /obj/item/ammo_casing/c45 diff --git a/modular_citadel/code/modules/projectiles/ammunition/ballistic/smg.dm b/modular_citadel/code/modules/projectiles/ammunition/ballistic/smg.dm new file mode 100644 index 0000000000..7a2f69de5a --- /dev/null +++ b/modular_citadel/code/modules/projectiles/ammunition/ballistic/smg.dm @@ -0,0 +1,5 @@ + +/obj/item/ammo_casing/c46x30mm/tx + name = "Toxin Tipped 4.6x30mm bullet casing." + desc = "A Toxin Tipped 4.6x30mm bullet casing." + projectile_type = /obj/item/projectile/bullet/c46x30mm diff --git a/modular_citadel/code/modules/projectiles/boxes_magazines/external/smg.dm b/modular_citadel/code/modules/projectiles/boxes_magazines/external/smg.dm new file mode 100644 index 0000000000..fb385234bd --- /dev/null +++ b/modular_citadel/code/modules/projectiles/boxes_magazines/external/smg.dm @@ -0,0 +1,3 @@ +/obj/item/ammo_box/magazine/wt550m9/wttx + name = "wt550 magazine (Toxin Tipped 4.6x30mm)" + ammo_type = /obj/item/ammo_casing/c46x30mm/tx \ No newline at end of file diff --git a/modular_citadel/code/modules/projectiles/bullets/bullets/smg.dm b/modular_citadel/code/modules/projectiles/bullets/bullets/smg.dm new file mode 100644 index 0000000000..f069a73fe8 --- /dev/null +++ b/modular_citadel/code/modules/projectiles/bullets/bullets/smg.dm @@ -0,0 +1,4 @@ +/obj/item/projectile/bullet/c46x30mm_tx + name = "toxin tipped 4.6x30mm bullet" + damage = 15 + damage_type = TOX \ No newline at end of file diff --git a/modular_citadel/code/modules/research/designs/weapon_designs/weapon_designs.dm b/modular_citadel/code/modules/research/designs/weapon_designs/weapon_designs.dm new file mode 100644 index 0000000000..0db3bb9b1d --- /dev/null +++ b/modular_citadel/code/modules/research/designs/weapon_designs/weapon_designs.dm @@ -0,0 +1,7 @@ +/datum/design/mag_oldsmg/tx_mag + name = "WT-550 Auto Gun Uranium Magazine (4.6x30mm TX)" + desc = "A 20 round uranium tipped magazine for the out of date security WT-550 Auto Rifle" + id = "mag_oldsmg_tx" + materials = list(MAT_METAL = 6000, MAT_SILVER = 600, MAT_URANIUM = 2000) + build_path = /obj/item/ammo_box/magazine/wt550m9/wttx + departmental_flags = DEPARTMENTAL_FLAG_SECURITY \ No newline at end of file diff --git a/modular_citadel/code/modules/research/techweb/all_nodes.dm b/modular_citadel/code/modules/research/techweb/all_nodes.dm index 113d4115ac..707c399586 100644 --- a/modular_citadel/code/modules/research/techweb/all_nodes.dm +++ b/modular_citadel/code/modules/research/techweb/all_nodes.dm @@ -18,3 +18,6 @@ design_ids = list("arcade_battle", "arcade_orion", "slotmachine", "autoylathe") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000) export_price = 5000 + +/datum/techweb_node/ballistic_weapons + design_ids = list("mag_oldsmg", "mag_oldsmg_ap", "mag_oldsmg_ic", "mag_oldsmg_tx") diff --git a/tgstation.dme b/tgstation.dme index b895f951bb..4e527484f0 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2307,6 +2307,7 @@ #include "code\modules\projectiles\guns\misc\syringe_gun.dm" #include "code\modules\projectiles\projectile\beams.dm" #include "code\modules\projectiles\projectile\bullets.dm" +#include "code\modules\projectiles\projectile\energy.dm" #include "code\modules\projectiles\projectile\magic.dm" #include "code\modules\projectiles\projectile\megabuster.dm" #include "code\modules\projectiles\projectile\plasma.dm" @@ -2829,7 +2830,10 @@ #include "modular_citadel\code\modules\power\lighting.dm" #include "modular_citadel\code\modules\projectiles\gun.dm" #include "modular_citadel\code\modules\projectiles\ammunition\caseless.dm" +#include "modular_citadel\code\modules\projectiles\ammunition\ballistic\smg.dm" #include "modular_citadel\code\modules\projectiles\boxes_magazines\ammo_boxes.dm" +#include "modular_citadel\code\modules\projectiles\boxes_magazines\external\smg.dm" +#include "modular_citadel\code\modules\projectiles\bullets\bullets\smg.dm" #include "modular_citadel\code\modules\projectiles\guns\pumpenergy.dm" #include "modular_citadel\code\modules\projectiles\guns\toys.dm" #include "modular_citadel\code\modules\projectiles\guns\ballistic\flechette.dm" @@ -2852,6 +2856,7 @@ #include "modular_citadel\code\modules\research\designs\autoylathe_designs.dm" #include "modular_citadel\code\modules\research\designs\machine_designs.dm" #include "modular_citadel\code\modules\research\designs\xenobio_designs.dm" +#include "modular_citadel\code\modules\research\designs\weapon_designs\weapon_designs.dm" #include "modular_citadel\code\modules\research\techweb\_techweb.dm" #include "modular_citadel\code\modules\research\techweb\all_nodes.dm" #include "modular_citadel\code\modules\research\xenobiology\xenobio_camera.dm" From 54779cae1dbffa965201ef66724ac354f80b7567 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Fri, 6 Jul 2018 17:37:50 -0400 Subject: [PATCH 06/10] Modularized, plz dont yell at me --- .../modules/projectiles/boxes_magazines/external/{ => smg}/smg.dm | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename modular_citadel/code/modules/projectiles/boxes_magazines/external/{ => smg}/smg.dm (100%) diff --git a/modular_citadel/code/modules/projectiles/boxes_magazines/external/smg.dm b/modular_citadel/code/modules/projectiles/boxes_magazines/external/smg/smg.dm similarity index 100% rename from modular_citadel/code/modules/projectiles/boxes_magazines/external/smg.dm rename to modular_citadel/code/modules/projectiles/boxes_magazines/external/smg/smg.dm From 7f9365e1dbbdcadb5d004cf5334a538128d69373 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Fri, 6 Jul 2018 17:42:24 -0400 Subject: [PATCH 07/10] Modularized, plz dont yell at me --- .../modules/projectiles/ammunition/ballistic/{ => smg}/smg.dm | 0 tgstation.dme | 1 - 2 files changed, 1 deletion(-) rename modular_citadel/code/modules/projectiles/ammunition/ballistic/{ => smg}/smg.dm (100%) diff --git a/modular_citadel/code/modules/projectiles/ammunition/ballistic/smg.dm b/modular_citadel/code/modules/projectiles/ammunition/ballistic/smg/smg.dm similarity index 100% rename from modular_citadel/code/modules/projectiles/ammunition/ballistic/smg.dm rename to modular_citadel/code/modules/projectiles/ammunition/ballistic/smg/smg.dm diff --git a/tgstation.dme b/tgstation.dme index 4e527484f0..dcc64ad2ab 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2832,7 +2832,6 @@ #include "modular_citadel\code\modules\projectiles\ammunition\caseless.dm" #include "modular_citadel\code\modules\projectiles\ammunition\ballistic\smg.dm" #include "modular_citadel\code\modules\projectiles\boxes_magazines\ammo_boxes.dm" -#include "modular_citadel\code\modules\projectiles\boxes_magazines\external\smg.dm" #include "modular_citadel\code\modules\projectiles\bullets\bullets\smg.dm" #include "modular_citadel\code\modules\projectiles\guns\pumpenergy.dm" #include "modular_citadel\code\modules\projectiles\guns\toys.dm" From ffc5c6935ae895216819817cf51660cf7e0b85f6 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Fri, 6 Jul 2018 18:01:29 -0400 Subject: [PATCH 08/10] Lets see If I did this correct this time! --- code/modules/projectiles/boxes_magazines/external/smg.dm | 4 ---- code/modules/projectiles/projectile/bullets/smg.dm | 7 +------ code/modules/research/designs/weapon_designs.dm | 8 -------- code/modules/research/techweb/all_nodes.dm | 2 +- tgstation.dme | 1 - 5 files changed, 2 insertions(+), 20 deletions(-) diff --git a/code/modules/projectiles/boxes_magazines/external/smg.dm b/code/modules/projectiles/boxes_magazines/external/smg.dm index dcb07e7608..c6dc004879 100644 --- a/code/modules/projectiles/boxes_magazines/external/smg.dm +++ b/code/modules/projectiles/boxes_magazines/external/smg.dm @@ -14,10 +14,6 @@ icon_state = "46x30mmtA-20" ammo_type = /obj/item/ammo_casing/c46x30mm/ap -/obj/item/ammo_box/magazine/wt550m9/wttx - name = "wt550 magazine (Toxin Tipped 4.6x30mm)" - ammo_type = /obj/item/ammo_casing/c46x30mmtox - /obj/item/ammo_box/magazine/wt550m9/wtap/update_icon() ..() icon_state = "46x30mmtA-[round(ammo_count(),4)]" diff --git a/code/modules/projectiles/projectile/bullets/smg.dm b/code/modules/projectiles/projectile/bullets/smg.dm index 8c4fd7eb4e..4044a9629c 100644 --- a/code/modules/projectiles/projectile/bullets/smg.dm +++ b/code/modules/projectiles/projectile/bullets/smg.dm @@ -23,9 +23,4 @@ /obj/item/projectile/bullet/incendiary/c46x30mm name = "4.6x30mm incendiary bullet" damage = 10 - fire_stacks = 1 - -/obj/item/projectile/bullet/c46x30mm_tx - name = "toxin tipped 4.6x30mm bullet" - damage = 15 - damage_type = TOX \ No newline at end of file + fire_stacks = 1 \ No newline at end of file diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index 9ac79d7dd6..2fcb20a498 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -230,14 +230,6 @@ build_path = /obj/item/ammo_box/magazine/wt550m9/wtap departmental_flags = DEPARTMENTAL_FLAG_SECURITY -/datum/design/mag_oldsmg/tx_mag - name = "WT-550 Auto Gun Uranium Magazine (4.6x30mm TX)" - desc = "A 20 round uranium tipped magazine for the out of date security WT-550 Auto Rifle" - id = "mag_oldsmg_tx" - materials = list(MAT_METAL = 6000, MAT_SILVER = 600, MAT_URANIUM = 2000) - build_path = /obj/item/ammo_box/magazine/wt550m9/wttx - departmental_flags = DEPARTMENTAL_FLAG_SECURITY - /datum/design/mag_oldsmg/ic_mag name = "WT-550 Auto Gun Incendiary Magazine (4.6x30mm IC)" desc = "A 20 round armour piercing magazine for the out of date security WT-550 Auto Rifle" diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 54f70eaaab..0472bb9e7a 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -588,7 +588,7 @@ display_name = "Ballistic Weaponry" description = "This isn't research.. This is reverse-engineering!" prereq_ids = list("weaponry") - design_ids = list("mag_oldsmg", "mag_oldsmg_ap", "mag_oldsmg_ic", "mag_oldsmg_tx") + design_ids = list("mag_oldsmg", "mag_oldsmg_ap", "mag_oldsmg_ic") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 diff --git a/tgstation.dme b/tgstation.dme index dcc64ad2ab..2651370688 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2830,7 +2830,6 @@ #include "modular_citadel\code\modules\power\lighting.dm" #include "modular_citadel\code\modules\projectiles\gun.dm" #include "modular_citadel\code\modules\projectiles\ammunition\caseless.dm" -#include "modular_citadel\code\modules\projectiles\ammunition\ballistic\smg.dm" #include "modular_citadel\code\modules\projectiles\boxes_magazines\ammo_boxes.dm" #include "modular_citadel\code\modules\projectiles\bullets\bullets\smg.dm" #include "modular_citadel\code\modules\projectiles\guns\pumpenergy.dm" From d6715b16b088a1ddc92f6ce4b95cc3e20509d23a Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Fri, 6 Jul 2018 18:26:42 -0400 Subject: [PATCH 09/10] Try's to code in something poorly.exe --- tgstation.dme | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tgstation.dme b/tgstation.dme index 2651370688..4f20cb1cab 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2830,7 +2830,9 @@ #include "modular_citadel\code\modules\power\lighting.dm" #include "modular_citadel\code\modules\projectiles\gun.dm" #include "modular_citadel\code\modules\projectiles\ammunition\caseless.dm" +#include "modular_citadel\code\modules\projectiles\ammunition\ballistic\smg\smg.dm" #include "modular_citadel\code\modules\projectiles\boxes_magazines\ammo_boxes.dm" +#include "modular_citadel\code\modules\projectiles\boxes_magazines\external\smg\smg.dm" #include "modular_citadel\code\modules\projectiles\bullets\bullets\smg.dm" #include "modular_citadel\code\modules\projectiles\guns\pumpenergy.dm" #include "modular_citadel\code\modules\projectiles\guns\toys.dm" @@ -2842,7 +2844,6 @@ #include "modular_citadel\code\modules\projectiles\guns\ballistic\spinfusor.dm" #include "modular_citadel\code\modules\projectiles\guns\energy\energy_gun.dm" #include "modular_citadel\code\modules\projectiles\guns\energy\laser.dm" -#include "modular_citadel\code\modules\projectiles\projectile\energy.dm" #include "modular_citadel\code\modules\projectiles\projectiles\reusable.dm" #include "modular_citadel\code\modules\reagents\chemistry\reagents\other_reagents.dm" #include "modular_citadel\code\modules\reagents\reagent container\cit_kegs.dm" From fb9f85f6fc385b8114927b9f2c689fd8dacf256a Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Fri, 6 Jul 2018 18:37:48 -0400 Subject: [PATCH 10/10] Trys to code something for 10 hours and fails at it.exe --- tgstation.dme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgstation.dme b/tgstation.dme index 4f20cb1cab..ee564b6c00 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2307,7 +2307,6 @@ #include "code\modules\projectiles\guns\misc\syringe_gun.dm" #include "code\modules\projectiles\projectile\beams.dm" #include "code\modules\projectiles\projectile\bullets.dm" -#include "code\modules\projectiles\projectile\energy.dm" #include "code\modules\projectiles\projectile\magic.dm" #include "code\modules\projectiles\projectile\megabuster.dm" #include "code\modules\projectiles\projectile\plasma.dm" @@ -2844,6 +2843,7 @@ #include "modular_citadel\code\modules\projectiles\guns\ballistic\spinfusor.dm" #include "modular_citadel\code\modules\projectiles\guns\energy\energy_gun.dm" #include "modular_citadel\code\modules\projectiles\guns\energy\laser.dm" +#include "modular_citadel\code\modules\projectiles\projectile\energy.dm" #include "modular_citadel\code\modules\projectiles\projectiles\reusable.dm" #include "modular_citadel\code\modules\reagents\chemistry\reagents\other_reagents.dm" #include "modular_citadel\code\modules\reagents\reagent container\cit_kegs.dm"