Skip to content

Commit

Permalink
Assistant Gaming
Browse files Browse the repository at this point in the history
  • Loading branch information
CliffracerX committed Aug 30, 2024
1 parent 0e89cc7 commit 492be35
Show file tree
Hide file tree
Showing 15 changed files with 619 additions and 8 deletions.
4 changes: 2 additions & 2 deletions code/modules/surgery/organs/organ_movement.dm
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@
bodypart_owner = bodypart

/// DOPPLER SHIFT ADDITION - recalculate these things now, this is a fix until TG unbuggers it all up
if(external_bodytypes)
if(external_bodytypes && istype(limb_owner))
limb_owner.synchronize_bodytypes()
if(external_bodyshapes)
if(external_bodyshapes && istype(limb_owner))
limb_owner.synchronize_bodyshapes()
/// DOPPLER SHIFT ADDITION END

Expand Down
96 changes: 96 additions & 0 deletions modular_doppler/modular_cosmetics/GAGS/greyscale_configs_under.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
/*
/>  フ meow! this dm file contains greyscale configs for any clothes we add. please name
|  _ _| / them in obvious, easy to search ways that are consistent with your item paths <3
/` ミ_xノ
/     |
/  ヽ   ノ
│  | | |
/ ̄|   | | |
( ̄ヽ__ヽ_)__)
\二)
*/


/////////////////////
//STANDARD UNIFORMS//
/////////////////////

// Standard version
/datum/greyscale_config/doppler_undersuit
name = "Doppler Suit"
icon_file = 'modular_doppler/modular_cosmetics/icons/obj/under/doppler_uniforms.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/doppler_uniform_standard.json'

/datum/greyscale_config/doppler_undersuit/worn
name = "Worn Doppler Suit"
icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/doppler_uniforms.dmi'

/datum/greyscale_config/doppler_undersuit/worn/digi
name = "Worn Digitigrade Doppler Suit"
icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/doppler_uniforms_digi.dmi'

// Cozy version
/datum/greyscale_config/doppler_undersuit/cozy
name = "Doppler Cozy Suit"
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/doppler_uniform_cozy.json'

/datum/greyscale_config/doppler_undersuit/cozy/worn
name = "Worn Doppler Cozy Suit"
icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/doppler_uniforms.dmi'

/datum/greyscale_config/doppler_undersuit/cozy/worn/digi
name = "Worn Digitigrade Doppler Cozy Suit"
icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/doppler_uniforms_digi.dmi'

// Fancy version
/datum/greyscale_config/doppler_undersuit/fancysuit
name = "Doppler Fancy Suit"
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/doppler_uniform_suit.json'

/datum/greyscale_config/doppler_undersuit/fancysuit/worn
name = "Worn Doppler Fancy Suit"
icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/doppler_uniforms.dmi'

/datum/greyscale_config/doppler_undersuit/fancysuit/worn/digi
name = "Worn Digitigrade Doppler Fancy Suit"
icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/doppler_uniforms_digi.dmi'

/// VERSIONS W/ OVERALLS
// Standard w/ Overalls
/datum/greyscale_config/doppler_undersuit/overalls
name = "Doppler Suit w/ Overalls"
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/doppler_uniform_standard_overalls.json'

/datum/greyscale_config/doppler_undersuit/overalls/worn
name = "Worn Doppler Suit w/ Overalls"
icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/doppler_uniforms.dmi'

/datum/greyscale_config/doppler_undersuit/overalls/worn/digi
name = "Worn Digitigrade Doppler Suit w/ Overalls"
icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/doppler_uniforms_digi.dmi'

// Cozy w/ Overalls
/datum/greyscale_config/doppler_undersuit/cozy/overalls
name = "Doppler Cozy Suit w/ Overalls"
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/doppler_uniform_cozy_overalls.json'

/datum/greyscale_config/doppler_undersuit/cozy/overalls/worn
name = "Worn Doppler Cozy Suit w/ Overalls"
icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/doppler_uniforms.dmi'

/datum/greyscale_config/doppler_undersuit/cozy/overalls/worn/digi
name = "Worn Digitigrade Doppler Cozy Suit w/ Overalls"
icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/doppler_uniforms_digi.dmi'

// Fancy w/ Overalls
/datum/greyscale_config/doppler_undersuit/fancysuit/overalls
name = "Doppler Fancy Suit w/ Overalls"
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/doppler_uniform_suit_overalls.json'

/datum/greyscale_config/doppler_undersuit/fancysuit/overalls/worn
name = "Worn Doppler Fancy Suit w/ Overalls"
icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/doppler_uniforms.dmi'

