cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 10:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds inhand sprites to shoes. (#7762)

Browse Source 
So, well, you can see yourself holding shoes.

SO MUCH IMMERSION WHOA
This commit is contained in:
Wowzewow (Wezzy)
2019-12-26 04:43:46 +08:00
committed by Erki
parent dcb545853d
commit e7f2e27e90
17 changed files with 185 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/outfits/outfit_antag.dm
View File

@@ -226,7 +226,7 @@
return
if(!H.shoes)
var/fallback_type = pick(/obj/item/clothing/shoes/sandal, /obj/item/clothing/shoes/jackboots/unathi)
var/fallback_type = pick(/obj/item/clothing/shoes/sandal, /obj/item/clothing/shoes/jackboots/toeless)
H.equip_to_slot_or_del(new fallback_type(H), slot_shoes)
var/obj/item/storage/wallet/W = H.wear_id

2
code/datums/trading/goods.dm
View File

@@ -168,7 +168,7 @@
/obj/item/clothing/shoes/magboots = TRADER_BLACKLIST_ALL,
/obj/item/clothing/shoes/swat = TRADER_BLACKLIST,
/obj/item/clothing/shoes/syndigaloshes = TRADER_BLACKLIST,
/obj/item/clothing/shoes/jackboots/unathi/fluff = TRADER_BLACKLIST_ALL,
/obj/item/clothing/shoes/jackboots/toeless/fluff = TRADER_BLACKLIST_ALL,
/obj/item/clothing/shoes/black/bst = TRADER_BLACKLIST
)

4
code/modules/clothing/clothing.dm
View File

@@ -607,6 +607,10 @@
/obj/item/clothing/shoes
name = "shoes"
icon = 'icons/obj/clothing/shoes.dmi'
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_shoes.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_shoes.dmi'
)
desc = "Comfortable-looking shoes."
gender = PLURAL //Carn: for grammarically correct text-parsing
siemens_coefficient = 0.9

210
code/modules/clothing/shoes/colour.dm
View File

