Demodularizing the arousal module.

code/modules/arousal/genitals_sprite_accessories.dm

@@ -9,7 +9,7 @@
 
 //DICKS,COCKS,PENISES,WHATEVER YOU WANT TO CALL THEM
 /datum/sprite_accessory/penis
-	icon = 'modular_citadel/icons/obj/genitals/penis_onmob.dmi'
+	icon = 'icons/obj/genitals/penis_onmob.dmi'
 	name = "penis"			//the preview name of the accessory
 	color_src = "cock_color"
 	alt_aroused = TRUE
@@ -22,13 +22,13 @@
 /datum/sprite_accessory/penis/knotted
 	icon_state = "knotted"
 	name = "Knotted"
-	taur_icon = 'modular_citadel/icons/obj/genitals/taur_penis_onmob.dmi'
+	taur_icon = 'icons/obj/genitals/taur_penis_onmob.dmi'
 	taur_dimension_x = 64
 
 /datum/sprite_accessory/penis/flared
 	icon_state = "flared"
 	name = "Flared"
-	taur_icon = 'modular_citadel/icons/obj/genitals/taur_penis_onmob.dmi'
+	taur_icon = 'icons/obj/genitals/taur_penis_onmob.dmi'
 	taur_dimension_x = 64
 
 /datum/sprite_accessory/penis/barbknot
@@ -38,7 +38,7 @@
 /datum/sprite_accessory/penis/tapered
 	icon_state = "tapered"
 	name = "Tapered"
-	taur_icon = 'modular_citadel/icons/obj/genitals/taur_penis_onmob.dmi'
+	taur_icon = 'icons/obj/genitals/taur_penis_onmob.dmi'
 	taur_dimension_x = 64
 
 /datum/sprite_accessory/penis/tentacle
@@ -55,7 +55,7 @@
 
 //Testicles
 /datum/sprite_accessory/testicles
-	icon = 'modular_citadel/icons/obj/genitals/testicles_onmob.dmi'
+	icon = 'icons/obj/genitals/testicles_onmob.dmi'
 	icon_state = "testicle"
 	name = "testicle"		//the preview name of the accessory
 	color_src = "balls_color"
@@ -66,7 +66,7 @@
 
 //Vaginas
 /datum/sprite_accessory/vagina
-	icon = 'modular_citadel/icons/obj/genitals/vagina_onmob.dmi'
+	icon = 'icons/obj/genitals/vagina_onmob.dmi'
 	name = "vagina"
 	color_src = "vag_color"
 	alt_aroused = TRUE
@@ -104,7 +104,7 @@
 
 //BREASTS BE HERE
 /datum/sprite_accessory/breasts
-	icon = 'modular_citadel/icons/obj/genitals/breasts_onmob.dmi'
+	icon = 'icons/obj/genitals/breasts_onmob.dmi'
 	name = "breasts"
 	color_src = "breasts_color"
 

code/modules/arousal/organs/breasts.dm

@@ -5,7 +5,7 @@
 	name = "breasts"
 	desc = "Female milk producing organs."
 	icon_state = "breasts"
-	icon = 'modular_citadel/icons/obj/genitals/breasts.dmi'
+	icon = 'icons/obj/genitals/breasts.dmi'
 	zone = BODY_ZONE_CHEST
 	slot = ORGAN_SLOT_BREASTS
 	size = BREASTS_SIZE_DEF // "c". Refer to the breast_values static list below for the cups associated number values

code/modules/arousal/organs/penis.dm

@@ -2,7 +2,7 @@
 	name = "penis"
 	desc = "A male reproductive organ."
 	icon_state = "penis"
-	icon = 'modular_citadel/icons/obj/genitals/penis.dmi'
+	icon = 'icons/obj/genitals/penis.dmi'
 	zone = BODY_ZONE_PRECISE_GROIN
 	slot = ORGAN_SLOT_PENIS
 	masturbation_verb = "stroke"

code/modules/arousal/organs/testicles.dm

@@ -2,7 +2,7 @@
 	name = "testicles"
 	desc = "A male reproductive organ."
 	icon_state = "testicles"
-	icon = 'modular_citadel/icons/obj/genitals/testicles.dmi'
+	icon = 'icons/obj/genitals/testicles.dmi'
 	zone = BODY_ZONE_PRECISE_GROIN
 	slot = ORGAN_SLOT_TESTICLES
 	size = BALLS_SIZE_MIN

code/modules/arousal/organs/vagina.dm

