Moved our modular folder under sandstorm's

now we can modularize stuff better and have less errors I guess
This commit is contained in:
BongaTheProto
2021-12-10 14:31:15 -05:00
parent 7d488681f3
commit 35a8291a35
196 changed files with 253 additions and 254 deletions

View File

@@ -88,14 +88,14 @@ GLOBAL_LIST_INIT(pred_release_sounds, list(
"Pred Escape" = 'sound/vore/pred/escape.ogg',
"Splatter" = 'sound/effects/splat.ogg',
//Extreme SPLURT degeneracy starts here
"Fart" = 'modular_eros/sound/voice/farts/fart.ogg',
"Fart 1" = 'modular_eros/sound/voice/farts/fart1.ogg',
"Fart 2" = 'modular_eros/sound/voice/farts/fart2.ogg',
"Fart 3" = 'modular_eros/sound/voice/farts/fart3.ogg',
"Fart 4" = 'modular_eros/sound/voice/farts/fart4.ogg',
"Fart 5" = 'modular_eros/sound/voice/farts/fart5.ogg',
"Fart 6" = 'modular_eros/sound/voice/farts/fart6.ogg',
"Fart 7" = 'modular_eros/sound/voice/farts/fart7.ogg',
"Fart" = 'modular_splurt/sound/voice/farts/fart.ogg',
"Fart 1" = 'modular_splurt/sound/voice/farts/fart1.ogg',
"Fart 2" = 'modular_splurt/sound/voice/farts/fart2.ogg',
"Fart 3" = 'modular_splurt/sound/voice/farts/fart3.ogg',
"Fart 4" = 'modular_splurt/sound/voice/farts/fart4.ogg',
"Fart 5" = 'modular_splurt/sound/voice/farts/fart5.ogg',
"Fart 6" = 'modular_splurt/sound/voice/farts/fart6.ogg',
"Fart 7" = 'modular_splurt/sound/voice/farts/fart7.ogg',
"None" = null
))
@@ -109,13 +109,13 @@ GLOBAL_LIST_INIT(prey_release_sounds, list(
"Pred Escape" = 'sound/vore/prey/escape.ogg',
"Splatter" = 'sound/effects/splat.ogg',
//Extreme SPLURT degeneracy starts here
"Fart" = 'modular_eros/sound/voice/farts/fart.ogg',
"Fart 1" = 'modular_eros/sound/voice/farts/fart1.ogg',
"Fart 2" = 'modular_eros/sound/voice/farts/fart2.ogg',
"Fart 3" = 'modular_eros/sound/voice/farts/fart3.ogg',
"Fart 4" = 'modular_eros/sound/voice/farts/fart4.ogg',
"Fart 5" = 'modular_eros/sound/voice/farts/fart5.ogg',
"Fart 6" = 'modular_eros/sound/voice/farts/fart6.ogg',
"Fart 7" = 'modular_eros/sound/voice/farts/fart7.ogg',
"Fart" = 'modular_splurt/sound/voice/farts/fart.ogg',
"Fart 1" = 'modular_splurt/sound/voice/farts/fart1.ogg',
"Fart 2" = 'modular_splurt/sound/voice/farts/fart2.ogg',
"Fart 3" = 'modular_splurt/sound/voice/farts/fart3.ogg',
"Fart 4" = 'modular_splurt/sound/voice/farts/fart4.ogg',
"Fart 5" = 'modular_splurt/sound/voice/farts/fart5.ogg',
"Fart 6" = 'modular_splurt/sound/voice/farts/fart6.ogg',
"Fart 7" = 'modular_splurt/sound/voice/farts/fart7.ogg',
"None" = null
))

View File

