Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
84f331e
first half of marsian fashion
BasilTamaya May 14, 2026
63c3930
icon
BasilTamaya May 15, 2026
b0fb0d4
readded the _t at the end
BasilTamaya May 15, 2026
347857e
icon error
BasilTamaya May 15, 2026
bd21f76
marsian_duster
BasilTamaya May 15, 2026
152f497
generated icon slots
BasilTamaya May 15, 2026
b1c0116
test
BasilTamaya May 15, 2026
9bc5ae4
hood final
BasilTamaya May 15, 2026
cb76b5e
marsian_gown
BasilTamaya May 15, 2026
5733256
marsian shoulder cloak
BasilTamaya May 15, 2026
9503517
overalls + digi
BasilTamaya May 15, 2026
de85ed6
d
BasilTamaya May 15, 2026
ebfd09f
revert to fix sprites haugh
BasilTamaya May 15, 2026
7b94a89
oops let me fix that as well
BasilTamaya May 15, 2026
f78d1cc
random stray white pixel fix
BasilTamaya May 15, 2026
f917a62
move marsian duster to jacket bc it looks like one
BasilTamaya May 15, 2026
146f939
my biggest fumble is always icon states
BasilTamaya May 15, 2026
0a5725b
infogoggles
BasilTamaya May 16, 2026
60835b1
changed the colors so diff icon sprites are gen'd
BasilTamaya May 16, 2026
c96eb3c
Revert "changed the colors so diff icon sprites are gen'd"
BasilTamaya May 16, 2026
b9b7003
putting this one aside as a different project for now
BasilTamaya May 16, 2026
f449fb9
final
BasilTamaya May 17, 2026
93a205a
the stickers
BasilTamaya May 17, 2026
8e57520
stickersssss
BasilTamaya May 17, 2026
7b4e24b
we do not stop the larp
BasilTamaya May 17, 2026
f49e325
Update jacket.dm
BasilTamaya May 17, 2026
a228080
fixes icon states
BasilTamaya May 17, 2026
11c900b
oops we don't want that
BasilTamaya May 17, 2026
257f360
forgot to initialize
BasilTamaya May 17, 2026
ed20cad
readds a reverted change that was suppose to make ts white and not red
BasilTamaya May 19, 2026
4ab23c1
init
BasilTamaya May 19, 2026
4e129f6
maintainer requested changes
BasilTamaya May 19, 2026
37f17b2
maintainer requested changes 2
BasilTamaya May 19, 2026
5b7a77e
used the wrong icon
BasilTamaya May 19, 2026
8c141d7
icon fail 2
BasilTamaya May 19, 2026
f4937a8
Update modular_doppler/modular_items/code/stickers.dm
BasilTamaya Jun 7, 2026
ddece8c
code review
BasilTamaya Jun 7, 2026
066fa5e
specify red mars
BasilTamaya Jun 8, 2026
4e830cb
Update stickers.dm
BasilTamaya Jun 8, 2026
3eb9f65
shoulder cloak
BasilTamaya Jun 8, 2026
ea649d0
icon state resolvement + rename + description fixes + description to …
BasilTamaya Jun 8, 2026
90cef23
didn't update the names like i was told, resolved now.
BasilTamaya Jun 8, 2026
6afe8d3
removed stickers from vendors, adds as a recipe, requiring a pen
BasilTamaya Jun 8, 2026
6767e57
i'm fucking canadian
BasilTamaya Jun 8, 2026
40d05b0
see description for explanation on the crafting recipe
BasilTamaya Jun 8, 2026
35827fc
icons missing???
BasilTamaya Jun 9, 2026
ad2c5a2
ho y godddddddddd lemme try this and then ill re-locate the crafting …
BasilTamaya Jun 9, 2026
c4b06bf
so now i have it, right?
BasilTamaya Jun 9, 2026
fe1cc34
stickers are done
BasilTamaya Jun 9, 2026
107876e
iconstates
BasilTamaya Jun 9, 2026
b5d8129
naming lol
BasilTamaya Jun 9, 2026
bb0e2e0
loadout
BasilTamaya Jun 9, 2026
f3b6cd8
removes it because i forgot i added it twice
BasilTamaya Jun 9, 2026
7aeb157
renames the gags
BasilTamaya Jun 9, 2026
9158788
naming conventions fixed
BasilTamaya Jun 9, 2026
6358160
all i had to do was build and i forgot
BasilTamaya Jun 9, 2026
a7b089f
please
BasilTamaya Jun 9, 2026
cbceee1
Update _head.dmi
BasilTamaya Jun 9, 2026
473b2b6
please
BasilTamaya Jun 9, 2026
0ae052c
spelling error detected
BasilTamaya Jun 9, 2026
8946d6c
oh my god
BasilTamaya Jun 9, 2026
463fe68
Revert "oh my god"
BasilTamaya Jun 9, 2026
651c1ec
Revert "spelling error detected"
BasilTamaya Jun 9, 2026
42218d8
Revert "please"
BasilTamaya Jun 9, 2026
4d76e30
Revert "Update _head.dmi"
BasilTamaya Jun 9, 2026
76b11f3
Revert "please"
BasilTamaya Jun 9, 2026
d000481
Revert "all i had to do was build and i forgot"
BasilTamaya Jun 9, 2026
97fa354
Revert "naming conventions fixed"
BasilTamaya Jun 9, 2026
d5a97bb
Revert "Merge branch 'master' into marsian-fashion-sequel"
BasilTamaya Jun 9, 2026
25a6eac
Revert "renames the gags"
BasilTamaya Jun 9, 2026
155b072
Revert "removes it because i forgot i added it twice"
BasilTamaya Jun 9, 2026
2edc4a7
Revert "loadout"
BasilTamaya Jun 9, 2026
f636ecf
Revert "naming lol"
BasilTamaya Jun 9, 2026
7a1d35e
Revert "iconstates"
BasilTamaya Jun 9, 2026
5453adf
let's start from the beginning because i might as well
BasilTamaya Jun 9, 2026
0e902c2
if i do this one step at a time maybe it will make sense
BasilTamaya Jun 9, 2026
584972c
first pass
BasilTamaya Jun 9, 2026
bb85552
start over tomorrow or something
BasilTamaya Jun 9, 2026
36f3c95
Revert "start over tomorrow or something"
BasilTamaya Jun 9, 2026
4ca4253
Revert "first pass"
BasilTamaya Jun 9, 2026
f8635aa
lets do this. again
BasilTamaya Jun 9, 2026
927a113
step by step
BasilTamaya Jun 9, 2026
854f3da
the ending to the boys except i'm homelander and vscode is billy butcher
BasilTamaya Jun 9, 2026
6167244
okay it works except hte icons but i think i need to merge it first
BasilTamaya Jun 9, 2026
e22199f
there's no pot of gold down there
BasilTamaya Jun 9, 2026
2b1a66d
so now you have it, right?
BasilTamaya Jun 9, 2026
99e4771
finally
BasilTamaya Jun 9, 2026
4e9eefc
all the requested changes save for one that i'm contesting.
BasilTamaya Jun 9, 2026
8dafdef
rewrites the description to say "form-fitting gown" instead of a dress
BasilTamaya Jun 9, 2026
d6ed485
remove reference, rewrote
BasilTamaya Jun 10, 2026
971c599
better
BasilTamaya Jun 10, 2026
179f05a
better actually
BasilTamaya Jun 10, 2026
4424004
punctuation
BasilTamaya Jun 10, 2026
648c053
this one for real
BasilTamaya Jun 10, 2026
96302f2
punctuation
BasilTamaya Jun 10, 2026
e9f9cf0
tweaks/changes/removal of cargo pack
dawsonkeyes Jun 11, 2026
92cdc96
pubby fix
dawsonkeyes Jun 11, 2026
c372462
better item names + box desc
dawsonkeyes Jun 11, 2026
35b9e3b
config
dawsonkeyes Jun 11, 2026
9a67e58
categories
dawsonkeyes Jun 11, 2026
dfa749f
webedit city
dawsonkeyes Jun 11, 2026
c60d712
map icons
dawsonkeyes Jun 11, 2026
f0a20fd
typo
dawsonkeyes Jun 11, 2026
4ffdbce
icon parity
dawsonkeyes Jun 29, 2026
fb4b921
map icons
dawsonkeyes Jun 29, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified icons/map_icons/clothing/head/_head.dmi
Binary file not shown.
Binary file modified icons/map_icons/clothing/neck.dmi
Binary file not shown.
Binary file modified icons/map_icons/clothing/suit/_suit.dmi
Binary file not shown.
4 changes: 4 additions & 0 deletions modular_doppler/loadout_categories/categories/neck.dm
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@
name = "Mantle (Teshari)"
item_path = /obj/item/clothing/neck/tesharian_mantle

