Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit

code/modules/mod/modules/modules.dm

@@ -1,3 +1,15 @@
+//Magic Nullifier
+/obj/item/mod/module/anti_magic
+	name = "MOD magic nullifier module"
+	desc = "A series of obsidian rods installed into critical points around the suit, \
+		vibrated at a certain low frequency to enable them to resonate. \
+		This creates a low-range, yet strong, magic nullification field around the user, \
+		aided by a full replacement of the suit's normal coolant with holy water. \
+		Spells will spall right off this field, though it'll do nothing to help others believe you about all this."
+	icon_state = "magic_nullifier"
+	removable = FALSE
+	incompatible_modules = list(/obj/item/mod/module/anti_magic)
+
 /obj/item/mod/module/anti_magic/on_suit_activation()
 	ADD_TRAIT(mod.wearer, TRAIT_ANTIMAGIC, MOD_TRAIT)
 	ADD_TRAIT(mod.wearer, TRAIT_HOLY, MOD_TRAIT)
@@ -94,3 +106,21 @@
 
 /obj/item/mod/module/insignia/chaplain
 	color = "#f0a00c"
+
+/obj/item/mod/module/noslip
+	name = "MOD anti slip module"
+	desc = "These are a modified variant of standard magnetic boots, utilizing piezoelectric crystals on the soles. \
+		The two plates on the bottom of the boots automatically extend and magnetize as the user steps; \
+		a pull that's too weak to offer them the ability to affix to a hull, but just strong enough to \
+		protect against the fact that you didn't read the wet floor sign. Honk Co. has come out numerous times \
+		in protest of these modules being legal."
+	icon_state = "noslip"
+	complexity = 1
+	idle_power_cost = DEFAULT_CHARGE_DRAIN * 0.1
+	incompatible_modules = list(/obj/item/mod/module/noslip)
+
+/obj/item/mod/module/noslip/on_suit_activation()
+	ADD_TRAIT(mod.wearer, TRAIT_NOSLIPWATER, MOD_TRAIT)
+
+/obj/item/mod/module/noslip/on_suit_deactivation()
+	REMOVE_TRAIT(mod.wearer, TRAIT_NOSLIPWATER, MOD_TRAIT)

code/modules/mod/modules/modules_service.dm

@@ -64,3 +64,33 @@
 	spark_effect_two.set_up(2, 1, microwave_target_loc)
 	spark_effect_two.start()
 	drain_power(use_power_cost)
+
+//Waddle
+
+//Waddling element not yet portee, commented out for now.
+/*
+/obj/item/mod/module/waddle
+	name = "MOD waddle module"
+	desc = "Some of the most primitive technology in use by HonkCo. This module works off an automatic intention system, \
+		utilizing its sensitivity to the pilot's often-limited brainwaves to directly read their next step, \
+		affecting the boots they're installed in. Employing a twin-linked gravitonic drive to create \
+		miniaturized etheric blasts of space-time beneath the user's feet, this enables them to... \
+		to waddle around, bouncing to and fro with a pep in their step."
+	icon_state = "waddle"
+	idle_power_cost = DEFAULT_CHARGE_DRAIN * 0.2
+	removable = FALSE
+	incompatible_modules = list(/obj/item/mod/module/waddle)
+
+/obj/item/mod/module/waddle/on_suit_activation()
+	mod.AddComponent(/datum/component/squeak, list('sound/effects/clownstep1.ogg'=1,'sound/effects/clownstep2.ogg'=1), 50, falloff_exponent = 20) //die off quick please
+	mod.wearer.AddElement(/datum/element/waddling)
+	if(is_clown_job(mod.wearer.mind?.assigned_role))
+		SEND_SIGNAL(mod.wearer, COMSIG_ADD_MOOD_EVENT, "clownshoes", /datum/mood_event/clownshoes)
+
+/obj/item/mod/module/waddle/on_suit_deactivation()
+	qdel(mod.GetComponent(/datum/component/squeak))
+	mod.wearer.RemoveElement(/datum/element/waddling)
+	if(is_clown_job(mod.wearer.mind?.assigned_role))
+		SEND_SIGNAL(mod.wearer, COMSIG_CLEAR_MOOD_EVENT, "clownshoes")
+
+*/