cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

touch ups, polychromic not working

Browse Source
This commit is contained in:
SandPoot
2023-02-27 23:13:43 -03:00
parent d422d1a5e7
commit 6e55b682a7
5 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modular_sand/code/modules/client/loadout/socks.dm
View File

@@ -75,12 +75,12 @@
path = /obj/item/clothing/underwear/socks/short
/datum/gear/socks/stir
name = "Normal Stirrups (Greyscale)"
name = "Polychromic Normal Stirrups"
description = "A type of close-fitting ladies' pant that tapers at the ankle, similar to leggings, except that the material extends to a band, or strap, that is worn under the arch of the foot to hold the pant leg in place."
path = /obj/item/clothing/underwear/socks/stir
/datum/gear/socks/stir/knee
name = "Knee-high Stirrups (Greyscale)"
name = "Polychromic Knee-high Stirrups"
path = /obj/item/clothing/underwear/socks/stir/knee
/datum/gear/socks/stir/knee/rainbow
@@ -100,7 +100,7 @@
path = /obj/item/clothing/underwear/socks/stir/leggings/pantyhose/ripped
/datum/gear/socks/stir/thigh
name = "Thigh-high Stirrups (Greyscale)"
name = "Polychromic Thigh-high Stirrups"
path = /obj/item/clothing/underwear/socks/stir/thigh
/datum/gear/socks/stir/thigh/striped

2
modular_sand/code/modules/clothing/underwear/shirts.dm
View File

@@ -23,7 +23,7 @@
icon_state = "undershirt_bee"
/obj/item/clothing/underwear/shirt/corset
name = "Corset"
name = "corset"
desc = "A support garment commonly worn to hold and train the torso into a desired shape, traditionally a smaller waist or larger bottom, for aesthetic or medical purposes, or support the breasts."
body_parts_covered = CHEST
icon_state = "corset"

35
modular_sand/code/modules/clothing/underwear/socks.dm
View File

@@ -80,7 +80,7 @@
icon_state = "socks_knee_assblastusa"
/obj/item/clothing/underwear/socks/latex
name = "Latex socks"
name = "latex socks"
desc = "A pair of latex socks."
icon_state = "socks_latex"
@@ -194,46 +194,59 @@
icon_state = "socks_thigh_assblastusa"
/obj/item/clothing/underwear/socks/stir
name = "Normal Stirrups (Greyscale)"
name = "polychromatic stirrups"
desc = "A type of close-fitting ladies' pant that tapers at the ankle, similar to leggings, except that the material extends to a band, or strap, that is worn under the arch of the foot to hold the pant leg in place."
body_parts_covered = NONE
icon_state = "socks_norm-stir"
var/polychromic = TRUE
/obj/item/clothing/underwear/socks/stir/ComponentInitialize()
. = ..()
if(polychromic)
AddElement(/datum/element/polychromic, list("#ffffff"), 1)
/obj/item/clothing/underwear/socks/stir/knee
name = "Knee-high Stirrups (Greyscale)"
name = "polychromatic knee-high stirrups"
icon_state = "socks_knee-stir"
/obj/item/clothing/underwear/socks/stir/knee/rainbow
name = "Knee-high Rainbow Stirrups"
name = "knee-high rainbow stirrups"
icon_state = "rainbow_knee-stir"
polychromic = FALSE
/obj/item/clothing/underwear/socks/stir/leggings
name = "Leggings Stirrups"
name = "leggings stirrups"
body_parts_covered = LEGS | GROIN
icon_state = "leggings-stir"
polychromic = FALSE
/obj/item/clothing/underwear/socks/stir/leggings/pantyhose
name = "Pantyhose Stirrups"
name = "pantyhose stirrups"
icon_state = "pantyhose-stir"
polychromic = FALSE
/obj/item/clothing/underwear/socks/stir/leggings/pantyhose/ripped
name = "Ripped Pantyhose Stirrups"
name = "ripped pantyhose stirrups"
body_parts_covered = NONE
icon_state = "pantyhose_ripped-stir"
polychromic = FALSE
/obj/item/clothing/underwear/socks/stir/thigh
name = "Thigh-high Stirrups (Greyscale)"
name = "polychromatic thigh-high stirrups"
body_parts_covered = LEGS
icon_state = "socks_thigh-stir"
/obj/item/clothing/underwear/socks/stir/thigh/striped
name = "Thigh-high Striped Stirrups"
name = "thigh-high striped stirrups"
icon_state = "striped_thigh-stir"
polychromic = FALSE
/obj/item/clothing/underwear/socks/stir/thigh/gym
name = "Thigh-high Stirrups (black with stripe)"
name = "thigh-high stirrups (black with stripe)"
icon_state = "striped_thigh-stir"
polychromic = FALSE
/obj/item/clothing/underwear/socks/stir/thigh/rainbow
name = "Thigh-high Rainbow Stirrups"
name = "thigh-high rainbow stirrups"
icon_state = "rainbow_thigh-stir"
polychromic = FALSE

