Skip to content

[DRIP] Adds Four New Red Marsian Outfits, and a new Mars Sticker Variant #1065

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BasilTamaya wants to merge 40 commits into
base: master
Choose a base branch
from
Open

[DRIP] Adds Four New Red Marsian Outfits, and a new Mars Sticker Variant #1065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
64886e2
first half of marsian fashion
BasilTamaya May 14, 2026
42994ea
icon
BasilTamaya May 15, 2026
40dc6d2
readded the _t at the end
BasilTamaya May 15, 2026
c78dedc
icon error
BasilTamaya May 15, 2026
7b20d0c
marsian_duster
BasilTamaya May 15, 2026
7a0c6f2
generated icon slots
BasilTamaya May 15, 2026
6272e96
test
BasilTamaya May 15, 2026
5cf47e7
hood final
BasilTamaya May 15, 2026
04f4fa6
marsian_gown
BasilTamaya May 15, 2026
59b0dc9
marsian shoulder cloak
BasilTamaya May 15, 2026
84c51d3
overalls + digi
BasilTamaya May 15, 2026
44775d7
d
BasilTamaya May 15, 2026
033bde2
revert to fix sprites haugh
BasilTamaya May 15, 2026
d9db739
oops let me fix that as well
BasilTamaya May 15, 2026
1b91cf1
random stray white pixel fix
BasilTamaya May 15, 2026
2a6e820
move marsian duster to jacket bc it looks like one
BasilTamaya May 15, 2026
28ac4e9
my biggest fumble is always icon states
BasilTamaya May 15, 2026
6ea06d2
infogoggles
BasilTamaya May 16, 2026
1f064d1
changed the colors so diff icon sprites are gen'd
BasilTamaya May 16, 2026
35af470
Revert "changed the colors so diff icon sprites are gen'd"
BasilTamaya May 16, 2026
b954f31
putting this one aside as a different project for now
BasilTamaya May 16, 2026
b521ee7
final
BasilTamaya May 17, 2026
63f23ff
the stickers
BasilTamaya May 17, 2026
009beb1
stickersssss
BasilTamaya May 17, 2026
56ab74a
we do not stop the larp
BasilTamaya May 17, 2026
f2a6aee
Update jacket.dm
BasilTamaya May 17, 2026
57e4e4c
Merge branch 'master' into marsian-fashion-sequel
BasilTamaya May 17, 2026
9171d39
fixes icon states
BasilTamaya May 17, 2026
1ab031f
oops we don't want that
BasilTamaya May 17, 2026
e4dba17
forgot to initialize
BasilTamaya May 17, 2026
2ea8510
readds a reverted change that was suppose to make ts white and not red
BasilTamaya May 19, 2026
1d17a85
init
BasilTamaya May 19, 2026
42a8085
Merge branch 'master' into marsian-fashion-sequel
BasilTamaya May 19, 2026
76ebeed
Merge branch 'master' into marsian-fashion-sequel
BasilTamaya May 19, 2026
cdc5c19
maintainer requested changes
BasilTamaya May 19, 2026
0ffc062
maintainer requested changes 2
BasilTamaya May 19, 2026
b4ced28
used the wrong icon
BasilTamaya May 19, 2026
fdb9429
icon fail 2
BasilTamaya May 19, 2026
af43587
Merge branch 'master' into marsian-fashion-sequel
BasilTamaya May 29, 2026
1dc6e96
Merge branch 'master' into marsian-fashion-sequel
BasilTamaya May 30, 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
1 change: 0 additions & 1 deletion code/game/objects/items/stickers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,4 +228,3 @@

/obj/item/sticker/purity_seal/purity_seal_2
icon_state = "purity_seal_2"