/datum/loadout_item/neck/cape/shoulder_cloak_redmars
name = "Shoulder Cloak (Red Mars)"
item_path = /obj/item/clothing/neck/cloak/shoulder_cloak_redmars

/**
* SCARVES
*/
Expand Down
13 changes: 12 additions & 1 deletion modular_doppler/loadout_categories/categories/suit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,10 @@
name = "Peacekeeper Jacket (Security, Badged)"
item_path = /obj/item/clothing/suit/jacket/doppler/peacekeeper_jacket/badged

/datum/loadout_item/suit/jacket/redmars_duster
name = "Duster (Red Mars)"
item_path = /obj/item/clothing/suit/hooded/doppler/redmars_duster

/**
* HOODIES
*/
Expand Down Expand Up @@ -369,7 +373,6 @@
name = "TechNyne Overlay"
item_path = /obj/item/clothing/suit/hooded/doppler/technyne_overlay


/**
* LABCOATS
*/
Expand Down Expand Up @@ -533,3 +536,11 @@
/datum/loadout_item/suit/misc/techpriest
name = "Machine Dustcover"
item_path = /obj/item/clothing/suit/hooded/techpriest

/datum/loadout_item/suit/misc/redmars_gown
name = "Dustwalker Gown (Red Mars)"
item_path = /obj/item/clothing/suit/hooded/doppler/redmars_gown