BIN
modular_sand/icons/mob/clothing/underwear_digi.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 67 KiB

After

Width:  |  Height:  |  Size: 69 KiB

12
tgstation.dme
View File

@@ -253,9 +253,9 @@
#include "code\__SANDCODE\DEFINES\subsystems.dm"
#include "code\__SANDCODE\DEFINES\traits.dm"
#include "code\__SANDCODE\DEFINES\wires.dm"
#include "code\__SANDCODE\DEFINES\dcs\signals.dm"
#include "code\__SANDCODE\DEFINES\dcs\signals\signals_mob_main.dm"
#include "code\__SANDCODE\DEFINES\dcs\signals\sizecode.dm"
#include "code\__SANDCODE\DEFINES\dcs\signals.dm"
#include "code\__SANDCODE\HELPERS\sizecode.dm"
#include "code\_globalvars\admin.dm"
#include "code\_globalvars\bitfields.dm"
@@ -4213,12 +4213,8 @@
#include "modular_sand\code\modules\reagents\reagent_containers\dropper.dm"
#include "modular_sand\code\modules\reagents\reagent_containers\glass.dm"
#include "modular_sand\code\modules\reagents\reagent_containers\spray.dm"
#include "modular_sand\code\modules\research\stock_parts.dm"
#include "modular_sand\code\modules\research\rdconsole.dm"
#include "modular_sand\code\modules\research\machinery\_production.dm"
#include "modular_sand\code\modules\research\machinery\departmental_circuit_imprinter.dm"
#include "modular_sand\code\modules\research\machinery\departmental_protolathe.dm"
#include "modular_sand\code\modules\research\machinery\departmental_techfab.dm"
#include "modular_sand\code\modules\research\stock_parts.dm"
#include "modular_sand\code\modules\research\designs\autolathe_designs.dm"
#include "modular_sand\code\modules\research\designs\biogenerator_designs.dm"
#include "modular_sand\code\modules\research\designs\machine_designs.dm"
@@ -4232,6 +4228,10 @@
#include "modular_sand\code\modules\research\designs\weapon_designs.dm"
#include "modular_sand\code\modules\research\designs\autolathe_designs\autolathe_designs_medical_and_dinnerware.dm"
#include "modular_sand\code\modules\research\designs\machine_designs\machine_designs_all_misc.dm"
#include "modular_sand\code\modules\research\machinery\_production.dm"
#include "modular_sand\code\modules\research\machinery\departmental_circuit_imprinter.dm"
#include "modular_sand\code\modules\research\machinery\departmental_protolathe.dm"
#include "modular_sand\code\modules\research\machinery\departmental_techfab.dm"
#include "modular_sand\code\modules\research\nanites\nanite_programs\utility.dm"
#include "modular_sand\code\modules\research\techweb\nodes\alien_nodes.dm"
#include "modular_sand\code\modules\research\techweb\nodes\all_nodes.dm"