Binary file modified icons/map_icons/clothing/head/_head.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/map_icons/clothing/neck.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/map_icons/clothing/suit/_suit.dmi
View file
Open in desktop
Binary file not shown.
4 changes: 4 additions & 0 deletions modular_doppler/loadout_categories/categories/neck.dm
View file
Open in desktop
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/marsian_shoulder_cloak
name = "Marsian Shoulder Cloak"
item_path = /obj/item/clothing/neck/marsian_shoulder_cloak

/**
* SCARVES
*/
Expand Down
13 changes: 12 additions & 1 deletion modular_doppler/loadout_categories/categories/suit.dm
View file
Open in desktop
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/marsian_duster
name = "Marsian Duster"
item_path = /obj/item/clothing/suit/hooded/doppler/marsian_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/marsian_gown
name = "Marsian Gown"
item_path = /obj/item/clothing/suit/hooded/doppler/marsian_gown

/datum/loadout_item/suit/misc/marsian_overalls
name = "Marsian Overalls"
item_path = /obj/item/clothing/suit/hooded/doppler/marsian_overalls
11 changes: 11 additions & 0 deletions modular_doppler/modular_cosmetics/GAGS/greyscale_configs_neck.dm
View file
Open in desktop
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/marsian_shoulder_cloak
name = "Marsian Shoulder Cloak"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/neck.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/neck/marsian_shoulder_cloak.json'

/datum/greyscale_config/marsian_shoulder_cloak/worn
name = "Marsian Shoulder Cloak (Worn)"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/neck.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/neck/marsian_shoulder_cloak_worn.json'


///////////
//SCARVES//
///////////
Expand Down
56 changes: 56 additions & 0 deletions modular_doppler/modular_cosmetics/GAGS/greyscale_configs_suit.dm
View file
Open in desktop
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/marsian_duster
name = "Marsian Duster"
icon_file = 'modular_doppler/modular_cosmetics/icons/obj/suit/jacket.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_duster.json'

/datum/greyscale_config/marsian_duster/worn
name = "Marsian Duster (Worn)"
icon_file = 'modular_doppler/modular_cosmetics/icons/mob/suit/jacket.dmi'

/datum/greyscale_config/marsian_duster_hood/
name = "Marsian Duster Hood"
icon_file = 'modular_doppler/modular_cosmetics/icons/obj/head/hoods.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_duster_hood.json'

/datum/greyscale_config/marsian_duster_hood/worn
name = "Marsian Duster Hood (Worn)"
icon_file = 'modular_doppler/modular_cosmetics/icons/mob/head/hoods.dmi'

/datum/greyscale_config/marsian_gown
name = "Marsian Gown"
icon_file = 'modular_doppler/modular_cosmetics/icons/obj/suit/jacket.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_gown.json'

/datum/greyscale_config/marsian_gown/worn
name = "Marsian Gown (Worn)"
icon_file = 'modular_doppler/modular_cosmetics/icons/mob/suit/jacket.dmi'

/datum/greyscale_config/marsian_gown_hood
name = "Marsian Gown Hood"
icon_file = 'modular_doppler/modular_cosmetics/icons/obj/head/hoods.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_gown_hood.json'

/datum/greyscale_config/marsian_gown_hood/worn
name = "Marsian Gown Hood (Worn)"
icon_file = 'modular_doppler/modular_cosmetics/icons/mob/head/hoods.dmi'

/datum/greyscale_config/marsian_overalls
name = "Marsian Overalls"
icon_file = 'modular_doppler/modular_cosmetics/icons/obj/suit/jacket.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_overalls.json'

/datum/greyscale_config/marsian_overalls/worn
name = "Marsian Overalls (Worn)"
icon_file = 'modular_doppler/modular_cosmetics/icons/mob/suit/jacket.dmi'

/datum/greyscale_config/marsian_overalls_helmet
name = "Marsian Overalls Helmet"
icon_file = 'modular_doppler/modular_cosmetics/icons/obj/head/hoods.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_overalls_helmet.json'

