Merge pull request #79 from Starfly-13/JuneCosmeticsFixes

Fixes issues caused by #73
Starfly-13 · Jun 23, 2024 · 7ac2177 · 7ac2177
2 parents 86b6e4d + ece9ab2
commit 7ac2177
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 281 deletions.
diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm
@@ -496,7 +496,7 @@
 
 /obj/item/clothing/neck/festivescarf
 	name = "festive striped scarf"
-	icon_state = "festivescarf"
+	icon_state = "festivestripedscarf"
 	custom_price = 10
 
 /obj/item/clothing/neck/ntscarf
@@ -517,7 +517,7 @@
 
 /obj/item/clothing/neck/redbluestripedscarf
 	name = "red-blue striped scarf"
-	icon_state = "magnetscarf"
+	icon_state = "magnetstripedscarf"
 	custom_price = 10
 
 /obj/item/clothing/neck/darkstripedscarf
@@ -537,11 +537,12 @@
 
 /obj/item/clothing/neck/lisalisastripedscarf
 	name = "ripple striped scarf"
-	icon_state = "lisalisastripedscarf"
+	icon_state = "lisalisascarf"
 	desc = "A striped scarf inspired by an ancient martial artist, said to have slain vampires with a thread of her scarf."
 	custom_price = 10
 
 /obj/item/clothing/neck/spookystripedscarf
 	name = "spooky striped scarf"
 	icon_state = "spookystripedscarf"
-	custom_price = 10
+	custom_price = 10
+
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
diff --git a/shiptest.dme b/shiptest.dme
@@ -6,283 +6,6 @@
 
 // BEGIN_FILE_DIR
 #define FILE_DIR .