@@ -1,6 +1,7 @@
/obj/item/clothing/shoes/black
name = "black shoes"
icon_state = "black"
item_state = "black"
desc = "A pair of black shoes."
cold_protection = FEET
@@ -11,86 +12,11 @@
/obj/item/clothing/shoes/black/noslip
item_flags = NOSLIP
/obj/item/clothing/shoes/brown
name = "brown shoes"
desc = "A pair of brown shoes."
icon_state = "brown"
/obj/item/clothing/shoes/blue
name = "blue shoes"
desc = "A pair of light blue shoes."
icon_state = "blue"
/obj/item/clothing/shoes/green
name = "green shoes"
desc = "A pair of gaudy green shoes."
icon_state = "green"
/obj/item/clothing/shoes/yellow
name = "yellow shoes"
desc = "A pair of garish yellow shoes."
icon_state = "yellow"
/obj/item/clothing/shoes/purple
name = "purple shoes"
desc = "A pair of vibrant purple shoes."
icon_state = "purple"
/obj/item/clothing/shoes/red
name = "red shoes"
desc = "A pair of stylish red shoes."
icon_state = "red"
/obj/item/clothing/shoes/white
name = "white shoes"
desc = "A pair of classy white shoes."
icon_state = "white"
/obj/item/clothing/shoes/medical
name = "doctor shoes"
desc = "A pair of green and white shoes intended for safety around patients."
icon_state = "doctor"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 80, rad = 0)
/obj/item/clothing/shoes/science
name = "scientist shoes"
desc = "A pair of treated purple and white shoes resistant to chemical and gas spills."
icon_state = "scientist"
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
/obj/item/clothing/shoes/chemist
name = "pharmacist shoes"
desc = "A pair of orange and white shoes resistant to biological and chemical hazards."
icon_state = "chemist"
permeability_coefficient = 0.01
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 90, rad = 0)
/obj/item/clothing/shoes/biochem
name = "biochemist shoes"
desc = "A pair of red and white shoes resistant to biological and chemical hazards."
icon_state = "biochem"
permeability_coefficient = 0.01
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 90, rad = 0)
/obj/item/clothing/shoes/psych
name = "psychologist shoes"
desc = "A pair of teal and white shoes resistant to biological and chemical hazards."
icon_state = "psych"
permeability_coefficient = 0.01
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 90, rad = 0)
/obj/item/clothing/shoes/surgeon
name = "surgeon shoes"
desc = "A pair of light blue and white shoes resistant to biological and chemical hazards."
icon_state = "surgeon"
permeability_coefficient = 0.01
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 90, rad = 0)
/obj/item/clothing/shoes/rainbow
name = "rainbow shoes"
desc = "A pair of overly colorful shoes."
icon_state = "rain_bow"
item_state = "red"
/obj/item/clothing/shoes/orange
name = "orange shoes"
@@ -105,6 +31,7 @@
src.chained = cuffs
src.slowdown = 15
src.icon_state = "orange1"
src.item_state = "orange1"
/obj/item/clothing/shoes/orange/proc/remove_cuffs(mob/user as mob)
if (!src.chained) return
@@ -114,6 +41,7 @@
src.slowdown = initial(slowdown)
src.icon_state = "orange"
src.item_state = "orange"
src.chained = null
/obj/item/clothing/shoes/orange/attack_self(mob/user as mob)
@@ -125,12 +53,100 @@
if (istype(H, /obj/item/handcuffs))
attach_cuffs(H, user)
/obj/item/clothing/shoes/yellow
name = "yellow shoes"
desc = "A pair of garish yellow shoes."
icon_state = "yellow"
item_state = "yellow"
/obj/item/clothing/shoes/green
name = "green shoes"
desc = "A pair of gaudy green shoes."
icon_state = "green"
item_state = "green"
/obj/item/clothing/shoes/blue
name = "blue shoes"
desc = "A pair of light blue shoes."
icon_state = "blue"
item_state = "blue"
/obj/item/clothing/shoes/purple
name = "purple shoes"
desc = "A pair of vibrant purple shoes."
icon_state = "purple"
item_state = "purple"
/obj/item/clothing/shoes/brown
name = "brown shoes"
desc = "A pair of brown shoes."
icon_state = "brown"
item_state = "brown"
/obj/item/clothing/shoes/white
name = "white shoes"
desc = "A pair of classy white shoes."
icon_state = "white"
item_state = "white"
/obj/item/clothing/shoes/rainbow
name = "rainbow shoes"
desc = "A pair of overly colorful shoes."
icon_state = "rain_bow"
/obj/item/clothing/shoes/medical
name = "doctor shoes"
desc = "A pair of green and white shoes intended for safety around patients."
icon_state = "doctor"
item_state = "green"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 80, rad = 0)
/obj/item/clothing/shoes/science
name = "scientist shoes"
desc = "A pair of treated purple and white shoes resistant to chemical and gas spills."
icon_state = "scientist"
item_state = "purple"
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
/obj/item/clothing/shoes/chemist
name = "pharmacist shoes"
desc = "A pair of orange and white shoes resistant to biological and chemical hazards."
icon_state = "chemist"
item_state = "orange"
permeability_coefficient = 0.01
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 90, rad = 0)
/obj/item/clothing/shoes/biochem
name = "biochemist shoes"
desc = "A pair of red and white shoes resistant to biological and chemical hazards."
icon_state = "biochem"
item_state = "red"
permeability_coefficient = 0.01
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 90, rad = 0)
/obj/item/clothing/shoes/psych
name = "psychologist shoes"
desc = "A pair of teal and white shoes resistant to biological and chemical hazards."
icon_state = "psych"
item_state = "blue"
permeability_coefficient = 0.01
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 90, rad = 0)
/obj/item/clothing/shoes/surgeon
name = "surgeon shoes"
desc = "A pair of light blue and white shoes resistant to biological and chemical hazards."
icon_state = "surgeon"
item_state = "blue"
permeability_coefficient = 0.01
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 90, rad = 0)
/obj/item/clothing/shoes/flats
desc = "A pair of black, low-heeled women's flats."
name = "black dress flats"
icon = 'icons/obj/clothing/cheongsams.dmi'
icon_state = "dressflatsblack"
item_state = "dressflatsblack"
icon_state = "blackdf"
item_state = "blackdf"
species_restricted = null
contained_sprite = 1
@@ -138,75 +154,75 @@
desc = "A pair of red, low-heeled women's flats."
name = "red dress flats"
icon = 'icons/obj/clothing/cheongsams.dmi'
icon_state = "dressflatsred"
item_state = "dressflatsred"
icon_state = "reddf"
item_state = "reddf"
/obj/item/clothing/shoes/flats/blue
desc = "A pair of blue, low-heeled women's flats."
name = "blue dress flats"
icon_state = "dressflatsblue"
item_state = "dressflatsblue"
icon_state = "bluedf"
item_state = "bluedf"
/obj/item/clothing/shoes/flats/green
desc = "A pair of green, low-heeled women's flats."
name = "green dress flats"
icon_state = "dressflatsgreen"
item_state = "dressflatsgreen"
icon_state = "greendf"
item_state = "greendf"
/obj/item/clothing/shoes/flats/purple
desc = "A pair of purple, low-heeled women's flats."
name = "purple dress flats"
icon_state = "dressflatspurple"
item_state = "dressflatspurple"
icon_state = "purpledf"
item_state = "purpledf"
/obj/item/clothing/shoes/flats/white
desc = "A pair of white, low-heeled women's flats."
name = "white dress flats"
icon_state = "dressflatswhite"
item_state = "dressflatswhite"
icon_state = "whitedf"
item_state = "whitedf"
/obj/item/clothing/shoes/hitops
name = "white high-tops"
desc = "A pair of shoes that extends past the ankle. Based on a centuries-old, timeless design."
icon_state = "whitehi"
item_state = "whitehi"
item_state = "white"
/obj/item/clothing/shoes/hitops/red
name = "red high-tops"
icon_state = "redhi"
item_state = "redhi"
item_state = "red"
/obj/item/clothing/shoes/hitops/brown
name = "brown high-tops"
icon_state = "brownhi"
item_state = "brownhi"
item_state = "brown"
/obj/item/clothing/shoes/hitops/black
name = "black high-tops"
icon_state = "blackhi"
item_state = "blackhi"
item_state = "black"
/obj/item/clothing/shoes/hitops/orange
name = "orange high-tops"
icon_state = "orangehi"
item_state = "orangehi"
item_state = "orange"
/obj/item/clothing/shoes/hitops/blue
name = "blue high-tops"
icon_state = "bluehi"
item_state = "bluehi"
item_state = "blue"
/obj/item/clothing/shoes/hitops/green
name = "green high-tops"
icon_state = "greenhi"
item_state = "greenhi"
item_state = "green"
/obj/item/clothing/shoes/hitops/purple
name = "purple high-tops"
icon_state = "purplehi"
item_state = "purplehi"
item_state = "purple"
/obj/item/clothing/shoes/hitops/yellow
name = "yellow high-tops"
icon_state = "yellowhi"
item_state = "yellowhi"
item_state = "yellow"

