diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index bfc95cc8..70cdbcec 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -786,3 +786,14 @@ can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP mutantrace_variation = NO_MUTANTRACE_VARIATION + +//Chemlight the dumb dog was here +/obj/item/clothing/under/greenplaidshirt + name = "plaid green shirt" + desc = "A pair of khaki pants and a green shirt with a plaid open button shirt, looks roomy on the inside..." + icon_state = "greenplaidshirt" + item_state = "greenplaidshirt" + item_color = "greenplaidshirt" + body_parts_covered = CHEST|GROIN|ARMS|LEGS + can_adjust = FALSE +//yes \ No newline at end of file diff --git a/hyperstation/code/obj/plushes.dm b/hyperstation/code/obj/plushes.dm index 32091d49..1de3e358 100644 --- a/hyperstation/code/obj/plushes.dm +++ b/hyperstation/code/obj/plushes.dm @@ -58,4 +58,16 @@ desc = "Winter Dawn in plushie form! Very cuddly." icon = 'hyperstation/icons/obj/plushes.dmi' icon_state = "lyricalpaws" - item_state = "lyricalpaws" \ No newline at end of file + item_state = "lyricalpaws" + +/obj/item/toy/plush/mammal/chemlight + desc = "An adorable stuffed toy of a mammal that seems to resemble a crew member! It looks to glow and sport four arms." + gender = MALE //he's a boy, right? + icon = 'hyperstation/icons/obj/plushes.dmi' + icon_state = "chemlight" + item_state = "chemlight" + light_color = "#CCFF33" + light_power = 0.25 + light_range = 1.4 + attack_verb = list("bapped", "slapped", "bonked") + squeak_override = list('modular_citadel/sound/voice/bark.ogg' = 1) \ No newline at end of file diff --git a/hyperstation/icons/obj/plushes.dmi b/hyperstation/icons/obj/plushes.dmi index 401488a6..506e145f 100644 Binary files a/hyperstation/icons/obj/plushes.dmi and b/hyperstation/icons/obj/plushes.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 48436dab..1751307c 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 1f89fe73..26d4993d 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/backpack.dm b/modular_citadel/code/modules/client/loadout/backpack.dm index 98819167..9fba5c3c 100644 --- a/modular_citadel/code/modules/client/loadout/backpack.dm +++ b/modular_citadel/code/modules/client/loadout/backpack.dm @@ -207,3 +207,11 @@ category = SLOT_IN_BACKPACK path = /obj/item/sounding cost = 1 + +//chemlight doged +/datum/gear/lipstick_white + name = "Chemlight Plushie" + category = SLOT_IN_BACKPACK + path = /obj/item/toy/plush/mammal/chemlight + ckeywhitelist = list("chemlight") +//Done with that. diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index c8f5ae22..cb11406d 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -479,3 +479,10 @@ category = SLOT_W_UNIFORM path = /obj/item/clothing/under/roman cost = 1 + +/datum/gear/greenplaidshirt + name = "plaid green shirt" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/greenplaidshirt + cost = 1 + ckeywhitelist = list("chemlight") \ No newline at end of file diff --git a/modular_citadel/icons/mob/mam_taur.dmi b/modular_citadel/icons/mob/mam_taur.dmi index c0fe0812..fc8486cd 100644 Binary files a/modular_citadel/icons/mob/mam_taur.dmi and b/modular_citadel/icons/mob/mam_taur.dmi differ diff --git a/modular_citadel/icons/mob/uniform_digi.dmi b/modular_citadel/icons/mob/uniform_digi.dmi index 3503e285..96b3aa12 100644 Binary files a/modular_citadel/icons/mob/uniform_digi.dmi and b/modular_citadel/icons/mob/uniform_digi.dmi differ