-#define FILE_DIR "code"
-#define FILE_DIR "code/modules"
-#define FILE_DIR "code/modules/donator"
-#define FILE_DIR "config"
-#define FILE_DIR "config/title_music"
-#define FILE_DIR "config/title_music/sounds"
-#define FILE_DIR "html"
-#define FILE_DIR "icons"
-#define FILE_DIR "icons/ass"
-#define FILE_DIR "icons/blanks"
-#define FILE_DIR "icons/effects"
-#define FILE_DIR "icons/effects/light_overlays"
-#define FILE_DIR "icons/effects/mouse_pointers"
-#define FILE_DIR "icons/hud"
-#define FILE_DIR "icons/materials"
-#define FILE_DIR "icons/mecha"
-#define FILE_DIR "icons/misc"
-#define FILE_DIR "icons/mob"
-#define FILE_DIR "icons/mob/actions"
-#define FILE_DIR "icons/mob/augmentation"
-#define FILE_DIR "icons/mob/clothing"
-#define FILE_DIR "icons/mob/clothing/faction"
-#define FILE_DIR "icons/mob/clothing/faction/clip"
-#define FILE_DIR "icons/mob/clothing/faction/frontiersmen"
-#define FILE_DIR "icons/mob/clothing/faction/gezena"
-#define FILE_DIR "icons/mob/clothing/faction/hardliners"
-#define FILE_DIR "icons/mob/clothing/faction/nanotrasen"
-#define FILE_DIR "icons/mob/clothing/faction/ngr"
-#define FILE_DIR "icons/mob/clothing/faction/suns"
-#define FILE_DIR "icons/mob/clothing/head"
-#define FILE_DIR "icons/mob/clothing/species"
-#define FILE_DIR "icons/mob/clothing/suits"
-#define FILE_DIR "icons/mob/clothing/under"
-#define FILE_DIR "icons/mob/clothing/underwear"
-#define FILE_DIR "icons/mob/clothing/underwear/species"
-#define FILE_DIR "icons/mob/clothing/underwear/species/kepori"
-#define FILE_DIR "icons/mob/icemoon"
-#define FILE_DIR "icons/mob/inhands"
-#define FILE_DIR "icons/mob/inhands/antag"
-#define FILE_DIR "icons/mob/inhands/clothing"
-#define FILE_DIR "icons/mob/inhands/equipment"
-#define FILE_DIR "icons/mob/inhands/faction"
-#define FILE_DIR "icons/mob/inhands/faction/gezena"
-#define FILE_DIR "icons/mob/inhands/faction/nanotrasen"
-#define FILE_DIR "icons/mob/inhands/faction/suns"
-#define FILE_DIR "icons/mob/inhands/misc"
-#define FILE_DIR "icons/mob/inhands/weapons"
-#define FILE_DIR "icons/mob/jungle"
-#define FILE_DIR "icons/mob/large-worn-icons"
-#define FILE_DIR "icons/mob/large-worn-icons/64x64"
-#define FILE_DIR "icons/mob/lavaland"
-#define FILE_DIR "icons/mob/species"
-#define FILE_DIR "icons/mob/species/ethereal"
-#define FILE_DIR "icons/mob/species/human"
-#define FILE_DIR "icons/mob/species/humanoid_husk"
-#define FILE_DIR "icons/mob/species/ipc"
-#define FILE_DIR "icons/mob/species/kepori"
-#define FILE_DIR "icons/mob/species/lizard"
-#define FILE_DIR "icons/mob/species/misc"
-#define FILE_DIR "icons/mob/species/moth"
-#define FILE_DIR "icons/mob/species/plasmaman"
-#define FILE_DIR "icons/mob/species/rachnid"
-#define FILE_DIR "icons/mob/species/vox"
-#define FILE_DIR "icons/obj"
-#define FILE_DIR "icons/obj/assemblies"
-#define FILE_DIR "icons/obj/atmospherics"
-#define FILE_DIR "icons/obj/atmospherics/components"
-#define FILE_DIR "icons/obj/atmospherics/pipes"
-#define FILE_DIR "icons/obj/chemical"
-#define FILE_DIR "icons/obj/clothing"
-#define FILE_DIR "icons/obj/clothing/faction"
-#define FILE_DIR "icons/obj/clothing/faction/clip"
-#define FILE_DIR "icons/obj/clothing/faction/frontiersmen"
-#define FILE_DIR "icons/obj/clothing/faction/gezena"
-#define FILE_DIR "icons/obj/clothing/faction/hardliners"
-#define FILE_DIR "icons/obj/clothing/faction/nanotrasen"
-#define FILE_DIR "icons/obj/clothing/faction/ngr"
-#define FILE_DIR "icons/obj/clothing/faction/suns"
-#define FILE_DIR "icons/obj/clothing/head"
-#define FILE_DIR "icons/obj/clothing/suits"
-#define FILE_DIR "icons/obj/clothing/under"
-#define FILE_DIR "icons/obj/doors"
-#define FILE_DIR "icons/obj/doors/airlocks"
-#define FILE_DIR "icons/obj/doors/airlocks/abductor"
-#define FILE_DIR "icons/obj/doors/airlocks/centcom"
-#define FILE_DIR "icons/obj/doors/airlocks/clockwork"
-#define FILE_DIR "icons/obj/doors/airlocks/cult"
-#define FILE_DIR "icons/obj/doors/airlocks/cult/runed"
-#define FILE_DIR "icons/obj/doors/airlocks/cult/unruned"
-#define FILE_DIR "icons/obj/doors/airlocks/external"
-#define FILE_DIR "icons/obj/doors/airlocks/glass_large"
-#define FILE_DIR "icons/obj/doors/airlocks/hatch"
-#define FILE_DIR "icons/obj/doors/airlocks/highsec"
-#define FILE_DIR "icons/obj/doors/airlocks/shuttle"
-#define FILE_DIR "icons/obj/doors/airlocks/station"
-#define FILE_DIR "icons/obj/doors/airlocks/station2"
-#define FILE_DIR "icons/obj/doors/airlocks/survival"
-#define FILE_DIR "icons/obj/doors/airlocks/vault"
-#define FILE_DIR "icons/obj/doors/puzzledoor"
-#define FILE_DIR "icons/obj/drinks"
-#define FILE_DIR "icons/obj/flora"
-#define FILE_DIR "icons/obj/food"
-#define FILE_DIR "icons/obj/gang"
-#define FILE_DIR "icons/obj/guns"
-#define FILE_DIR "icons/obj/guns/faction"
-#define FILE_DIR "icons/obj/guns/faction/gezena"
-#define FILE_DIR "icons/obj/hydroponics"
-#define FILE_DIR "icons/obj/ice_moon"
-#define FILE_DIR "icons/obj/implants"
-#define FILE_DIR "icons/obj/item"
-#define FILE_DIR "icons/obj/lavaland"
-#define FILE_DIR "icons/obj/machines"
-#define FILE_DIR "icons/obj/plumbing"
-#define FILE_DIR "icons/obj/power_cond"
-#define FILE_DIR "icons/obj/smooth_structures"
-#define FILE_DIR "icons/obj/smooth_structures/alien"
-#define FILE_DIR "icons/obj/spacepods"
-#define FILE_DIR "icons/obj/structures"
-#define FILE_DIR "icons/obj/structures/chairs"
-#define FILE_DIR "icons/obj/structures/signs"
-#define FILE_DIR "icons/obj/tesla_engine"
-#define FILE_DIR "icons/obj/world"
-#define FILE_DIR "icons/pda_icons"
-#define FILE_DIR "icons/program_icons"
-#define FILE_DIR "icons/runtime"
-#define FILE_DIR "icons/stamp_icons"
-#define FILE_DIR "icons/Testing"
-#define FILE_DIR "icons/turf"
-#define FILE_DIR "icons/turf/connectors"
-#define FILE_DIR "icons/turf/decals"
-#define FILE_DIR "icons/turf/floors"
-#define FILE_DIR "icons/turf/walls"
-#define FILE_DIR "icons/turf/walls/rwalls"
-#define FILE_DIR "icons/UI_Icons"
-#define FILE_DIR "icons/UI_Icons/Achievements"
-#define FILE_DIR "icons/UI_Icons/Achievements/Boss"
-#define FILE_DIR "icons/UI_Icons/Achievements/Misc"
-#define FILE_DIR "icons/UI_Icons/Achievements/Skills"
-#define FILE_DIR "icons/UI_Icons/Arcade"
-#define FILE_DIR "icons/UI_Icons/chat"
-#define FILE_DIR "icons/UI_Icons/fishing"
-#define FILE_DIR "icons/UI_Icons/Pills"
-#define FILE_DIR "icons/UI_Icons/tgui"
-#define FILE_DIR "icons/vending_icons"
-#define FILE_DIR "sound"
-#define FILE_DIR "sound/ai"
-#define FILE_DIR "sound/ambience"
-#define FILE_DIR "sound/ambience/antag"
-#define FILE_DIR "sound/arcade"
-#define FILE_DIR "sound/creatures"
-#define FILE_DIR "sound/effects"
-#define FILE_DIR "sound/effects/footstep"
-#define FILE_DIR "sound/effects/thunder"
-#define FILE_DIR "sound/effects/turbolift"
-#define FILE_DIR "sound/hallucinations"
-#define FILE_DIR "sound/health"
-#define FILE_DIR "sound/hornetnoises"
-#define FILE_DIR "sound/items"
-#define FILE_DIR "sound/items/equip"
-#define FILE_DIR "sound/items/geiger"
-#define FILE_DIR "sound/items/handling"
-#define FILE_DIR "sound/items/storage"
-#define FILE_DIR "sound/lavaland"
-#define FILE_DIR "sound/machines"
-#define FILE_DIR "sound/machines/airlocks"
-#define FILE_DIR "sound/machines/airlocks/external"
-#define FILE_DIR "sound/machines/airlocks/hatch"
-#define FILE_DIR "sound/machines/airlocks/shutters"
-#define FILE_DIR "sound/machines/airlocks/standard"
-#define FILE_DIR "sound/machines/apc"
-#define FILE_DIR "sound/machines/clockcult"
-#define FILE_DIR "sound/machines/computer"
-#define FILE_DIR "sound/machines/fryer"
-#define FILE_DIR "sound/machines/generator"
-#define FILE_DIR "sound/machines/gravgen"
-#define FILE_DIR "sound/machines/keyboard"
-#define FILE_DIR "sound/machines/microwave"
-#define FILE_DIR "sound/machines/nuke"
-#define FILE_DIR "sound/machines/shower"
-#define FILE_DIR "sound/machines/sm"
-#define FILE_DIR "sound/machines/sm/accent"
-#define FILE_DIR "sound/machines/sm/accent/delam"
-#define FILE_DIR "sound/machines/sm/accent/normal"
-#define FILE_DIR "sound/machines/sm/loops"
-#define FILE_DIR "sound/machines/smes"
-#define FILE_DIR "sound/machines/tcomms"
-#define FILE_DIR "sound/machines/vending"
-#define FILE_DIR "sound/magic"
-#define FILE_DIR "sound/magic/clockwork"
-#define FILE_DIR "sound/mecha"
-#define FILE_DIR "sound/misc"
-#define FILE_DIR "sound/roundend"
-#define FILE_DIR "sound/roundstart"
-#define FILE_DIR "sound/runtime"
-#define FILE_DIR "sound/runtime/chatter"
-#define FILE_DIR "sound/runtime/hyperspace"
-#define FILE_DIR "sound/runtime/instruments"
-#define FILE_DIR "sound/runtime/instruments/accordion"
-#define FILE_DIR "sound/runtime/instruments/banjo"
-#define FILE_DIR "sound/runtime/instruments/bikehorn"
-#define FILE_DIR "sound/runtime/instruments/eguitar"
-#define FILE_DIR "sound/runtime/instruments/glockenspiel"
-#define FILE_DIR "sound/runtime/instruments/guitar"
-#define FILE_DIR "sound/runtime/instruments/harmonica"
-#define FILE_DIR "sound/runtime/instruments/piano"
-#define FILE_DIR "sound/runtime/instruments/recorder"
-#define FILE_DIR "sound/runtime/instruments/saxophone"
-#define FILE_DIR "sound/runtime/instruments/synthesis_samples"
-#define FILE_DIR "sound/runtime/instruments/synthesis_samples/brass"
-#define FILE_DIR "sound/runtime/instruments/synthesis_samples/brass/crisis_brass"
-#define FILE_DIR "sound/runtime/instruments/synthesis_samples/brass/crisis_trombone"
-#define FILE_DIR "sound/runtime/instruments/synthesis_samples/brass/crisis_trumpet"
-#define FILE_DIR "sound/runtime/instruments/synthesis_samples/chromatic"
-#define FILE_DIR "sound/runtime/instruments/synthesis_samples/chromatic/fluid_celeste"
-#define FILE_DIR "sound/runtime/instruments/synthesis_samples/chromatic/sgmbox"
-#define FILE_DIR "sound/runtime/instruments/synthesis_samples/chromatic/vibraphone1"
-#define FILE_DIR "sound/runtime/instruments/synthesis_samples/guitar"
-#define FILE_DIR "sound/runtime/instruments/synthesis_samples/guitar/crisis_clean"
-#define FILE_DIR "sound/runtime/instruments/synthesis_samples/guitar/crisis_muted"
-#define FILE_DIR "sound/runtime/instruments/synthesis_samples/guitar/crisis_nylon"
-#define FILE_DIR "sound/runtime/instruments/synthesis_samples/guitar/crisis_steel"
-#define FILE_DIR "sound/runtime/instruments/synthesis_samples/organ"
-#define FILE_DIR "sound/runtime/instruments/synthesis_samples/organ/crisis_accordian"
-#define FILE_DIR "sound/runtime/instruments/synthesis_samples/organ/crisis_church"
-#define FILE_DIR "sound/runtime/instruments/synthesis_samples/organ/crisis_hammond"
-#define FILE_DIR "sound/runtime/instruments/synthesis_samples/organ/crisis_harmonica"
-#define FILE_DIR "sound/runtime/instruments/synthesis_samples/organ/crisis_tangaccordian"
-#define FILE_DIR "sound/runtime/instruments/synthesis_samples/piano"
-#define FILE_DIR "sound/runtime/instruments/synthesis_samples/piano/crisis_bright_piano"
-#define FILE_DIR "sound/runtime/instruments/synthesis_samples/piano/crisis_grand_piano"
-#define FILE_DIR "sound/runtime/instruments/synthesis_samples/piano/crisis_harpsichord"
-#define FILE_DIR "sound/runtime/instruments/synthesis_samples/piano/fluid_harpsi"
-#define FILE_DIR "sound/runtime/instruments/synthesis_samples/piano/fluid_piano"
-#define FILE_DIR "sound/runtime/instruments/synthesis_samples/tones"
-#define FILE_DIR "sound/runtime/instruments/trombone"
-#define FILE_DIR "sound/runtime/instruments/violin"
-#define FILE_DIR "sound/runtime/instruments/xylophone"
-#define FILE_DIR "sound/spookoween"
-#define FILE_DIR "sound/surgery"
-#define FILE_DIR "sound/vehicles"
-#define FILE_DIR "sound/voice"
-#define FILE_DIR "sound/voice/beepsky"
-#define FILE_DIR "sound/voice/firebot"
-#define FILE_DIR "sound/voice/human"
-#define FILE_DIR "sound/voice/kepori"
-#define FILE_DIR "sound/voice/lizard"
-#define FILE_DIR "sound/voice/medbot"
-#define FILE_DIR "sound/voice/moth"
-#define FILE_DIR "sound/voice/squid"
-#define FILE_DIR "sound/voice/vox"
-#define FILE_DIR "sound/vox_fem"
-#define FILE_DIR "sound/weapons"
-#define FILE_DIR "sound/weapons/effects"
-#define FILE_DIR "sound/weapons/gun"
-#define FILE_DIR "sound/weapons/gun/commissar"
-#define FILE_DIR "sound/weapons/gun/energy"
-#define FILE_DIR "sound/weapons/gun/flamethrower"
-#define FILE_DIR "sound/weapons/gun/gauss"
-#define FILE_DIR "sound/weapons/gun/general"
-#define FILE_DIR "sound/weapons/gun/hit"
-#define FILE_DIR "sound/weapons/gun/hmg"
-#define FILE_DIR "sound/weapons/gun/l6"
-#define FILE_DIR "sound/weapons/gun/laser"
-#define FILE_DIR "sound/weapons/gun/pistol"
-#define FILE_DIR "sound/weapons/gun/revolver"
-#define FILE_DIR "sound/weapons/gun/rifle"
-#define FILE_DIR "sound/weapons/gun/shotgun"
-#define FILE_DIR "sound/weapons/gun/smg"
-#define FILE_DIR "sound/weapons/gun/sniper"
-#define FILE_DIR "sound/weather"
-#define FILE_DIR "sound/weather/ashstorm"
-#define FILE_DIR "sound/weather/ashstorm/inside"
-#define FILE_DIR "sound/weather/ashstorm/outside"
-#define FILE_DIR "sound/weather/fallout"
-#define FILE_DIR "sound/weather/wind"
-#define FILE_DIR "tools"
-#define FILE_DIR "tools/SS13SmoothingCutter"
 // END_FILE_DIR
 
 // BEGIN_PREFERENCES