@@ -970,7 +970,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
homerun_ready = 1
..()
//EROS REMOVE modular_eros\code\game\object\items\weaponry\melee
//EROS REMOVE modular_splurt\code\game\object\items\weaponry\melee
/*
/obj/item/melee/baseball_bat/attack(mob/living/target, mob/living/user)
. = ..()

View File

@@ -869,7 +869,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
//Hyper nail paint
if(H.nail_style)
var/mutable_appearance/nail_overlay = mutable_appearance('modular_eros/icons/mobs/nails.dmi', "nails", -HANDS_PART_LAYER)
var/mutable_appearance/nail_overlay = mutable_appearance('modular_splurt/icons/mobs/nails.dmi', "nails", -HANDS_PART_LAYER)
nail_overlay.color = H.nail_color
standing += nail_overlay

View File

@@ -261,17 +261,17 @@
/obj/item/reagent_containers/pill/penis_enlargement
name = "penis enlargement pill"
list_reagents = list(/datum/reagent/fermi/penis_enlarger = 10)
icon = 'modular_eros/icons/obj/chemical.dmi'
icon = 'modular_splurt/icons/obj/chemical.dmi'
icon_state = "pill_lewd"
/obj/item/reagent_containers/pill/breast_enlargement
name = "breast enlargement pill"
list_reagents = list(/datum/reagent/fermi/breast_enlarger = 10)
icon = 'modular_eros/icons/obj/chemical.dmi'
icon = 'modular_splurt/icons/obj/chemical.dmi'
icon_state = "pill_lewd"
/obj/item/reagent_containers/pill/butt_enlargement
name = "butt enlargement pill"
list_reagents = list(/datum/reagent/fermi/butt_enlarger = 10)
icon = 'modular_eros/icons/obj/chemical.dmi'
icon = 'modular_splurt/icons/obj/chemical.dmi'
icon_state = "pill_lewd"

View File

@@ -1,35 +0,0 @@
/obj/item/clothing/shoes/footwraps
name = "cloth footwraps"
desc = "A roll of treated canvas used for wrapping claws or paws."
icon = 'modular_eros/icons/obj/clothing/shoes.dmi'
icon_state = "foot_wraps"
mob_overlay_icon = 'modular_eros/icons/mob/clothing/shoes.dmi'
anthro_mob_worn_overlay = 'modular_eros/icons/mob/clothing/shoes_digi.dmi'
/obj/item/clothing/shoes/jackboots/toeless
name = "toe-less jackboots"
desc = "Modified pair of jackboots, particularly friendly to those species whose toes hold claws."
icon = 'modular_eros/icons/obj/clothing/shoes.dmi'
icon_state = "jackboots-toeless"
mob_overlay_icon = 'modular_eros/icons/mob/clothing/shoes.dmi'
anthro_mob_worn_overlay = 'modular_eros/icons/mob/clothing/shoes_digi.dmi'
/obj/item/clothing/shoes/jackboots/tall
name = "tall jackboots"
desc = "A pair of knee-high jackboots, complete with heels. All style, all the time."
icon = 'modular_eros/icons/obj/clothing/shoes.dmi'
icon_state = "jackboots-tall"
mob_overlay_icon = 'modular_eros/icons/mob/clothing/shoes.dmi'
anthro_mob_worn_overlay = 'modular_eros/icons/mob/clothing/shoes_digi.dmi'
/obj/item/clothing/shoes/jackboots/tall/Initialize()
. = ..()
AddComponent(/datum/component/squeak, list('modular_eros/sound/effects/footstep/highheel1.ogg' = 1,'modular_eros/sound/effects/footstep/highheel2.ogg' = 1), 20)
/obj/item/clothing/shoes/workboots/toeless
name = "toe-less workboots"
desc = "A pair of toeless work boots designed for use in industrial settings. Modified for species whose toes have claws."
icon = 'modular_eros/icons/obj/clothing/shoes.dmi'
icon_state = "workboots-toeless"
mob_overlay_icon = 'modular_eros/icons/mob/clothing/shoes.dmi'
anthro_mob_worn_overlay = 'modular_eros/icons/mob/clothing/shoes_digi.dmi'

View File

@@ -1,5 +1,5 @@
# About modularizing defines
Since #define clauses can't be properly modularized and need to be loaded first than the rest of the code for it to catch them, the modular_eros/code/_DEFINES/ folder has been deleted and all of its contents have been moved to code/__DEFINES/eroscode/
Since #define clauses can't be properly modularized and need to be loaded first than the rest of the code for it to catch them, the modular_splurt/code/_DEFINES/ folder has been deleted and all of its contents have been moved to code/__DEFINES/splurtcode/
Please use this folder the same way you'd use the _DEFINES folder once found inside this directory

View File

@@ -1,5 +1,5 @@
/datum/map_template/ruin/lavaland/eros
prefix = "modular_eros/_maps/RandomRuins/LavaRuins/"
prefix = "modular_splurt/_maps/RandomRuins/LavaRuins/"
/datum/map_template/ruin/lavaland/eros/abandoned_shelter
name = "Abandoned Shelter (Dragonbird13)"

View File

@@ -33,7 +33,7 @@
/obj/item/nailpolish
name = "nail polish"
desc = "Paint with a fine brush to do your nails, or someone elses."
icon = 'modular_eros/icons/obj/cosmetic.dmi'
icon = 'modular_splurt/icons/obj/cosmetic.dmi'
icon_state = "nailcap"
item_state = "nailpolish"
w_class = WEIGHT_CLASS_SMALL
@@ -74,7 +74,7 @@
/obj/item/nailpolish/Initialize()
. = ..()
bottle = mutable_appearance('modular_eros/icons/obj/cosmetic.dmi', "nailpolish")
bottle = mutable_appearance('modular_splurt/icons/obj/cosmetic.dmi', "nailpolish")
bottle.color = paint
add_overlay(bottle)

View File

@@ -3,7 +3,7 @@
/obj/item/mesmetron
name = "Mesmetron"
desc = "An elaborate pocketwatch, with a captivating gold etching and an enchanting face..."
icon = 'modular_eros/icons/obj/pocketwatch.dmi'
icon = 'modular_splurt/icons/obj/pocketwatch.dmi'
icon_state = "pocketwatch"
item_state = "pocketwatch"
w_class = WEIGHT_CLASS_SMALL

View File

@@ -19,7 +19,7 @@ GLOBAL_LIST_INIT(shadow_wood_recipes, list ( \
singular_name = "shadow wood plank"
icon_state = "sheet-shadow_wood"
item_state = "sheet-shadow_wood"
icon = 'modular_eros/icons/obj/stack_objects.dmi'
icon = 'modular_splurt/icons/obj/stack_objects.dmi'
sheettype = "shadow_wood"
merge_type = /obj/item/stack/sheet/mineral/wood/shadow
novariants = TRUE
@@ -49,7 +49,7 @@ GLOBAL_LIST_INIT(mush_wood_recipes, list ( \
singular_name = "mushroom plank"
icon_state = "sheet-mush_wood"
item_state = "sheet-mush_wood"
icon = 'modular_eros/icons/obj/stack_objects.dmi'
icon = 'modular_splurt/icons/obj/stack_objects.dmi'
sheettype = "mush_wood"
merge_type = /obj/item/stack/sheet/mineral/wood/mushroom
novariants = TRUE

View File

@@ -3,7 +3,7 @@
name = "mushroom floor tile"
singular_name = "mushroom floor tile"
desc = "An easy to fit mushroom floor tile."
icon = 'modular_eros/icons/obj/tiles.dmi'
icon = 'modular_splurt/icons/obj/tiles.dmi'
icon_state = "tile-mush_wood"
turf_type = /turf/open/floor/wood/mushroom
@@ -12,6 +12,6 @@
name = "shadow wood floor tile"
singular_name = "shadow wood floor tile"
desc = "An easy to fit wood floor tile."
icon = 'modular_eros/icons/obj/tiles.dmi'
icon = 'modular_splurt/icons/obj/tiles.dmi'
icon_state = "tile-shadow_wood"
turf_type = /turf/open/floor/wood/shadow

View File

@@ -1,7 +1,7 @@
/obj/structure/barricade/wooden/shadow
name = "shadow barricade"
desc = "This space is blocked off by a shadow wood barricade."
icon = 'modular_eros/icons/obj/structures.dmi'
icon = 'modular_splurt/icons/obj/structures.dmi'
icon_state = "barricade_shadow"
plank_type = /obj/item/stack/sheet/mineral/wood/shadow
wall_type = /turf/closed/wall/mineral/wood/shadow/nonmetal
@@ -9,7 +9,7 @@
/obj/structure/barricade/wooden/mushroom
name = "mushroom barricade"
desc = "This space is blocked off by a mushroom barricade."
icon = 'modular_eros/icons/obj/structures.dmi'
icon = 'modular_splurt/icons/obj/structures.dmi'
icon_state = "barricade_mushwood"
plank_type = /obj/item/stack/sheet/mineral/wood/mushroom
wall_type = /turf/closed/wall/mineral/wood/mushroom/nonmetal

View File

@@ -1,7 +1,7 @@
/obj/structure/urinal/shit
name = "shit-stained urinal"
desc = "The- Dear God, what the fuck happened here?!"
icon = 'modular_eros/icons/obj/structures/bathroom.dmi'
icon = 'modular_splurt/icons/obj/structures/bathroom.dmi'
icon_state = "shit_urinal"
/obj/structure/urinal/shit/Initialize()
@@ -42,7 +42,7 @@
/obj/structure/curtain/goliath
name = "goliath curtain"
desc = "Because tribals need privacy too."
icon = 'modular_eros/icons/obj/structures/bathroom.dmi'
icon = 'modular_splurt/icons/obj/structures/bathroom.dmi'
icon_state = "goliath_curtain"
color = null //Default color, didn't bother hardcoding other colors, mappers can and should easily change it.
alpha = 200 //Mappers can also just set this to 255 if they want curtains that can't be seen through <- No longer necessary unless you don't want to see through it no matter what.

View File

@@ -3,12 +3,12 @@
return ..()
/obj/structure/bed/dogbed/shadow
icon = 'modular_eros/icons/obj/objects.dmi'
icon = 'modular_splurt/icons/obj/objects.dmi'
icon_state = "dogbed_shadow"
buildstacktype = /obj/item/stack/sheet/mineral/wood/shadow
/obj/structure/bed/dogbed/mushroom
icon = 'modular_eros/icons/obj/objects.dmi'
icon = 'modular_splurt/icons/obj/objects.dmi'
icon_state = "dogbed_mushwood"
buildstacktype = /obj/item/stack/sheet/mineral/wood/mushroom
@@ -16,13 +16,13 @@
name = "shadow bed"
desc = "A bunch of shadow planks strewn together. Better than sleeping on the ground."
icon_state = "bed_shadow"
icon = 'modular_eros/icons/obj/structures/beds.dmi'
icon = 'modular_splurt/icons/obj/structures/beds.dmi'
buildstacktype = /obj/item/stack/sheet/mineral/wood/shadow
/obj/structure/bed/double/shadow
name = "shadow double bed"
desc = "A double shadow bed, because tribals need luxury too."
icon = 'modular_eros/icons/obj/structures/beds.dmi'
icon = 'modular_splurt/icons/obj/structures/beds.dmi'
icon_state = "bed_wide_shadow"
buildstacktype = /obj/item/stack/sheet/mineral/wood/shadow
@@ -34,4 +34,4 @@
/obj/structure/bed/matress/New()
..()
icon_state = "mattress[rand(0,6)]"

View File

@@ -1,7 +1,7 @@
/obj/structure/chair/wood/shadow
name = "shadow wood chair"
desc = "Fashionable dark."
icon = 'modular_eros/icons/obj/chairs.dmi'
icon = 'modular_splurt/icons/obj/chairs.dmi'
icon_state = "shadow_chair"
buildstacktype = /obj/item/stack/sheet/mineral/wood/shadow
item_chair = /obj/item/chair/wood/shadow
@@ -9,7 +9,7 @@
/obj/structure/chair/wood/mushroom
name = "mushroom chair"
desc = "You don't need to worry about losing your seat in case of fire!"
icon = 'modular_eros/icons/obj/chairs.dmi'
icon = 'modular_splurt/icons/obj/chairs.dmi'
icon_state = "mushroom_chair"
resistance_flags = FIRE_PROOF
buildstacktype = /obj/item/stack/sheet/mineral/wood/mushroom
@@ -17,13 +17,13 @@
/obj/item/chair/wood/shadow
name = "shadow wood chair"
icon = 'modular_eros/icons/obj/chairs.dmi'
icon = 'modular_splurt/icons/obj/chairs.dmi'
icon_state = "shadow_chair_toppled"
origin_type = /obj/structure/chair/wood/shadow
/obj/item/chair/wood/mushroom
name = "mushroom chair"
icon = 'modular_eros/icons/obj/chairs.dmi'
icon = 'modular_splurt/icons/obj/chairs.dmi'
icon_state = "mushroom_chair_toppled"
resistance_flags = FIRE_PROOF
origin_type = /obj/structure/chair/wood/mushroom

View File

@@ -1,13 +1,13 @@
/obj/structure/closet/crate/wooden/shadow
name = "shadown wood crate"
icon = 'modular_eros/icons/obj/crates.dmi'
icon = 'modular_splurt/icons/obj/crates.dmi'
icon_state = "crate_shadow"
material_drop = /obj/item/stack/sheet/mineral/wood/shadow
material_drop_amount = 6
/obj/structure/closet/crate/wooden/mushroom
name = "mushroom crate"
icon = 'modular_eros/icons/obj/crates.dmi'
icon = 'modular_splurt/icons/obj/crates.dmi'
icon_state = "crate_mushwood"
material_drop = /obj/item/stack/sheet/mineral/wood/mushroom
material_drop_amount = 6

View File

@@ -1,9 +1,9 @@
/obj/structure/dresser/shadow
desc = "A nicely-crafted shadow wood dresser."
icon = 'modular_eros/icons/obj/station_obj.dmi'
icon = 'modular_splurt/icons/obj/station_obj.dmi'
icon_state = "dresser_shadow"
/obj/structure/dresser/mushroom
desc = "A nicely-crafted mushroom dresser. It's filled with lots of undies."
icon = 'modular_eros/icons/obj/station_obj.dmi'
icon = 'modular_splurt/icons/obj/station_obj.dmi'
icon_state = "dresser_mushwood"

View File

@@ -1,7 +1,7 @@
/obj/structure/falsewall/wood/shadow
name = "shadow wall"
desc = "A wall with shadow wood plating."
icon = 'modular_eros/icons/turf/walls/wall_shadow.dmi'
icon = 'modular_splurt/icons/turf/walls/wall_shadow.dmi'
icon_state = "shadow"
mineral = /obj/item/stack/sheet/mineral/wood/shadow
walltype = /turf/closed/wall/mineral/wood/shadow
@@ -11,7 +11,7 @@
/obj/structure/falsewall/wood/mushroom
name = "mushroom wall"
desc = "A wall with mushroom plating."
icon = 'modular_eros/icons/turf/walls/wall_shadow.dmi'
icon = 'modular_splurt/icons/turf/walls/wall_shadow.dmi'
icon_state = "shadow"
mineral = /obj/item/stack/sheet/mineral/wood/mushroom
walltype = /turf/closed/wall/mineral/wood/mushroom

View File

@@ -1,7 +1,7 @@
/obj/structure/flora/tree/shadow
name = "shadow tree"
desc = "A native lavaland tree, with a remarkable purple color."
icon = 'modular_eros/icons/obj/flora/lavaland.dmi'
icon = 'modular_splurt/icons/obj/flora/lavaland.dmi'
icon_state = "shadowtree_1"
spawned_wood = /obj/item/grown/log/tree/shadow
spawned_stump = /obj/structure/flora/stump/shadow
@@ -15,7 +15,7 @@
/obj/structure/flora/stump/shadow
name = "shadow tree stump"
desc = "Hidden in the shadowns."
icon = 'modular_eros/icons/obj/flora/lavaland.dmi'
icon = 'modular_splurt/icons/obj/flora/lavaland.dmi'
icon_state = "shadowtree_stump"
@@ -23,7 +23,7 @@
/obj/structure/flora/tree/mushroom
name = "giant mushroom"
desc = "An impressive overgrown mushroom."
icon = 'modular_eros/icons/obj/flora/lavaland.dmi'
icon = 'modular_splurt/icons/obj/flora/lavaland.dmi'
icon_state = "gmushroom_1"
spawned_wood = /obj/item/grown/log/tree/mushroom
spawned_stump = /obj/structure/flora/stump/mushroom
@@ -38,7 +38,7 @@
/obj/structure/flora/stump/mushroom
name = "giant mushroom stump"
desc = "It will grow back. Maybe. One day."
icon = 'modular_eros/icons/obj/flora/lavaland.dmi'
icon = 'modular_splurt/icons/obj/flora/lavaland.dmi'
icon_state = "gmushroom_stump"
@@ -46,7 +46,7 @@
/obj/structure/flora/grass/red
name = "tall grass"
desc = "A patch of overgrown red grass."
icon = 'modular_eros/icons/obj/flora/lavaland.dmi'
icon = 'modular_splurt/icons/obj/flora/lavaland.dmi'
icon_state = "tallgrass1bb"
gender = PLURAL
layer = ABOVE_MOB_LAYER

View File

@@ -3,7 +3,7 @@
/obj/structure/pole
name = "stripper pole"
desc = "A pole fastened to the ceiling and floor, used to show of ones goods to company."
icon = 'modular_eros/icons/obj/pole.dmi'
icon = 'modular_splurt/icons/obj/pole.dmi'
icon_state = "pole"
density = TRUE
anchored = TRUE
@@ -63,7 +63,7 @@
/obj/item/polepack
name = "stripper pole flatpack"
desc = "A wrench is required to construct."
icon = 'modular_eros/icons/obj/pole.dmi'
icon = 'modular_splurt/icons/obj/pole.dmi'
throwforce = 0
icon_state = "pole_base"
var/unwrapped = 0

View File

@@ -1,6 +1,6 @@
/obj/structure/statue/boney //wow thanks so much, it's almost like no one would ever make bone statues
name = "statue of an ashwalker"
icon = 'modular_eros/icons/obj/structures/statue.dmi'
icon = 'modular_splurt/icons/obj/structures/statue.dmi'
icon_state = "ashie"
max_integrity = 300
material_drop_type = /obj/item/stack/sheet/bone

View File

@@ -5,7 +5,7 @@
/obj/structure/table_frame/mushwood
name = "mushroom table frame"
desc = "Four wooden legs with four framing wooden rods for a wooden table. You could easily pass through this."
icon = 'modular_eros/icons/obj/structures.dmi'
icon = 'modular_splurt/icons/obj/structures.dmi'
icon_state = "table_frame_mushwood"
framestack = /obj/item/stack/sheet/mineral/wood/mushroom
framestackamount = 2
@@ -37,7 +37,7 @@
/obj/structure/table_frame/shadow_wood
name = "shadow wood frame"
desc = "Four wooden legs with four framing wooden rods for a wooden table. You could easily pass through this."
icon = 'modular_eros/icons/obj/structures.dmi'
icon = 'modular_splurt/icons/obj/structures.dmi'
icon_state = "table_frame_shadow"
framestack = /obj/item/stack/sheet/mineral/wood/shadow
framestackamount = 2

View File

@@ -1,6 +1,6 @@
/obj/structure/table/wood/shadow
name = "shadow wood table"
icon = 'modular_eros/icons/obj/smooth_structures/table_shadow.dmi'
icon = 'modular_splurt/icons/obj/smooth_structures/table_shadow.dmi'
icon_state = "table_shadow"
frame = /obj/structure/table_frame/shadow_wood
framestack = /obj/item/stack/sheet/mineral/wood/shadow
@@ -12,7 +12,7 @@
/obj/structure/table/wood/mushroom
name = "mushroom table"
desc = "A pinkish table. And is fireproof!"
icon = 'modular_eros/icons/obj/smooth_structures/table_mushwood.dmi'
icon = 'modular_splurt/icons/obj/smooth_structures/table_mushwood.dmi'
icon_state = "table_mushwood"
frame = /obj/structure/table_frame/mushwood
framestack = /obj/item/stack/sheet/mineral/wood/mushroom
@@ -23,7 +23,7 @@
)
/obj/structure/table/wood/poker/shadow //No specialties, Just a mapping object.
icon = 'modular_eros/icons/obj/smooth_structures/poker_table_shadow.dmi'
icon = 'modular_splurt/icons/obj/smooth_structures/poker_table_shadow.dmi'
icon_state = "poker_shadow"
frame = /obj/structure/table_frame/shadow_wood
framestack = /obj/item/stack/sheet/mineral/wood/shadow
@@ -32,7 +32,7 @@
)
/obj/structure/table/wood/poker/mushroom
icon = 'modular_eros/icons/obj/smooth_structures/poker_table_mushwood.dmi'
icon = 'modular_splurt/icons/obj/smooth_structures/poker_table_mushwood.dmi'
icon_state = "poker_mush"
frame = /obj/structure/table_frame/mushwood
framestack = /obj/item/stack/sheet/mineral/wood/mushroom

View File

@@ -1,13 +1,13 @@
/turf/open/floor/wood/shadow
desc = "Stylish shadown wood."
icon = 'modular_eros/icons/turf/floors.dmi'
icon = 'modular_splurt/icons/turf/floors.dmi'
icon_state = "shadow_wood"
floor_tile = /obj/item/stack/tile/wood/shadow
broken_states = list("shadow_wood-broken", "shadow_wood-broken2", "shadow_wood-broken3", "shadow_wood-broken4", "shadow_wood-broken5", "shadow_wood-broken6", "shadow_wood-broken7")
/turf/open/floor/wood/mushroom
desc = "Stylish mushroom 'wood'."
icon = 'modular_eros/icons/turf/floors.dmi'
icon = 'modular_splurt/icons/turf/floors.dmi'
icon_state = "mush_wood"
floor_tile = /obj/item/stack/tile/wood/mushroom
broken_states = list("mush_wood-broken", "mush_wood-broken2", "mush_wood-broken3", "mush_wood-broken4", "mush_wood-broken5", "mush_wood-broken6", "mush_wood-broken7")

View File

@@ -1,7 +1,7 @@
/turf/closed/wall/mineral/wood/shadow
name = "shadow wall"
desc = "A wall with shadow wood plating."
icon = 'modular_eros/icons/turf/walls/wall_shadow.dmi'
icon = 'modular_splurt/icons/turf/walls/wall_shadow.dmi'
icon_state = "shadow"
sheet_type = /obj/item/stack/sheet/mineral/wood/shadow
canSmoothWith = list(/turf/closed/wall/mineral/wood/shadow, /obj/structure/falsewall/wood/shadow, /turf/closed/wall/mineral/wood/shadow/nonmetal)
@@ -12,7 +12,7 @@
/turf/closed/wall/mineral/wood/mushroom
name = "mushroom wall"
desc = "A wall with mushroom plating."
icon = 'modular_eros/icons/turf/walls/wall_mushwood.dmi'
icon = 'modular_splurt/icons/turf/walls/wall_mushwood.dmi'
icon_state = "mushwood"
sheet_type = /obj/item/stack/sheet/mineral/wood/mushroom
canSmoothWith = list(/turf/closed/wall/mineral/wood/mushroom, /obj/structure/falsewall/wood/mushroom, /turf/closed/wall/mineral/wood/mushroom/nonmetal)

View File

@@ -45,7 +45,7 @@ GLOBAL_VAR_INIT(slavers_last_announcement, 0)
/datum/antagonist/slaver/greet()
owner.assigned_role = ROLE_SLAVER
owner.current.playsound_local(get_turf(owner.current), 'modular_eros/sound/ambience/antag/slavers.ogg',100,0)
owner.current.playsound_local(get_turf(owner.current), 'modular_splurt/sound/ambience/antag/slavers.ogg',100,0)
to_chat(owner, "<span class='notice'>You are a slave trader!</span>")
owner.announce_objectives()
@@ -87,7 +87,7 @@ GLOBAL_VAR_INIT(slavers_last_announcement, 0)
/datum/antagonist/slaver/leader/greet()
owner.assigned_role = ROLE_SLAVER_LEADER
owner.current.playsound_local(get_turf(owner.current), 'modular_eros/sound/ambience/antag/slavers.ogg',100,0)
owner.current.playsound_local(get_turf(owner.current), 'modular_splurt/sound/ambience/antag/slavers.ogg',100,0)
to_chat(owner, "<B>You are the Slave Master for this collection job. You are responsible for organising your team and your ID is the only one who can open the launch bay doors.</B>")
to_chat(owner, "<B>If you feel you are not up to this task, give your ID to another slaver.</B>")
owner.announce_objectives()

View File

@@ -4,8 +4,8 @@
desc = "A pair of shiny latex sleeves that covers ones arms."
icon_state = "latex"
item_state = "latex"
icon = 'modular_eros/icons/obj/clothing/gloves.dmi'
mob_overlay_icon = 'modular_eros/icons/mobs/gloves.dmi'
icon = 'modular_splurt/icons/obj/clothing/gloves.dmi'
mob_overlay_icon = 'modular_splurt/icons/mobs/gloves.dmi'
mutantrace_variation = NONE
/obj/item/clothing/gloves/latexsleeves/security
@@ -19,8 +19,8 @@
desc = "A sign of authority, over the body."
icon_state = "dominatrix"
item_state = "dominatrix"
icon = 'modular_eros/icons/obj/clothing/head.dmi'
mob_overlay_icon = 'modular_eros/icons/mobs/head.dmi'
icon = 'modular_splurt/icons/obj/clothing/head.dmi'
mob_overlay_icon = 'modular_splurt/icons/mobs/head.dmi'
mutantrace_variation = NONE
/obj/item/clothing/shoes/highheels
@@ -28,19 +28,19 @@
desc = "They make the wearer appear taller, and more noisey!"
icon_state = "highheels"
item_state = "highheels"
icon = 'modular_eros/icons/obj/clothing/shoes.dmi'
mob_overlay_icon = 'modular_eros/icons/mobs/feet.dmi'
icon = 'modular_splurt/icons/obj/clothing/shoes.dmi'
mob_overlay_icon = 'modular_splurt/icons/mobs/feet.dmi'
/obj/item/clothing/shoes/highheels/Initialize()
. = ..()
AddComponent(/datum/component/squeak, list('modular_eros/sound/effects/footstep/highheel1.ogg' = 1,'modular_eros/sound/effects/footstep/highheel2.ogg' = 1), 20)
AddComponent(/datum/component/squeak, list('modular_splurt/sound/effects/footstep/highheel1.ogg' = 1,'modular_splurt/sound/effects/footstep/highheel2.ogg' = 1), 20)
//the classic click clack
/obj/item/clothing/neck/stole
name = "white boa (Hyper)"
desc = "Fluffy neck wear to keep you warm, and attract others."
icon = 'modular_eros/icons/obj/clothing/neck.dmi'
icon = 'modular_splurt/icons/obj/clothing/neck.dmi'
w_class = WEIGHT_CLASS_SMALL
icon_state = "stole"
item_state = "" //no inhands
@@ -48,7 +48,7 @@
/obj/item/clothing/neck/stole/black
name = "black boa"
desc = "Fluffy neck wear to keep you warm, and attract others."
icon = 'modular_eros/icons/obj/clothing/neck.dmi'
icon = 'modular_splurt/icons/obj/clothing/neck.dmi'
w_class = WEIGHT_CLASS_SMALL
icon_state = "stole"
item_state = "" //no inhands
@@ -59,8 +59,8 @@
desc = "A fluffy synthetic fur half-cropped jacket, less about warmth, more about style!"
icon_state = "fluffy"
item_state = "fluffy"
icon = 'modular_eros/icons/obj/clothing/suits.dmi'
mob_overlay_icon = 'modular_eros/icons/mobs/suits.dmi'
icon = 'modular_splurt/icons/obj/clothing/suits.dmi'
mob_overlay_icon = 'modular_splurt/icons/mobs/suits.dmi'
body_parts_covered = CHEST|LEGS|ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
mutantrace_variation = NONE
@@ -68,9 +68,9 @@
/obj/item/clothing/under/centcomdress
name = "Centcom Dress Uniform (Hyper)"
desc = "A stylish yet revealing dress uniform worn in extravagent black and gold, worthy of those who sit around and watch cameras all day in an office."
icon = 'modular_eros/icons/obj/clothing/suits.dmi'
icon = 'modular_splurt/icons/obj/clothing/suits.dmi'
icon_state = "ccdress"
mob_overlay_icon = 'modular_eros/icons/mobs/suits.dmi'
mob_overlay_icon = 'modular_splurt/icons/mobs/suits.dmi'
item_state = "r_suit"
can_adjust = FALSE
//We will never know why CC can make their skimpy outfits tough as nails
@@ -84,9 +84,9 @@
/obj/item/clothing/under/centcomdressvk
name = "Virginkiller Centcom Dress Uniform (Hyper)"
desc = "This black and gold beauty does not help paperwork get done, it seems."
icon = 'modular_eros/icons/obj/clothing/suits.dmi'
icon = 'modular_splurt/icons/obj/clothing/suits.dmi'
icon_state = "ccdressvk"
mob_overlay_icon = 'modular_eros/icons/mobs/suits.dmi'
mob_overlay_icon = 'modular_splurt/icons/mobs/suits.dmi'
item_state = "r_suit"
can_adjust = FALSE
//We will never know why CC can make their skimpy outfits tough as nails

View File

@@ -1,6 +1,6 @@
/obj/item/clothing/mask/rat/kitsune
name = "kitsune mask"
desc = "A mask made of soft vinyl and latex, representing the head of a mythical kitsune."
icon = 'modular_eros/icons/obj/clothing/masks.dmi'
icon = 'modular_splurt/icons/obj/clothing/masks.dmi'
icon_state = "kitsune"
item_state = "kitsune"

View File

@@ -0,0 +1,35 @@
/obj/item/clothing/shoes/footwraps
name = "cloth footwraps"
desc = "A roll of treated canvas used for wrapping claws or paws."
icon = 'modular_splurt/icons/obj/clothing/shoes.dmi'
icon_state = "foot_wraps"
mob_overlay_icon = 'modular_splurt/icons/mob/clothing/shoes.dmi'
anthro_mob_worn_overlay = 'modular_splurt/icons/mob/clothing/shoes_digi.dmi'
/obj/item/clothing/shoes/jackboots/toeless
name = "toe-less jackboots"
desc = "Modified pair of jackboots, particularly friendly to those species whose toes hold claws."
icon = 'modular_splurt/icons/obj/clothing/shoes.dmi'
icon_state = "jackboots-toeless"
mob_overlay_icon = 'modular_splurt/icons/mob/clothing/shoes.dmi'
anthro_mob_worn_overlay = 'modular_splurt/icons/mob/clothing/shoes_digi.dmi'
/obj/item/clothing/shoes/jackboots/tall
name = "tall jackboots"
desc = "A pair of knee-high jackboots, complete with heels. All style, all the time."
icon = 'modular_splurt/icons/obj/clothing/shoes.dmi'
icon_state = "jackboots-tall"
mob_overlay_icon = 'modular_splurt/icons/mob/clothing/shoes.dmi'
anthro_mob_worn_overlay = 'modular_splurt/icons/mob/clothing/shoes_digi.dmi'
/obj/item/clothing/shoes/jackboots/tall/Initialize()
. = ..()
AddComponent(/datum/component/squeak, list('modular_splurt/sound/effects/footstep/highheel1.ogg' = 1,'modular_splurt/sound/effects/footstep/highheel2.ogg' = 1), 20)
/obj/item/clothing/shoes/workboots/toeless
name = "toe-less workboots"
desc = "A pair of toeless work boots designed for use in industrial settings. Modified for species whose toes have claws."
icon = 'modular_splurt/icons/obj/clothing/shoes.dmi'
icon_state = "workboots-toeless"
mob_overlay_icon = 'modular_splurt/icons/mob/clothing/shoes.dmi'
anthro_mob_worn_overlay = 'modular_splurt/icons/mob/clothing/shoes_digi.dmi'

View File

@@ -1,8 +1,8 @@
/obj/item/clothing/under/tunic
name = "tunic"
desc = "A simple tunic."
icon = 'modular_eros/icons/obj/clothing/uniforms.dmi'
mob_overlay_icon = 'modular_eros/icons/mob/clothing/uniform.dmi'
icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi'
mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi'
icon_state = "tunic"
can_adjust = FALSE
mutantrace_variation = NONE
@@ -10,35 +10,35 @@
/obj/item/clothing/under/latex
name = "full latex jumpsuit"
desc = "A tight fitting jumpsuit made of latex."
icon = 'modular_eros/icons/obj/clothing/uniforms.dmi'
icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi'
icon_state = "latex_full"
mob_overlay_icon = 'modular_eros/icons/mob/clothing/uniform.dmi'
anthro_mob_worn_overlay = 'modular_eros/icons/mob/clothing/uniform_digi.dmi'
mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi'
anthro_mob_worn_overlay = 'modular_splurt/icons/mob/clothing/uniform_digi.dmi'
can_adjust = FALSE
/obj/item/clothing/under/latex/half
name = "latex bodysuit"
desc = "A tight fitting outfit made of latex, that covers the wearers torso."
icon = 'modular_eros/icons/obj/clothing/uniforms.dmi'
icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi'
icon_state = "latex_half"
mob_overlay_icon = 'modular_eros/icons/mob/clothing/uniform.dmi'
mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi'
body_parts_covered = CHEST
mutantrace_variation = NONE
/obj/item/clothing/under/sexynursesuit
name = "sexy nurse outfit"
desc = "A very revealing nurse's outfit. Not very sanitary. Does it even count as clothing?"
icon = 'modular_eros/icons/obj/clothing/uniforms.dmi'
icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi'
icon_state = "sexynursesuit"
mob_overlay_icon = 'modular_eros/icons/mobs/suits.dmi'
mob_overlay_icon = 'modular_splurt/icons/mobs/suits.dmi'
can_adjust = FALSE
mutantrace_variation = NONE
/obj/item/clothing/under/lumberjack
name = "lumberjack outfit"
desc = "I am a lumberjack and I am ok, I sleep all night and I work all day."
icon = 'modular_eros/icons/obj/clothing/uniforms.dmi'
icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi'
icon_state = "lumberjack"
mob_overlay_icon = 'modular_eros/icons/mob/clothing/uniform.dmi'
mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi'
can_adjust = FALSE
mutantrace_variation = NONE

View File

@@ -2,7 +2,7 @@
seed = null
name = "shadow log"
desc = "A piece of dark log."
icon = 'modular_eros/icons/obj/hydroponics/harvest.dmi'
icon = 'modular_splurt/icons/obj/hydroponics/harvest.dmi'
icon_state = "shadow_log"
plank_type = /obj/item/stack/sheet/mineral/wood/shadow
plank_name = "shadow planks"
@@ -11,7 +11,7 @@
seed = null
name = "mushroom log"
desc = "Looks like candy! Do not eat it."
icon = 'modular_eros/icons/obj/hydroponics/harvest.dmi'
icon = 'modular_splurt/icons/obj/hydroponics/harvest.dmi'
icon_state = "mushroom_log"
plank_type = /obj/item/stack/sheet/mineral/wood/mushroom
plank_name = "mushroom planks"

View File

@@ -3,10 +3,10 @@
/obj/item/kinetic_crusher/rusted
name = "rusted proto-kinetic crusher"
desc = "An early design of the proto-kinetic accelerator, this crusher seems to not have seen any actual use in quite a while - its blade all rusted and dull. Still seems to work though."
icon = 'modular_eros/icons/obj/mining.dmi'
icon = 'modular_splurt/icons/obj/mining.dmi'
item_state = "crusher0"
lefthand_file = 'modular_eros/icons/mob/inhands/weapons/hammers_lefthand.dmi'
righthand_file = 'modular_eros/icons/mob/inhands/weapons/hammers_righthand.dmi'
lefthand_file = 'modular_splurt/icons/mob/inhands/weapons/hammers_lefthand.dmi'
righthand_file = 'modular_splurt/icons/mob/inhands/weapons/hammers_righthand.dmi'
icon_state = "mining_hammer_rust"
charge_time = 20
detonation_damage = 40

View File

@@ -9,7 +9,7 @@
//Hyperstation markings
/datum/sprite_accessory/mam_body_markings/eros
icon = 'modular_eros/icons/mob/mam_markings.dmi'
icon = 'modular_splurt/icons/mob/mam_markings.dmi'
/datum/sprite_accessory/mam_body_markings/eros/abs
name = "Abdominals"

View File

@@ -7,7 +7,7 @@
color_src = SKINTONE
/datum/sprite_accessory/ears/mam_ears/eros
icon = 'modular_eros/icons/mob/mam_ears.dmi'
icon = 'modular_splurt/icons/mob/mam_ears.dmi'
/datum/sprite_accessory/ears/mam_ears/eros/gret
name = "Gret"
icon_state = "gret"

View File

@@ -1,20 +1,20 @@
/datum/sprite_accessory/frills/cobrahood_alt
name = "Cobra Hood - Alt"
icon = 'modular_eros/icons/mob/mutant_bodyparts.dmi'
icon = 'modular_splurt/icons/mob/mutant_bodyparts.dmi'
icon_state = "cobrahood"
color_src = MATRIXED
matrixed_sections = MATRIX_RED_GREEN
/datum/sprite_accessory/frills/cobrahood_alttwo
name = "Cobra Hood - Alt 2"
icon = 'modular_eros/icons/mob/mutant_bodyparts.dmi'
icon = 'modular_splurt/icons/mob/mutant_bodyparts.dmi'
icon_state = "cobrahood_alt"
matrixed_sections = MATRIX_RED_GREEN
color_src = MATRIXED
/datum/sprite_accessory/frills/cobraslim
name = "Narrow Cobra Hood"
icon = 'modular_eros/icons/mob/mutant_bodyparts.dmi'
icon = 'modular_splurt/icons/mob/mutant_bodyparts.dmi'
icon_state = "cobraslim"
color_src = MATRIXED
matrixed_sections = MATRIX_RED_GREEN

View File

@@ -1,6 +1,6 @@
//Hyper stuff
/datum/sprite_accessory/hair/eros
icon = 'modular_eros/icons/mob/hair.dmi'
icon = 'modular_splurt/icons/mob/hair.dmi'
/datum/sprite_accessory/hair/eros/hyenamane
name = "Hyena Mane"

View File

@@ -1,12 +1,12 @@
/datum/sprite_accessory/snouts/gator
name = "Gator"
icon = 'modular_eros/icons/mob/mutant_bodyparts.dmi'
icon = 'modular_splurt/icons/mob/mutant_bodyparts.dmi'
icon_state = "gator"
color_src = MATRIXED
matrixed_sections = MATRIX_RED_GREEN
/datum/sprite_accessory/snouts/mam_snouts/hspots
name = "Hyena"
icon = 'modular_eros/code/modules/mob/dead/new_player/sprite_accesories/snouts.dm'
icon = 'modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/snouts.dm'
icon_state = "hspots"
matrixed_sections = MATRIX_RED_GREEN

View File

@@ -3,26 +3,26 @@
name = "Deer"
icon_state = "deer"
color_src = MATRIXED
icon = 'modular_eros/icons/mob/mam_tails.dmi'
icon = 'modular_splurt/icons/mob/mam_tails.dmi'
matrixed_sections = MATRIX_RED
/datum/sprite_accessory/tails_animated/human/deer
name = "Deer"
icon_state = "deer"
color_src = MATRIXED
icon = 'modular_eros/icons/mob/mam_tails.dmi'
icon = 'modular_splurt/icons/mob/mam_tails.dmi'
matrixed_sections = MATRIX_RED
/datum/sprite_accessory/tails/mam_tails/deer
name = "Deer"
icon_state = "deer"
color_src = MATRIXED
icon = 'modular_eros/icons/mob/mam_tails.dmi'
icon = 'modular_splurt/icons/mob/mam_tails.dmi'
matrixed_sections = MATRIX_RED
/datum/sprite_accessory/tails_animated/mam_tails_animated/deer
name = "Deer"
icon_state = "deer"
color_src = MATRIXED
icon = 'modular_eros/icons/mob/mam_tails.dmi'
icon = 'modular_splurt/icons/mob/mam_tails.dmi'
matrixed_sections = MATRIX_RED

View File

@@ -71,14 +71,14 @@
. = ..()
if(.)
playsound(user, pick(\
'modular_eros/sound/voice/farts/fart.ogg',\
'modular_eros/sound/voice/farts/fart1.ogg',\
'modular_eros/sound/voice/farts/fart2.ogg',\
'modular_eros/sound/voice/farts/fart3.ogg',\
'modular_eros/sound/voice/farts/fart4.ogg',\
'modular_eros/sound/voice/farts/fart5.ogg',\
'modular_eros/sound/voice/farts/fart6.ogg',\
'modular_eros/sound/voice/farts/fart7.ogg'\
'modular_splurt/sound/voice/farts/fart.ogg',\
'modular_splurt/sound/voice/farts/fart1.ogg',\
'modular_splurt/sound/voice/farts/fart2.ogg',\
'modular_splurt/sound/voice/farts/fart3.ogg',\
'modular_splurt/sound/voice/farts/fart4.ogg',\
'modular_splurt/sound/voice/farts/fart5.ogg',\
'modular_splurt/sound/voice/farts/fart6.ogg',\
'modular_splurt/sound/voice/farts/fart7.ogg'\
), 50, 1)
//Iunno about this one yet chief
@@ -116,7 +116,7 @@
if(user.nextsoundemote >= world.time)
return
user.nextsoundemote = world.time + 7
playsound(user, 'modular_eros/sound/voice/cackle_yeen.ogg', 50, 1, -1)
playsound(user, 'modular_splurt/sound/voice/cackle_yeen.ogg', 50, 1, -1)
. = ..()
/datum/emote/speen
@@ -145,28 +145,28 @@
if(user.nextsoundemote >= world.time)
return
user.nextsoundemote = world.time + 7
playsound(user, 'modular_eros/sound/voice/speen.ogg', 50, 1, -1)
playsound(user, 'modular_splurt/sound/voice/speen.ogg', 50, 1, -1)
. = ..()
/datum/emote/sound/human/chirp
key = "chirp"
key_third_person = "chirps"
message = "chirps!"
sound = 'modular_eros/sound/voice/chirp.ogg'
sound = 'modular_splurt/sound/voice/chirp.ogg'
/datum/emote/sound/human/caw
key = "caw"
key_third_person = "caws"
message = "caws!"
sound = 'modular_eros/sound/voice/caw.ogg'
sound = 'modular_splurt/sound/voice/caw.ogg'
/datum/emote/living/burp/run_emote(mob/user, params, type_override, intentional)
. = ..()
var/list/burp_noises = list(
'modular_eros/sound/voice/burps/belch1.ogg','modular_eros/sound/voice/burps/belch2.ogg','modular_eros/sound/voice/burps/belch3.ogg','modular_eros/sound/voice/burps/belch4.ogg',
'modular_eros/sound/voice/burps/belch5.ogg','modular_eros/sound/voice/burps/belch6.ogg','modular_eros/sound/voice/burps/belch7.ogg','modular_eros/sound/voice/burps/belch8.ogg',
'modular_eros/sound/voice/burps/belch9.ogg','modular_eros/sound/voice/burps/belch10.ogg','modular_eros/sound/voice/burps/belch11.ogg','modular_eros/sound/voice/burps/belch12.ogg',
'modular_eros/sound/voice/burps/belch13.ogg','modular_eros/sound/voice/burps/belch14.ogg','modular_eros/sound/voice/burps/belch15.ogg'
'modular_splurt/sound/voice/burps/belch1.ogg','modular_splurt/sound/voice/burps/belch2.ogg','modular_splurt/sound/voice/burps/belch3.ogg','modular_splurt/sound/voice/burps/belch4.ogg',
'modular_splurt/sound/voice/burps/belch5.ogg','modular_splurt/sound/voice/burps/belch6.ogg','modular_splurt/sound/voice/burps/belch7.ogg','modular_splurt/sound/voice/burps/belch8.ogg',
'modular_splurt/sound/voice/burps/belch9.ogg','modular_splurt/sound/voice/burps/belch10.ogg','modular_splurt/sound/voice/burps/belch11.ogg','modular_splurt/sound/voice/burps/belch12.ogg',
'modular_splurt/sound/voice/burps/belch13.ogg','modular_splurt/sound/voice/burps/belch14.ogg','modular_splurt/sound/voice/burps/belch15.ogg'
)
if(.)
playsound(user, pick(burp_noises), 50, 1)
@@ -182,7 +182,7 @@
if(user.nextsoundemote >= world.time)
return
user.nextsoundemote = world.time + 7
playsound(user, 'modular_eros/sound/voice/bleat.ogg', 50, 1, -1)
playsound(user, 'modular_splurt/sound/voice/bleat.ogg', 50, 1, -1)
. = ..()
/datum/emote/living/carbon/moan/run_emote(mob/living/user, params) //I can't not port this shit, come on.
@@ -192,9 +192,9 @@
var/miming = user.mind ? user.mind.miming : 0
if(!user.is_muzzled() && !miming)
user.nextsoundemote = world.time + 7
sound = pick('modular_eros/sound/voice/moan_m1.ogg', 'modular_eros/sound/voice/moan_m2.ogg', 'modular_eros/sound/voice/moan_m3.ogg')
sound = pick('modular_splurt/sound/voice/moan_m1.ogg', 'modular_splurt/sound/voice/moan_m2.ogg', 'modular_splurt/sound/voice/moan_m3.ogg')
if(user.gender == FEMALE)
sound = pick('modular_eros/sound/voice/moan_f1.ogg', 'modular_eros/sound/voice/moan_f2.ogg', 'modular_eros/sound/voice/moan_f3.ogg', 'modular_eros/sound/voice/moan_f4.ogg', 'modular_eros/sound/voice/moan_f5.ogg', 'modular_eros/sound/voice/moan_f6.ogg', 'modular_eros/sound/voice/moan_f7.ogg')
sound = pick('modular_splurt/sound/voice/moan_f1.ogg', 'modular_splurt/sound/voice/moan_f2.ogg', 'modular_splurt/sound/voice/moan_f3.ogg', 'modular_splurt/sound/voice/moan_f4.ogg', 'modular_splurt/sound/voice/moan_f5.ogg', 'modular_splurt/sound/voice/moan_f6.ogg', 'modular_splurt/sound/voice/moan_f7.ogg')
if(isalien(user))
sound = 'sound/voice/hiss6.ogg'
playsound(user.loc, sound, 50, 1, 4, 1.2)

View File

@@ -2,7 +2,7 @@
/obj/structure/anvil/obtainable/dwarfvil
name = "manly anvil"
desc = "someone reinforced an ordinary anvil with a wooden barrel and stained it with booze. You see a skull embedded in it. Its eye sockets are encrusted with legion cores."
icon = 'modular_eros/icons/obj/smith.dmi'
icon = 'modular_splurt/icons/obj/smith.dmi'
icon_state = "dwarfvil"
anvilquality = 1
itemqualitymax = 8

View File

@@ -1,7 +1,7 @@
/obj/item/melee/baton/stunsword/smithed
name = "stundildo"
desc = "A forged club, shaped like a dildo. The venous pattern consists of many electrified wires, and the steel scrotum contains battery connectors. It has a comfortable grip!"
icon = 'modular_eros/icons/obj/items_and_weapons.dmi'
icon = 'modular_splurt/icons/obj/items_and_weapons.dmi'
icon_state = "stundildo"
obj_flags = UNIQUE_RENAME
material_flags = MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS

View File

@@ -2,7 +2,7 @@
name = "dildo frame"
finishingitem = /obj/item/melee/baton/cattleprod
finalitem = /obj/item/melee/baton/stunsword/smithed
icon = 'modular_eros/icons/obj/smith.dmi'
icon = 'modular_splurt/icons/obj/smith.dmi'
icon_state = "stund"
/obj/item/smithing/stundild/startfinish()

View File

Before

Width:  |  Height:  |  Size: 799 B

After

Width:  |  Height:  |  Size: 799 B

View File

Before

Width:  |  Height:  |  Size: 914 B

After

Width:  |  Height:  |  Size: 914 B

View File

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

View File

Before

Width:  |  Height:  |  Size: 658 B

After

Width:  |  Height:  |  Size: 658 B

View File

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

Before

Width:  |  Height:  |  Size: 690 B

After

Width:  |  Height:  |  Size: 690 B

View File

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 688 B

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

View File

Before

Width:  |  Height:  |  Size: 398 B

After

Width:  |  Height:  |  Size: 398 B

View File

Before

Width:  |  Height:  |  Size: 448 B

After

Width:  |  Height:  |  Size: 448 B

Some files were not shown because too many files have changed in this diff Show More