From 05159e8029a31137d802c50d83b5aa72aa965927 Mon Sep 17 00:00:00 2001 From: Zna12 Date: Tue, 6 Mar 2018 21:54:15 -0600 Subject: [PATCH 1/2] Degradable Darts, Citadel Style Just incase upstream doesn't want my memes. --- .../modules/reagents/chemistry/reagents/other_reagents.dm | 7 +++++++ tgstation.dme | 1 + 2 files changed, 8 insertions(+) create mode 100644 modular_citadel/code/modules/reagents/chemistry/reagents/other_reagents.dm diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/other_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/other_reagents.dm new file mode 100644 index 0000000000..447a73b9c7 --- /dev/null +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -0,0 +1,7 @@ +/datum/reagent/space_cleaner/reaction_obj(obj/O, reac_volume) + if(istype(O, /obj/effect/decal/cleanable) || istype(O, /obj/item/projectile/bullet/reusable/foam_dart/mag) || istype(O, /obj/item/ammo_casing/caseless/foam_dart)) + qdel(O) + else + if(O) + O.remove_atom_colour(WASHABLE_COLOUR_PRIORITY) + O.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD) diff --git a/tgstation.dme b/tgstation.dme index 5690081ec3..5ff54b3ea5 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2707,6 +2707,7 @@ #include "modular_citadel\code\modules\projectiles\guns\ballistic\revolver.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\reagents\chemistry\reagents\other_reagents.dm" #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\techweb\_techweb.dm" From 09c840d29194ed487344a99f54107b62cb2f8bdc Mon Sep 17 00:00:00 2001 From: Zna12 Date: Tue, 6 Mar 2018 22:42:02 -0600 Subject: [PATCH 2/2] Woops. I wasn't paying enough attention, but it added a feature I wasn't intending. This smooths out the feature. --- .../code/modules/reagents/chemistry/reagents/other_reagents.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/other_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/other_reagents.dm index 447a73b9c7..0b57c621f2 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -1,5 +1,5 @@ /datum/reagent/space_cleaner/reaction_obj(obj/O, reac_volume) - if(istype(O, /obj/effect/decal/cleanable) || istype(O, /obj/item/projectile/bullet/reusable/foam_dart/mag) || istype(O, /obj/item/ammo_casing/caseless/foam_dart)) + if(istype(O, /obj/effect/decal/cleanable) || istype(O, /obj/item/projectile/bullet/reusable/foam_dart) || istype(O, /obj/item/ammo_casing/caseless/foam_dart)) qdel(O) else if(O)