Skip to content

Commit 3ffcca2

Browse files
SparkezelHoratio22
Sparkezel
and
Horatio22
authored
ports disco elysium sprites (#315)
* Disco Elysium suits (#62113) Re-opening goof's PR that was closed earlier this week: #61401 that ports Disco Elysium sprites from Fulp's old repo: TheSwain#306 but with fixes to armhole issue on the under/jobs/security sprites and minor punctuation corrections on some item descriptions. * make suits not adjustable * sprite reordering and addition * all the sprites * fix Co-authored-by: Horatio22 <[email protected]>
1 parent e054bd9 commit 3ffcca2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+175
-95
lines changed

‎code/modules/clothing/glasses/_glasses.dm‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -617,3 +617,22 @@
617617
xray = !xray
618618
var/mob/living/carbon/human/H = user
619619
H.update_sight()
620+
621+
/obj/item/clothing/glasses/sunglasses/osi
622+
name = "O.S.I. Sunglasses"
623+
desc = "There's no such thing as good news! Just bad news and... weird news.."
624+
icon_state = "osi_glasses"
625+
inhand_icon_state = "osi_glasses"
626+
custom_price = PAYCHECK_HARD * 2
627+
628+
/obj/item/clothing/glasses/phantom
629+
name = "Phantom Thief Mask"
630+
desc = "Lookin' cool."
631+
icon_state = "phantom_glasses"
632+
inhand_icon_state = "phantom_glasses"
633+
634+
/obj/item/clothing/glasses/regular/kim
635+
name = "binoclard lenses"
636+
desc = "Shows you know how to sew a lapel and center a back vent."
637+
icon_state = "binoclard_lenses"
638+
inhand_icon_state = "binoclard_lenses"

‎code/modules/clothing/gloves/color.dm‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,12 @@
241241
inhand_icon_state = "wgloves"
242242
custom_price = PAYCHECK_MINIMAL
243243

244+
/obj/item/clothing/gloves/kim
245+
name = "aerostatic gloves"
246+
desc = "Breathable red gloves for expert handling of a pen and notebook."
247+
icon_state = "aerostatic_gloves"
248+
inhand_icon_state = "aerostatic_gloves"
249+
244250
/obj/effect/spawner/lootdrop/gloves
245251
name = "random gloves"
246252
desc = "These gloves are supposed to be a random color..."

‎code/modules/clothing/neck/_neck.dm‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,3 +273,8 @@
273273
/obj/item/clothing/neck/beads/Initialize()
274274
. = ..()
275275
color = color = pick("#ff0077","#d400ff","#2600ff","#00ccff","#00ff2a","#e5ff00","#ffae00","#ff0000", "#ffffff")
276+
277+
/obj/item/clothing/neck/tie/disco
278+
name = "horrific necktie"
279+
icon_state = "eldritch_tie"
280+
desc = "The necktie is adorned with a garish pattern. It's disturbingly vivid. Somehow you feel as if it would be wrong to ever take it off. It's your friend now. You will betray it if you change it for some boring scarf."

‎code/modules/clothing/shoes/boots.dm‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
/obj/item/clothing/shoes/combat //basic syndicate combat boots for nuke ops and mob corpses
2+
name = "combat boots"
3+
desc = "High speed, low drag combat boots."
4+
icon_state = "jackboots"
5+
inhand_icon_state = "jackboots"
6+
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
7+
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
8+
armor = list(MELEE = 25, BULLET = 25, LASER = 25, ENERGY = 25, BOMB = 50, BIO = 10, RAD = 0, FIRE = 70, ACID = 50)
9+
strip_delay = 40
10+
resistance_flags = NONE
11+
permeability_coefficient = 0.05 //Thick soles, and covers the ankle
12+
pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes
13+
lace_time = 12 SECONDS
14+
15+
/obj/item/clothing/shoes/combat/sneakboots
16+
name = "sneakboots"
17+
desc = "These boots have special noise cancelling soles. Perfect for stealth, if it wasn't for the color scheme."
18+
icon_state = "sneakboots"
19+
inhand_icon_state = "sneakboots"
20+
w_class = WEIGHT_CLASS_SMALL
21+
resistance_flags = FIRE_PROOF | ACID_PROOF
22+
clothing_traits = list(TRAIT_SILENT_FOOTSTEPS)
23+
24+
/obj/item/clothing/shoes/combat/swat //overpowered boots for death squads
25+
name = "\improper SWAT boots"
26+
desc = "High speed, no drag combat boots."
27+
permeability_coefficient = 0.01
28+
clothing_flags = NOSLIP
29+
armor = list(MELEE = 40, BULLET = 30, LASER = 25, ENERGY = 25, BOMB = 50, BIO = 30, RAD = 30, FIRE = 90, ACID = 50)
30+
31+
/obj/item/clothing/shoes/jackboots
32+
name = "jackboots"
33+
desc = "Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time."
34+
icon_state = "jackboots"
35+
inhand_icon_state = "jackboots"
36+
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
37+
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
38+
strip_delay = 30
39+
equip_delay_other = 50
40+
resistance_flags = NONE
41+
permeability_coefficient = 0.05 //Thick soles, and covers the ankle
42+
pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes
43+
can_be_tied = FALSE
44+
45+
/obj/item/clothing/shoes/jackboots/fast
46+
slowdown = -1
47+
48+
/obj/item/clothing/shoes/winterboots
49+
name = "winter boots"
50+
desc = "Boots lined with 'synthetic' animal fur."
51+
icon_state = "winterboots"
52+
inhand_icon_state = "winterboots"
53+
permeability_coefficient = 0.15
54+
cold_protection = FEET|LEGS
55+
min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT
56+
heat_protection = FEET|LEGS
57+
max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT
58+
pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes
59+
lace_time = 8 SECONDS
60+
61+
/obj/item/clothing/shoes/winterboots/ice_boots
62+
name = "ice hiking boots"
63+
desc = "A pair of winter boots with special grips on the bottom, designed to prevent slipping on frozen surfaces."
64+
icon_state = "iceboots"
65+
inhand_icon_state = "iceboots"
66+
clothing_flags = NOSLIP_ICE
67+
68+
/obj/item/clothing/shoes/workboots
69+
name = "work boots"
70+
desc = "Nanotrasen-issue Engineering lace-up work boots for the especially blue-collar."
71+
icon_state = "workboots"
72+
inhand_icon_state = "jackboots"
73+
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
74+
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
75+
permeability_coefficient = 0.15
76+
strip_delay = 20
77+
equip_delay_other = 40
78+
pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes
79+
lace_time = 8 SECONDS
80+
species_exception = list(/datum/species/golem/uranium)
81+
82+
/obj/item/clothing/shoes/workboots/mining
83+
name = "mining boots"
84+
desc = "Steel-toed mining boots for mining in hazardous environments. Very good at keeping toes uncrushed."
85+
icon_state = "explorer"
86+
resistance_flags = FIRE_PROOF
87+
88+
/obj/item/clothing/shoes/russian
89+
name = "russian boots"
90+
desc = "Comfy shoes."
91+
icon_state = "rus_shoes"
92+
inhand_icon_state = "rus_shoes"
93+
pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes
94+
lace_time = 8 SECONDS
95+
96+
/obj/item/clothing/shoes/discoshoes
97+
name = "green lizardskin shoes"
98+
desc = "They may have lost some of their lustre over the years, but these green lizardskin shoes fit you perfectly."
99+
icon_state = "lizardskin_shoes"
100+
inhand_icon_state = "lizardskin_shoes"
101+
102+
/obj/item/clothing/shoes/kim
103+
name = "aerostatic boots"
104+
desc = "A crisp, clean set of boots for working long hours on the beat."
105+
icon_state = "aerostatic_boots"
106+
inhand_icon_state = "aerostatic_boots"

‎code/modules/clothing/shoes/miscellaneous.dm‎

Lines changed: 0 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,6 @@
22
name = "mime shoes"
33
greyscale_colors = "#ffffff#ffffff"
44

5-
/obj/item/clothing/shoes/combat //basic syndicate combat boots for nuke ops and mob corpses
6-
name = "combat boots"
7-
desc = "High speed, low drag combat boots."
8-
icon_state = "jackboots"
9-
inhand_icon_state = "jackboots"
10-
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
11-
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
12-
armor = list(MELEE = 25, BULLET = 25, LASER = 25, ENERGY = 25, BOMB = 50, BIO = 10, RAD = 0, FIRE = 70, ACID = 50)
13-
strip_delay = 40
14-
resistance_flags = NONE
15-
permeability_coefficient = 0.05 //Thick soles, and covers the ankle
16-
pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes
17-
lace_time = 12 SECONDS
18-
19-
/obj/item/clothing/shoes/combat/sneakboots
20-
name = "sneakboots"
21-
desc = "These boots have special noise cancelling soles. Perfect for stealth, if it wasn't for the color scheme."
22-
icon_state = "sneakboots"
23-
inhand_icon_state = "sneakboots"
24-
w_class = WEIGHT_CLASS_SMALL
25-
resistance_flags = FIRE_PROOF | ACID_PROOF
26-
clothing_traits = list(TRAIT_SILENT_FOOTSTEPS)
27-
28-
/obj/item/clothing/shoes/combat/swat //overpowered boots for death squads
29-
name = "\improper SWAT boots"
30-
desc = "High speed, no drag combat boots."
31-
permeability_coefficient = 0.01
32-
clothing_flags = NOSLIP
33-
armor = list(MELEE = 40, BULLET = 30, LASER = 25, ENERGY = 25, BOMB = 50, BIO = 30, RAD = 30, FIRE = 90, ACID = 50)
34-
355
/obj/item/clothing/shoes/sandal
366
desc = "A pair of rather plain wooden sandals."
377
name = "sandals"
@@ -139,63 +109,6 @@
139109
desc = "A court jester's shoes, updated with modern squeaking technology."
140110
icon_state = "jester_shoes"
141111

142-
/obj/item/clothing/shoes/jackboots
143-
name = "jackboots"
144-
desc = "Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time."
145-
icon_state = "jackboots"
146-
inhand_icon_state = "jackboots"
147-
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
148-
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
149-
strip_delay = 30
150-
equip_delay_other = 50
151-
resistance_flags = NONE
152-
permeability_coefficient = 0.05 //Thick soles, and covers the ankle
153-
pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes
154-
can_be_tied = FALSE
155-
156-
/obj/item/clothing/shoes/jackboots/fast
157-
slowdown = -1
158-
159-
/obj/item/clothing/shoes/winterboots
160-
name = "winter boots"
161-
desc = "Boots lined with 'synthetic' animal fur."
162-
icon_state = "winterboots"
163-
inhand_icon_state = "winterboots"
164-
permeability_coefficient = 0.15
165-
cold_protection = FEET|LEGS
166-
min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT
167-
heat_protection = FEET|LEGS
168-
max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT
169-
pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes
170-
lace_time = 8 SECONDS
171-
172-
/obj/item/clothing/shoes/winterboots/ice_boots
173-
name = "ice hiking boots"
174-
desc = "A pair of winter boots with special grips on the bottom, designed to prevent slipping on frozen surfaces."
175-
icon_state = "iceboots"
176-
inhand_icon_state = "iceboots"
177-
clothing_flags = NOSLIP_ICE
178-
179-
/obj/item/clothing/shoes/workboots
180-
name = "work boots"
181-
desc = "Nanotrasen-issue Engineering lace-up work boots for the especially blue-collar."
182-
icon_state = "workboots"
183-
inhand_icon_state = "jackboots"
184-
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
185-
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
186-
permeability_coefficient = 0.15
187-
strip_delay = 20
188-
equip_delay_other = 40
189-
pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes
190-
lace_time = 8 SECONDS
191-
species_exception = list(/datum/species/golem/uranium)
192-
193-
/obj/item/clothing/shoes/workboots/mining
194-
name = "mining boots"
195-
desc = "Steel-toed mining boots for mining in hazardous environments. Very good at keeping toes uncrushed."
196-
icon_state = "explorer"
197-
resistance_flags = FIRE_PROOF
198-
199112
/obj/item/clothing/shoes/cult
200113
name = "\improper Nar'Sien invoker boots"
201114
desc = "A pair of boots worn by the followers of Nar'Sie."
@@ -425,14 +338,6 @@
425338
active = FALSE
426339
set_light_on(active)
427340

428-
/obj/item/clothing/shoes/russian
429-
name = "russian boots"
430-
desc = "Comfy shoes."
431-
icon_state = "rus_shoes"
432-
inhand_icon_state = "rus_shoes"
433-
pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes
434-
lace_time = 8 SECONDS
435-
436341
/obj/item/clothing/shoes/cowboy
437342
name = "cowboy boots"
438343
desc = "A small sticker lets you know they've been inspected for snakes, It is unclear how long ago the inspection took place..."

‎code/modules/clothing/suits/jobs.dm‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,3 +208,16 @@
208208
inhand_icon_state = "techpriesthood"
209209
body_parts_covered = HEAD
210210
flags_inv = HIDEHAIR|HIDEEARS
211+
212+
/obj/item/clothing/suit/det_suit/kim
213+
name = "aerostatic bomber jacket"
214+
desc = "A jacket once worn by the revolutionary air brigades during the Antecentennial Revolution. There are quite a few pockets on the inside, mostly for storing notebooks and compasses."
215+
icon_state = "aerostatic_bomber_jacket"
216+
inhand_icon_state = "aerostatic_bomber_jacket"
217+
218+
/obj/item/clothing/suit/det_suit/disco
219+
name = "disco ass blazer"
220+
desc = "Looks like someone skinned this blazer off some long extinct disco-animal. It has an enigmatic white rectangle on the back and the right sleeve."
221+
icon_state = "jamrock_blazer"
222+
inhand_icon_state = "jamrock_blazer"
223+

‎code/modules/clothing/under/jobs/security.dm‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,3 +226,17 @@
226226
icon_state = "spacepolice_families"
227227
inhand_icon_state = "spacepolice_families"
228228
can_adjust = FALSE
229+
230+
/obj/item/clothing/under/rank/security/detective/disco
231+
name = "superstar cop uniform"
232+
desc = "Flare cut trousers and a dirty shirt that might have been classy before someone took a piss in the armpits. It's the dress of a superstar."
233+
icon_state = "jamrock_suit"
234+
inhand_icon_state = "jamrock_suit"
235+
can_adjust = FALSE
236+
237+
/obj/item/clothing/under/rank/security/detective/kim
238+
name = "aerostatic suit"
239+
desc = "A crisp and well-pressed suit; professional, comfortable and curiously authoritative."
240+
icon_state = "aerostatic_suit"
241+
inhand_icon_state = "aerostatic_suit"
242+
can_adjust = FALSE

‎code/modules/vending/wardrobes.dm‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,9 +493,20 @@
493493
/obj/item/clothing/head/fedora = 2,
494494
/obj/item/clothing/gloves/color/black = 2,
495495
/obj/item/clothing/gloves/color/latex = 2,
496+
/obj/item/clothing/under/rank/security/detective/disco = 1,
497+
/obj/item/clothing/suit/det_suit/disco = 1,
498+
/obj/item/clothing/shoes/discoshoes = 1,
499+
/obj/item/clothing/neck/tie/disco = 1,
500+
/obj/item/clothing/under/rank/security/detective/kim = 1,
501+
/obj/item/clothing/suit/det_suit/kim = 1,
502+
/obj/item/clothing/shoes/kim = 1,
503+
/obj/item/clothing/gloves/kim = 1,
504+
/obj/item/clothing/glasses/regular/kim = 1,
505+
/obj/item/clothing/glasses/sunglasses/osi = 1,
496506
/obj/item/reagent_containers/food/drinks/flask/det = 2,
497507
/obj/item/storage/fancy/cigarettes = 5)
498508
premium = list(/obj/item/clothing/head/flatcap = 1)
509+
contraband = list(/obj/item/clothing/glasses/phantom = 1)
499510
refill_canister = /obj/item/vending_refill/wardrobe/det_wardrobe
500511
extra_price = PAYCHECK_COMMAND * 1.75
501512
payment_department = ACCOUNT_SEC

‎icons/mob/clothing/accessories.dmi‎

215 Bytes
Binary file not shown.

‎icons/mob/clothing/back.dmi‎

9.07 KB
Binary file not shown.

0 commit comments

Comments
 (0)