7
code/modules/clothing/shoes/jobs.dm
View File

@@ -2,6 +2,7 @@
desc = "A waterproof overshoe, made of rubber."
name = "galoshes"
icon_state = "galoshes"
item_state = "galoshes"
permeability_coefficient = 0.05
item_flags = NOSLIP
slowdown = SHOES_SLOWDOWN+1
@@ -22,7 +23,6 @@
/obj/item/clothing/shoes/jackboots/toeless
name = "toe-less jackboots"
desc = "Modified pair of jackboots, particularly friendly to those species whose toes hold claws."
item_state = "jackboots_toeless"
icon_state = "jackboots_toeless"
species_restricted = null
@@ -41,7 +41,6 @@
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_state = "workboots_toeless"
item_state = "workboots_toeless"
species_restricted = null
/obj/item/clothing/shoes/workboots/grey
@@ -54,7 +53,7 @@
name = "toe-less grey workboots"
desc = "A pair of toeless work boots designed for use in industrial settings. Modified for species whose toes have claws."
icon_state = "workboots_grey_toeless"
item_state = "workboots_grey_toeless"
item_state = "workboots_grey"
/obj/item/clothing/shoes/workboots/dark
name = "dark workboots"
@@ -66,5 +65,5 @@
name = "toe-less dark workboots"
desc = "A pair of toeless dark work boots designed for use in industrial settings. Modified for species whose toes have claws."
icon_state = "workboots_dark_toeless"
item_state = "workboots_dark_toeless"
item_state = "workboots_dark"

1
code/modules/clothing/shoes/leg_guard.dm
View File

@@ -2,6 +2,7 @@
name = "leg guards"
desc = "These will protect your legs and feet."
icon_state = "leg_guards_riot"
item_state = "jackboots"
body_parts_covered = LEGS|FEET
w_class = 3
armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)

1
code/modules/clothing/shoes/magboots.dm
View File

@@ -2,6 +2,7 @@
desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. They're large enough to be worn over other footwear."
name = "magboots"
icon_state = "magboots0"
item_state = "magboots"
center_of_mass = list("x" = 17,"y" = 12)
species_restricted = null
force = 5

19
code/modules/clothing/shoes/miscellaneous.dm
View File