/datum/loadout_item/suit/misc/redmars_overalls
name = "Thermally-Insulated Work Overalls (Red Mars)"
item_path = /obj/item/clothing/suit/hooded/doppler/redmars_overalls
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,17 @@
name = "Tesharian Mantle (Worn, Teshari)"
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/neck/tesharian_mantle_worn_teshari.json'

/datum/greyscale_config/shoulder_cloak_redmars
name = "Shoulder Cloak (Red Mars)"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/neck.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/neck/shoulder_cloak_redmars.json'

/datum/greyscale_config/shoulder_cloak_redmars/worn
name = "Shoulder Cloak (Worn, Red Mars)"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/neck.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/neck/shoulder_cloak_redmars_worn.json'


///////////
//SCARVES//
///////////
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,3 +196,59 @@
name = "Fancy Suit (Worn, Teshari)"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/suit.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/fancy_labcoat_tesh_worn.json'

// Marsian Fashion

/datum/greyscale_config/redmars_duster
name = "Duster (Red Mars)"
icon_file = 'modular_doppler/modular_cosmetics/icons/obj/suit/jacket.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/redmars_duster.json'

/datum/greyscale_config/redmars_duster/worn
name = "Duster (Worn, Red Mars)"
icon_file = 'modular_doppler/modular_cosmetics/icons/mob/suit/jacket.dmi'

/datum/greyscale_config/redmars_duster_hood/
name = "Duster Hood (Red Mars)"
icon_file = 'modular_doppler/modular_cosmetics/icons/obj/head/hoods.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/redmars_duster_hood.json'

/datum/greyscale_config/redmars_duster_hood/worn
name = "Duster Hood (Worn, Red Mars)"
icon_file = 'modular_doppler/modular_cosmetics/icons/mob/head/hoods.dmi'

/datum/greyscale_config/redmars_gown
name = "Dustwalker Gown (Red Mars)"
icon_file = 'modular_doppler/modular_cosmetics/icons/obj/suit/jacket.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/redmars_gown.json'

/datum/greyscale_config/redmars_gown/worn
name = "Dustwalker Gown (Worn, Red Mars)"
icon_file = 'modular_doppler/modular_cosmetics/icons/mob/suit/jacket.dmi'

/datum/greyscale_config/redmars_gown_hood
name = "Dustwalker Gown Hood (Red Mars)"
icon_file = 'modular_doppler/modular_cosmetics/icons/obj/head/hoods.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/redmars_gown_hood.json'

/datum/greyscale_config/redmars_gown_hood/worn
name = "Dustwalker Gown Hood (Worn, Red Mars)"
icon_file = 'modular_doppler/modular_cosmetics/icons/mob/head/hoods.dmi'

/datum/greyscale_config/redmars_overalls
name = "Thermally-Insulated Work Overalls (Red Mars)"
icon_file = 'modular_doppler/modular_cosmetics/icons/obj/suit/jacket.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/redmars_overalls.json'

/datum/greyscale_config/redmars_overalls/worn
name = "Thermally-Insulated Work Overalls (Worn, Red Mars)"
icon_file = 'modular_doppler/modular_cosmetics/icons/mob/suit/jacket.dmi'

/datum/greyscale_config/redmars_overalls_helmet
name = "Thermally-Insulated Work Overalls Helmet (Red Mars)"
icon_file = 'modular_doppler/modular_cosmetics/icons/obj/head/hoods.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/redmars_overalls_helmet.json'