/datum/greyscale_config/doppler_undersuit/fancysuit/overalls/worn/digi
name = "Worn Digitigrade Doppler Fancy Suit w/ Overalls"
icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/doppler_uniforms_digi.dmi'
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"doppler_cozy": [
{
"type": "icon_state",
"icon_state": "gags_pants",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "gags_cozy",
"blend_mode": "overlay",
"color_ids": [ 2 ]
}
],
"doppler_cozy_d": [
{
"type": "icon_state",
"icon_state": "gags_pants_d",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "gags_cozy_d",
"blend_mode": "overlay",
"color_ids": [ 2 ]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"doppler_cozy_overalls": [
{
"type": "icon_state",
"icon_state": "gags_pants",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "gags_cozy",
"blend_mode": "overlay",
"color_ids": [ 2 ]
},
{
"type": "icon_state",
"icon_state": "gags_overalls",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"doppler_cozy_overalls_d": [
{
"type": "icon_state",
"icon_state": "gags_pants_d",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "gags_cozy_d",
"blend_mode": "overlay",
"color_ids": [ 2 ]
},
{
"type": "icon_state",
"icon_state": "gags_overalls_d",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"doppler_uniform": [
{
"type": "icon_state",
"icon_state": "gags_pants",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "gags_top",
"blend_mode": "overlay",
"color_ids": [ 2 ]
}
],
"doppler_uniform_d": [
{
"type": "icon_state",
"icon_state": "gags_pants_d",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "gags_top_d",
"blend_mode": "overlay",
"color_ids": [ 2 ]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"doppler_uniform_overalls": [
{
"type": "icon_state",
"icon_state": "gags_pants",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "gags_top",
"blend_mode": "overlay",
"color_ids": [ 2 ]
},
{
"type": "icon_state",
"icon_state": "gags_overalls",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"doppler_uniform_overalls_d": [
{
"type": "icon_state",
"icon_state": "gags_pants_d",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "gags_top_d",
"blend_mode": "overlay",
"color_ids": [ 2 ]
},
{
"type": "icon_state",
"icon_state": "gags_overalls_d",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"doppler_suit": [
{
"type": "icon_state",
"icon_state": "gags_pants",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "gags_suit",
"blend_mode": "overlay",
"color_ids": [ 2 ]
},
{
"type": "icon_state",
"icon_state": "gags_suit_tie",
"blend_mode": "overlay",
"color_ids": [ 3 ]
},
{
"type": "icon_state",
"icon_state": "gags_suit_trim",
"blend_mode": "overlay",
"color_ids": [ 4 ]
}
],
"doppler_suit_d": [
{
"type": "icon_state",
"icon_state": "gags_pants_d",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "gags_suit_d",
"blend_mode": "overlay",
"color_ids": [ 2 ]
},
{
"type": "icon_state",
"icon_state": "gags_suit_tie_d",
"blend_mode": "overlay",
"color_ids": [ 3 ]
},
{
"type": "icon_state",
"icon_state": "gags_suit_trim_d",
"blend_mode": "overlay",
"color_ids": [ 4 ]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{
"doppler_suit_overalls": [
{
"type": "icon_state",
"icon_state": "gags_pants",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "gags_suit",
"blend_mode": "overlay",
"color_ids": [ 2 ]
},
{
"type": "icon_state",
"icon_state": "gags_suit_tie",
"blend_mode": "overlay",
"color_ids": [ 3 ]
},
{
"type": "icon_state",
"icon_state": "gags_suit_trim",
"blend_mode": "overlay",
"color_ids": [ 4 ]
},
{
"type": "icon_state",
"icon_state": "gags_overalls",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"doppler_suit_overalls_d": [
{
"type": "icon_state",
"icon_state": "gags_pants_d",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "gags_suit_d",
"blend_mode": "overlay",
"color_ids": [ 2 ]
},
{
"type": "icon_state",
"icon_state": "gags_suit_tie_d",
"blend_mode": "overlay",
"color_ids": [ 3 ]
},
{
"type": "icon_state",
"icon_state": "gags_suit_trim_d",
"blend_mode": "overlay",
"color_ids": [ 4 ]
},
{
"type": "icon_state",
"icon_state": "gags_overalls",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
5 changes: 0 additions & 5 deletions modular_doppler/modular_cosmetics/code/suits/basesuits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,3 @@
supported_bodyshapes = list(BODYSHAPE_HUMANOID, BODYSHAPE_DIGITIGRADE)
bodyshape_icon_files = list(BODYSHAPE_HUMANOID_T = 'icons/mob/clothing/suits/utility.dmi',
BODYSHAPE_DIGITIGRADE_T = 'modular_doppler/modular_cosmetics/icons/mob/suit/suit_digi.dmi')

/obj/item/clothing/suit
supported_bodyshapes = list(BODYSHAPE_HUMANOID, BODYSHAPE_DIGITIGRADE)
bodyshape_icon_files = list(BODYSHAPE_HUMANOID_T = 'icons/mob/clothing/suits/default.dmi',
BODYSHAPE_DIGITIGRADE_T = 'modular_doppler/modular_cosmetics/icons/mob/suit/suit_digi.dmi')
Loading

0 comments on commit 492be35

Please sign in to comment.