@@ -14,11 +14,13 @@
/obj/item/clothing/shoes/mime
name = "mime shoes"
icon_state = "white"
item_state = "white"
/obj/item/clothing/shoes/swat
name = "\improper SWAT shoes"
desc = "When you want to turn up the heat."
icon_state = "swat"
item_state = "swat"
force = 5
armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0)
item_flags = NOSLIP
@@ -32,6 +34,7 @@
name = "combat boots"
desc = "When you REALLY want to turn up the heat."
icon_state = "jungle"
item_state = "jungle"
force = 5
armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0)
item_flags = NOSLIP
@@ -54,12 +57,14 @@
desc = "A pair of magic, black shoes."
name = "magic shoes"
icon_state = "black"
item_state = "black"
body_parts_covered = FEET
/obj/item/clothing/shoes/sandal/flipflop
name = "flip flops"
desc = "A pair of foam flip flops. For those not afraid to show a little ankle."
icon_state = "thongsandal"
item_state = "thongsandal"
/obj/item/clothing/shoes/clown_shoes
desc = "The prankster's standard-issue clowning shoes. Damn they're huge!"
@@ -103,6 +108,7 @@
name = "cyborg boots"
desc = "Shoes for a cyborg costume"
icon_state = "boots"
item_state = "jackboots"
/obj/item/clothing/shoes/slippers
name = "bunny slippers"
@@ -128,19 +134,23 @@
name = "black oxford shoes"
desc = "The height of fashion, and they're pre-polished!"
icon_state = "oxford_black"
item_state = "oxford_black"
/obj/item/clothing/shoes/laceup/grey
name = "grey oxford shoes"
icon_state = "oxford_grey"
item_state = "oxford_grey"
/obj/item/clothing/shoes/laceup/brown
name = "brown oxford shoes"
icon_state = "oxford_brown"
item_state = "oxford_brown"
/obj/item/clothing/shoes/swimmingfins
desc = "Help you swim good."
name = "swimming fins"
icon_state = "flippers"
item_state = "flippers"
item_flags = NOSLIP
slowdown = SHOES_SLOWDOWN+1
@@ -148,7 +158,7 @@
name = "cloth footwraps"
desc = "A roll of treated cloth used for wrapping clawed feet."
icon_state = "clothwrap"
item_state = "clothwrap"
item_state = "white"
w_class = 2
species_restricted = null
silent = 1
@@ -174,6 +184,7 @@
name = "high heels"
desc = "A pair of high-heeled shoes. Fancy!"
icon_state = "heels"
item_state = "thongsandal"
slowdown = 0
force = 2
sharp = TRUE
@@ -204,7 +215,6 @@
name = "toe-less winter boots"
desc = "A pair of toe-less heavy winter boots made out of animal furs, reaching up to the knee. Modified for species whose toes have claws."
icon_state = "winterboots_toeless"
item_state = "winterboots_toeless"
/obj/item/clothing/shoes/black_boots
name = "black boots"
@@ -232,19 +242,16 @@
name = "white caligae"
desc = "The standard Unathi marching footwear. Made of leather and rubber, with heavy hob-nailed soles, their unique design allows for improved traction and protection. This one has white socks."
icon_state = "whitecaligae"
item_state = "whitecaligae"
/obj/item/clothing/shoes/caligae/grey
name = "grey caligae"
desc = "The standard Unathi marching footwear. Made of leather and rubber, with heavy hob-nailed soles, their unique design allows for improved traction and protection. This one has grey socks."
icon_state = "greycaligae"
item_state = "greycaligae"
/obj/item/clothing/shoes/caligae/black
name = "black caligae"
desc = "The standard Unathi marching footwear. Made of leather and rubber, with heavy hob-nailed soles, their unique design allows for improved traction and protection. This one has black socks."
icon_state = "blackcaligae"
item_state = "blackcaligae"
/obj/item/clothing/shoes/caligae/armor
name = "leather caligae"
@@ -263,4 +270,4 @@
silent = TRUE
cold_protection = FEET
min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE
min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE

2
code/modules/customitems/item_defines.dm
View File

@@ -2019,7 +2019,7 @@ All custom items with worn sprites must follow the contained sprite system: http
item_state = "mar_dress"
contained_sprite = TRUE
/obj/item/clothing/shoes/jackboots/unathi/fluff/marwani_shoes //Unathi Purple Boots - Ilaeza Marwani - burgerbb
/obj/item/clothing/shoes/jackboots/toeless/fluff/marwani_shoes //Unathi Purple Boots - Ilaeza Marwani - burgerbb
name = "unathi purple boots"
desc = "Giant, closed-toe boots with extra claw space and support, perfect for those with clawed feet."
icon = 'icons/obj/custom_items/marwani_dress.dmi'