/datum/greyscale_config/marsian_overalls_helmet/worn
name = "Marsian Overalls (Worn)"
icon_file = 'modular_doppler/modular_cosmetics/icons/mob/head/hoods.dmi'
Binary file modified modular_doppler/modular_cosmetics/GAGS/icons/mob/neck.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified modular_doppler/modular_cosmetics/GAGS/icons/obj/neck.dmi
View file
Open in desktop
Binary file not shown.
21 changes: 21 additions & 0 deletions modular_doppler/modular_cosmetics/GAGS/json_configs/neck/marsian_shoulder_cloak.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"marsian_shoulder_cloak": [
{
"type": "icon_state",
"icon_state": "marsian_shoulder_cloak",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "marsian_shoulder_cloak_trim",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "marsian_shoulder_cloak_fur",
"blend_mode": "overlay"
}
]
}
21 changes: 21 additions & 0 deletions modular_doppler/modular_cosmetics/GAGS/json_configs/neck/marsian_shoulder_cloak_worn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"marsian_shoulder_cloak": [
{
"type": "icon_state",
"icon_state": "marsian_shoulder_cloak",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "marsian_shoulder_cloak_trim",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "marsian_shoulder_cloak_fur",
"blend_mode": "overlay"
}
]
}
40 changes: 40 additions & 0 deletions modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_duster.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"marsian_duster": [
{
"type": "icon_state",
"icon_state": "marsian_duster_underlay",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "marsian_duster",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "marsian_duster_trim",
"blend_mode": "overlay",
"color_ids": [2]
}
],
"marsian_duster_t": [
{
"type": "icon_state",
"icon_state": "marsian_duster_underlay_t",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "marsian_duster_t",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "marsian_duster_trim_t",
"blend_mode": "overlay",
"color_ids": [2]
}
]
}
21 changes: 21 additions & 0 deletions modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_duster_hood.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"marsian_duster_hood": [
{
"type": "icon_state",
"icon_state": "marsian_duster_hood_underlay",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "marsian_duster_hood",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "marsian_duster_hood_trim",
"blend_mode": "overlay",
"color_ids": [2]
}
]
}
52 changes: 52 additions & 0 deletions modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_gown.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"marsian_gown":[
{
"type": "icon_state",
"icon_state": "marsian_gown",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "marsian_gown_trim",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "marsian_gown_underlay",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "marsian_gown_tech",
"blend_mode": "overlay",
"color_ids": [3]
}
],
"marsian_gown_t":[
{
"type": "icon_state",
"icon_state": "marsian_gown_t",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "marsian_gown_trim_t",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "marsian_gown_underlay_t",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "marsian_gown_tech_t",
"blend_mode": "overlay",
"color_ids": [3]
}
]
}
27 changes: 27 additions & 0 deletions modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_gown_hood.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"marsian_gown_hood": [
{
"type": "icon_state",
"icon_state": "marsian_gown_hood_underlay",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "marsian_gown_hood",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "marsian_gown_hood_trim",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "marsian_gown_hood_tech",
"blend_mode": "overlay",
"color_ids": [3]
}
]
}
40 changes: 40 additions & 0 deletions modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_overalls.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"marsian_overalls":[
{
"type": "icon_state",
"icon_state": "marsian_overalls",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "marsian_overalls_trim",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "marsian_overalls_tech",
"blend_mode": "overlay",
"color_ids": [2]
}
],
"marsian_overalls_t":[
{
"type": "icon_state",
"icon_state": "marsian_overalls_t",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "marsian_overalls_trim_t",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "marsian_overalls_tech_t",
"blend_mode": "overlay",
"color_ids": [2]
}
]
}
21 changes: 21 additions & 0 deletions modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_overalls_helmet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"marsian_overalls_helmet":[
{
"type": "icon_state",
"icon_state": "marsian_overalls_helmet",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "marsian_overalls_helmet_trim",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "marsian_overalls_helmet_tech",
"blend_mode": "overlay",
"color_ids": [2]
}
]
}
Loading
Loading