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

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

Browse Source 
# Conflicts:
#	icons/obj/vending.dmi
#	paradise.dme
This commit is contained in:
Mark van Alphen
2019-05-30 19:35:52 +02:00
parent ef479cb982 7d940885b9
commit b65fbb907e
90 changed files with 1054 additions and 1961 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/under/accessories/accessory.dm
+11 -11
View File
@@ -118,7 +118,7 @@
icon_state = "waistcoat"
item_state = "waistcoat"
item_color = "waistcoat"
species_fit = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
)
@@ -462,7 +462,7 @@
icon_state = "cowboyshirt"
item_state = "cowboyshirt"
item_color = "cowboyshirt"
species_fit = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
)
@@ -473,7 +473,7 @@
icon_state = "cowboyshirt_s"
item_state = "cowboyshirt_s"
item_color = "cowboyshirt_s"
species_fit = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
)
@@ -484,7 +484,7 @@
icon_state = "cowboyshirt_white"
item_state = "cowboyshirt_white"
item_color = "cowboyshirt_white"
species_fit = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
)
@@ -495,7 +495,7 @@
icon_state = "cowboyshirt_whites"
item_state = "cowboyshirt_whites"
item_color = "cowboyshirt_whites"
species_fit = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
)
@@ -506,7 +506,7 @@
icon_state = "cowboyshirt_pink"
item_state = "cowboyshirt_pink"
item_color = "cowboyshirt_pink"
species_fit = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
)
@@ -517,7 +517,7 @@
icon_state = "cowboyshirt_pinks"
item_state = "cowboyshirt_pinks"
item_color = "cowboyshirt_pinks"
species_fit = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
)
@@ -528,7 +528,7 @@
icon_state = "cowboyshirt_navy"
item_state = "cowboyshirt_navy"
item_color = "cowboyshirt_navy"
species_fit = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
)
@@ -539,7 +539,7 @@
icon_state = "cowboyshirt_navys"
item_state = "cowboyshirt_navys"
item_color = "cowboyshirt_navys"
species_fit = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
)
@@ -550,7 +550,7 @@
icon_state = "cowboyshirt_red"
item_state = "cowboyshirt_red"
item_color = "cowboyshirt_red"
species_fit = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
)
@@ -561,7 +561,7 @@
icon_state = "cowboyshirt_reds"
item_state = "cowboyshirt_reds"
item_color = "cowboyshirt_reds"
species_fit = list("Vox", "Drask", "Grey")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi',
"Drask" = 'icons/mob/species/drask/suit.dmi',
code/modules/clothing/under/accessories/storage.dm
+1 -1
View File
@@ -78,7 +78,7 @@
desc = "Sturdy mess of synthcotton belts and buckles, ready to share your burden."
icon_state = "webbing"
item_color = "webbing"
species_fit = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
)