From 19d5bece10e05052d896c52c3d6d5aa804f3f320 Mon Sep 17 00:00:00 2001 From: if there were two guys on the moon Date: Wed, 22 May 2019 18:36:12 +0100 Subject: [PATCH] makeover --- code/game/objects/items/weapons/cosmetics.dm | 24 ++++++++++++- .../objects/items/weapons/storage/wallets.dm | 3 +- .../loadout/loadout_cosmetics.dm | 4 +++ .../mistyLuminescence - makeover.yml | 36 +++++++++++++++++++ 4 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/mistyLuminescence - makeover.yml diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index 3d142b223a..4533f41537 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -87,4 +87,26 @@ text = "guy" if(FEMALE) text = "lady" - user.visible_message("[user] uses [src] to comb their hair with incredible style and sophistication. What a [text].") \ No newline at end of file + user.visible_message("[user] uses [src] to comb their hair with incredible style and sophistication. What a [text].") + +/obj/item/weapon/makeover + name = "makeover kit" + desc = "A tiny case containing a mirror and some contact lenses." + w_class = ITEMSIZE_TINY + icon = 'icons/obj/items.dmi' + icon_state = "trinketbox" + var/list/ui_users = list() + +/obj/item/weapon/makeover/attack_self(mob/living/carbon/user as mob) + if(ishuman(user)) + to_chat(user, "You flip open \the [src] and begin to adjust your appearance.") + var/datum/nano_module/appearance_changer/AC = ui_users[user] + if(!AC) + AC = new(src, user) + AC.name = "SalonPro Porta-Makeover Deluxe™" + ui_users[user] = AC + AC.ui_interact(user) + var/mob/living/carbon/human/H = user + var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name[O_EYES] + if(istype(E)) + E.change_eye_color() \ No newline at end of file diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index ce1227014c..95db86460e 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -35,7 +35,8 @@ /obj/item/weapon/tool/screwdriver, /obj/item/weapon/stamp, /obj/item/clothing/accessory/permit, - /obj/item/clothing/accessory/badge + /obj/item/clothing/accessory/badge, + /obj/item/weapon/makeover ) cant_hold = list(/obj/item/weapon/tool/screwdriver/power) slot_flags = SLOT_ID diff --git a/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm b/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm index 7e9b25070a..fb6a05e6a5 100644 --- a/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm +++ b/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm @@ -1,3 +1,7 @@ +/datum/gear/cosmetic/makeover + display_name = "makeover kit" + path = /obj/item/weapon/makeover + /datum/gear/cosmetic/lipstick/black display_name = "lipstick, black" path = /obj/item/weapon/lipstick/black diff --git a/html/changelogs/mistyLuminescence - makeover.yml b/html/changelogs/mistyLuminescence - makeover.yml new file mode 100644 index 0000000000..e219239d24 --- /dev/null +++ b/html/changelogs/mistyLuminescence - makeover.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: mistyLuminescence + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds the makeover kit to the loadout for 1 point. Makeover kits can be used to change the user's hair style and color, and eye color."