@@ -1,7 +1,7 @@
 /obj/item/organ/genital/vagina
 	name = "vagina"
 	desc = "A female reproductive organ."
-	icon = 'modular_citadel/icons/obj/genitals/vagina.dmi'
+	icon = 'icons/obj/genitals/vagina.dmi'
 	icon_state = ORGAN_SLOT_VAGINA
 	zone = BODY_ZONE_PRECISE_GROIN
 	slot = "vagina"

code/modules/arousal/organs/womb.dm

@@ -1,7 +1,7 @@
 /obj/item/organ/genital/womb
 	name = "womb"
 	desc = "A female reproductive organ."
-	icon = 'modular_citadel/icons/obj/genitals/vagina.dmi'
+	icon = 'icons/obj/genitals/vagina.dmi'
 	icon_state = "womb"
 	zone = BODY_ZONE_PRECISE_GROIN
 	slot = ORGAN_SLOT_WOMB

code/modules/arousal/toys/dildos.dm

@@ -4,7 +4,7 @@
 /obj/item/dildo
 	name 				= "dildo"
 	desc 				= "Floppy!"
-	icon 				= 'modular_citadel/icons/obj/genitals/dildo.dmi'
+	icon 				= 'icons/obj/genitals/dildo.dmi'
 	force 				= 0
 	hitsound			= 'sound/weapons/tap.ogg'
 	throwforce			= 0

modular_citadel/code/modules/reagents/reagents/cit_reagents.dm

@@ -28,7 +28,7 @@
 	gender = PLURAL
 	density = 0
 	layer = ABOVE_NORMAL_TURF_LAYER
-	icon = 'modular_citadel/icons/obj/genitals/effects.dmi'
+	icon = 'icons/obj/genitals/effects.dmi'
 	icon_state = "semen1"
 	random_icon_states = list("semen1", "semen2", "semen3", "semen4")
 
@@ -59,7 +59,7 @@
 	gender = PLURAL
 	density = 0
 	layer = ABOVE_NORMAL_TURF_LAYER
-	icon = 'modular_citadel/icons/obj/genitals/effects.dmi'
+	icon = 'icons/obj/genitals/effects.dmi'
 	icon_state = "fem1"
 	random_icon_states = list("fem1", "fem2", "fem3", "fem4")
 	blood_state = null

tgstation.dme

@@ -1561,6 +1561,15 @@
 #include "code\modules\antagonists\wizard\equipment\soulstone.dm"
 #include "code\modules\antagonists\wizard\equipment\spellbook.dm"
 #include "code\modules\antagonists\xeno\xeno.dm"
+#include "code\modules\arousal\arousal.dm"
+#include "code\modules\arousal\genitals.dm"
+#include "code\modules\arousal\genitals_sprite_accessories.dm"
+#include "code\modules\arousal\organs\breasts.dm"
+#include "code\modules\arousal\organs\penis.dm"
+#include "code\modules\arousal\organs\testicles.dm"
+#include "code\modules\arousal\organs\vagina.dm"
+#include "code\modules\arousal\organs\womb.dm"
+#include "code\modules\arousal\toys\dildos.dm"
 #include "code\modules\assembly\assembly.dm"
 #include "code\modules\assembly\bomb.dm"
 #include "code\modules\assembly\doorcontrol.dm"
@@ -3304,15 +3313,6 @@
 #include "modular_citadel\code\modules\admin\chat_commands.dm"
 #include "modular_citadel\code\modules\admin\holder2.dm"
 #include "modular_citadel\code\modules\admin\secrets.dm"
-#include "modular_citadel\code\modules\arousal\arousal.dm"
-#include "modular_citadel\code\modules\arousal\genitals.dm"
-#include "modular_citadel\code\modules\arousal\genitals_sprite_accessories.dm"
-#include "modular_citadel\code\modules\arousal\organs\breasts.dm"
-#include "modular_citadel\code\modules\arousal\organs\penis.dm"
-#include "modular_citadel\code\modules\arousal\organs\testicles.dm"
-#include "modular_citadel\code\modules\arousal\organs\vagina.dm"
-#include "modular_citadel\code\modules\arousal\organs\womb.dm"
-#include "modular_citadel\code\modules\arousal\toys\dildos.dm"
 #include "modular_citadel\code\modules\client\client_defines.dm"
 #include "modular_citadel\code\modules\client\client_procs.dm"
 #include "modular_citadel\code\modules\client\preferences.dm"