This commit is contained in:
if there were two guys on the moon
2019-05-22 18:36:12 +01:00
parent 36501b27c7
commit 19d5bece10
4 changed files with 65 additions and 2 deletions
+23 -1
View File
@@ -87,4 +87,26 @@
text = "guy"
if(FEMALE)
text = "lady"
user.visible_message("<span class='notice'>[user] uses [src] to comb their hair with incredible style and sophistication. What a [text].</span>")
user.visible_message("<span class='notice'>[user] uses [src] to comb their hair with incredible style and sophistication. What a [text].</span>")
/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, "<span class='notice'>You flip open \the [src] and begin to adjust your appearance.</span>")
var/datum/nano_module/appearance_changer/AC = ui_users[user]
if(!AC)
AC = new(src, user)
AC.name = "SalonPro Porta-Makeover Deluxe&trade;"
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()
@@ -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
@@ -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
@@ -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."