cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ParadiseSS13/master' into client-data-loading

Browse Source
This commit is contained in:
AffectedArc07
2021-09-02 14:01:27 +01:00
parent 4062bc6b1a 1a935f5b1a
commit 70fd70f2eb
174 changed files with 1068 additions and 896 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm
+8 -8
View File
@@ -167,11 +167,11 @@
// Underwear Definitions //
///////////////////////////
/datum/sprite_accessory/underwear
icon = 'icons/mob/underwear.dmi'
icon = 'icons/mob/clothing/underwear.dmi'
species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/underwear.dmi',
"Grey" = 'icons/mob/species/grey/underwear.dmi'
"Vox" = 'icons/mob/clothing/species/vox/underwear.dmi',
"Grey" = 'icons/mob/clothing/species/grey/underwear.dmi'
)
gender = NEUTER
@@ -297,11 +297,11 @@
// Undershirt Definitions //
////////////////////////////
/datum/sprite_accessory/undershirt
icon = 'icons/mob/underwear.dmi'
icon = 'icons/mob/clothing/underwear.dmi'
species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/underwear.dmi',
"Grey" = 'icons/mob/species/grey/underwear.dmi')
"Vox" = 'icons/mob/clothing/species/vox/underwear.dmi',
"Grey" = 'icons/mob/clothing/species/grey/underwear.dmi')
gender = NEUTER
/datum/sprite_accessory/undershirt/nude
@@ -536,9 +536,9 @@
// Socks Definitions //
///////////////////////
/datum/sprite_accessory/socks
icon = 'icons/mob/underwear.dmi'
icon = 'icons/mob/clothing/underwear.dmi'
species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox")
sprite_sheets = list("Vox" = 'icons/mob/species/vox/underwear.dmi')
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/underwear.dmi')
gender = NEUTER
/datum/sprite_accessory/socks/nude