/datum/greyscale_config/redmars_overalls_helmet/worn
name = "Thermally-Insulated Work Overalls (Worn, Red Mars)"
icon_file = 'modular_doppler/modular_cosmetics/icons/mob/head/hoods.dmi'
Binary file modified modular_doppler/modular_cosmetics/GAGS/icons/mob/neck.dmi
Binary file not shown.
Binary file modified modular_doppler/modular_cosmetics/GAGS/icons/obj/neck.dmi
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"shoulder_cloak_redmars": [
{
"type": "icon_state",
"icon_state": "shoulder_cloak_redmars",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "shoulder_cloak_trim_redmars",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "shoulder_cloak_fur_redmars",
"blend_mode": "overlay"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"shoulder_cloak_redmars": [
{
"type": "icon_state",
"icon_state": "shoulder_cloak_redmars",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "shoulder_cloak_trim_redmars",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "shoulder_cloak_fur_redmars",
"blend_mode": "overlay"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"redmars_duster": [
{
"type": "icon_state",
"icon_state": "redmars_duster_underlay",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "redmars_duster",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "redmars_duster_trim",
"blend_mode": "overlay",
"color_ids": [2]
}
],
"redmars_duster_t": [
{
"type": "icon_state",
"icon_state": "redmars_duster_underlay_t",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "redmars_duster_t",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "redmars_duster_trim_t",
"blend_mode": "overlay",
"color_ids": [2]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"redmars_duster_hood": [
{
"type": "icon_state",
"icon_state": "redmars_duster_hood_underlay",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "redmars_duster_hood",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "redmars_duster_hood_trim",
"blend_mode": "overlay",
"color_ids": [2]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"redmars_gown": [
{
"type": "icon_state",
"icon_state": "redmars_gown",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "redmars_gown_trim",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "redmars_gown_underlay",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "redmars_gown_tech",
"blend_mode": "overlay",
"color_ids": [3]
}
],
"redmars_gown_t": [
{
"type": "icon_state",
"icon_state": "redmars_gown_t",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "redmars_gown_trim_t",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "redmars_gown_underlay_t",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "redmars_gown_tech_t",
"blend_mode": "overlay",
"color_ids": [3]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"redmars_gown_hood": [
{
"type": "icon_state",
"icon_state": "redmars_gown_hood_underlay",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "redmars_gown_hood",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "redmars_gown_hood_trim",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "redmars_gown_hood_tech",
"blend_mode": "overlay",
"color_ids": [3]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"redmars_overalls":[
{
"type": "icon_state",
"icon_state": "redmars_overalls",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "redmars_overalls_trim",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "redmars_overalls_tech",
"blend_mode": "overlay",
"color_ids": [2]
}
],
"redmars_overalls_t":[
{
"type": "icon_state",
"icon_state": "redmars_overalls_t",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "redmars_overalls_trim_t",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "redmars_overalls_tech_t",
"blend_mode": "overlay",
"color_ids": [2]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"redmars_overalls_helmet":[
{
"type": "icon_state",
"icon_state": "redmars_overalls_helmet",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "redmars_overalls_helmet_trim",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "redmars_overalls_helmet_tech",
"blend_mode": "overlay",
"color_ids": [2]
}
]
}
16 changes: 16 additions & 0 deletions modular_doppler/modular_cosmetics/code/neck/neck.dm
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,21 @@
greyscale_colors = "#ffcc00#ffffff"
flags_1 = IS_PLAYER_COLORABLE_1

//Marsian Fashion
/obj/item/clothing/neck/cloak/shoulder_cloak_redmars
name = "red marsian shoulder cloak"
desc = "Normally thrown atop something else, this thick, fur-collared mantle cinches in the front\
and provides a strictly aesthetic quality, most often burnished in colors resembling the wearer's\
typical environments of Red Mars."
icon = 'icons/map_icons/clothing/neck.dmi'
icon_state = "/obj/item/clothing/neck/cloak/shoulder_cloak_redmars"
post_init_icon_state = "shoulder_cloak_redmars"
greyscale_config = /datum/greyscale_config/shoulder_cloak_redmars
greyscale_config_worn = /datum/greyscale_config/shoulder_cloak_redmars/worn
greyscale_colors = "#ffffff#ffffff"
flags_1 = IS_PLAYER_COLORABLE_1


///////////
//SCARVES//
///////////
Expand Down Expand Up @@ -160,3 +175,4 @@
greyscale_config = /datum/greyscale_config/mantle
greyscale_config_worn = /datum/greyscale_config/mantle/worn
flags_1 = IS_PLAYER_COLORABLE_1

Loading
Loading