diff --git a/modular_splurt/code/modules/client/loadout/donator/__donator.dm b/modular_splurt/code/modules/client/loadout/donator/__donator.dm new file mode 100644 index 0000000000..b1741af381 --- /dev/null +++ b/modular_splurt/code/modules/client/loadout/donator/__donator.dm @@ -0,0 +1,8 @@ +/datum/gear/donator/suit + slot = ITEM_SLOT_OCLOTHING + +/datum/gear/donator/head + slot = ITEM_SLOT_HEAD + +/datum/gear/donator/uniform + slot = ITEM_SLOT_ICLOTHING diff --git a/modular_splurt/code/modules/client/loadout/donator/first_tier.dm b/modular_splurt/code/modules/client/loadout/donator/first_tier.dm index 3cc746bcdd..6e030717e5 100644 --- a/modular_splurt/code/modules/client/loadout/donator/first_tier.dm +++ b/modular_splurt/code/modules/client/loadout/donator/first_tier.dm @@ -6,9 +6,6 @@ donator_group_id = DONATOR_GROUP_TIER_1 //Suits -/datum/gear/donator/suit - slot = ITEM_SLOT_OCLOTHING - /datum/gear/donator/suit/hospitaller name = "Crusader costume" slot = ITEM_SLOT_OCLOTHING @@ -17,9 +14,6 @@ donator_group_id = DONATOR_GROUP_TIER_1 //Head -/datum/gear/donator/head - slot = ITEM_SLOT_HEAD - /datum/gear/donator/head/crown/fancy name = "magnificent crown" slot = ITEM_SLOT_HEAD @@ -28,7 +22,6 @@ donator_group_id = DONATOR_GROUP_TIER_1 //Backpack - /datum/gear/donator/backpack/crocinpen name = "Emergency aphrodisiac shot" path = /obj/item/reagent_containers/hypospray/medipen/crocin diff --git a/modular_splurt/code/modules/client/loadout/donator/second_tier.dm b/modular_splurt/code/modules/client/loadout/donator/second_tier.dm index 8658ef31ae..73ab80975b 100644 --- a/modular_splurt/code/modules/client/loadout/donator/second_tier.dm +++ b/modular_splurt/code/modules/client/loadout/donator/second_tier.dm @@ -1,3 +1,11 @@ +//Uniform +/datum/gear/donator/uniform/pentatop + name = "pentagram crop top" + path = /obj/item/clothing/under/pentatop + cost = 1 + ckeywhitelist = list() + donator_group_id = DONATOR_GROUP_TIER_2 + //Backpack /datum/gear/donator/backpack/crocinpen/plus name = "Shot of concentrated lust" diff --git a/modular_splurt/code/modules/clothing/under/miscellaneous.dm b/modular_splurt/code/modules/clothing/under/miscellaneous.dm index 48b1b963d8..0cd0f9a6b0 100644 --- a/modular_splurt/code/modules/clothing/under/miscellaneous.dm +++ b/modular_splurt/code/modules/clothing/under/miscellaneous.dm @@ -220,6 +220,16 @@ body_parts_covered = CHEST|GROIN|ARMS|LEGS can_adjust = FALSE +/obj/item/clothing/under/pentatop + name = "pentagram crop top" + desc = "For those goth girls with lots of chest to show." + icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi' + icon_state = "pentatop" + item_state = "pentatop" + body_parts_covered = CHEST + can_adjust = FALSE + // GWTB-inspired stuff wooo /obj/item/clothing/under/goner name = "trencher uniform" diff --git a/modular_splurt/icons/mob/clothing/uniform.dmi b/modular_splurt/icons/mob/clothing/uniform.dmi index 1d479ebf95..880ee67ac8 100644 Binary files a/modular_splurt/icons/mob/clothing/uniform.dmi and b/modular_splurt/icons/mob/clothing/uniform.dmi differ diff --git a/modular_splurt/icons/obj/clothing/uniforms.dmi b/modular_splurt/icons/obj/clothing/uniforms.dmi index 0487ecdb30..cf3aac888d 100644 Binary files a/modular_splurt/icons/obj/clothing/uniforms.dmi and b/modular_splurt/icons/obj/clothing/uniforms.dmi differ diff --git a/tgstation.dme b/tgstation.dme index f66036b286..753a72bb58 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4264,10 +4264,10 @@ #include "modular_splurt\code\datums\status_effects.dm" #include "modular_splurt\code\datums\world_topic.dm" #include "modular_splurt\code\datums\components\chasm.dm" -#include "modular_splurt\code\datums\components\organ_inflation.dm" -#include "modular_splurt\code\datums\components\pregnancy.dm" #include "modular_splurt\code\datums\components\dullahan.dm" #include "modular_splurt\code\datums\components\nanites.dm" +#include "modular_splurt\code\datums\components\organ_inflation.dm" +#include "modular_splurt\code\datums\components\pregnancy.dm" #include "modular_splurt\code\datums\components\pregnancy_inert.dm" #include "modular_splurt\code\datums\components\size_normalized.dm" #include "modular_splurt\code\datums\components\crafting\recipes\recipes_misc.dm" @@ -4490,6 +4490,7 @@ #include "modular_splurt\code\modules\client\loadout\suit.dm" #include "modular_splurt\code\modules\client\loadout\uniform.dm" #include "modular_splurt\code\modules\client\loadout\wrists.dm" +#include "modular_splurt\code\modules\client\loadout\donator\__donator.dm" #include "modular_splurt\code\modules\client\loadout\donator\first_tier.dm" #include "modular_splurt\code\modules\client\loadout\donator\second_tier.dm" #include "modular_splurt\code\modules\client\loadout\donator\third_tier.dm"