cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-11715

Browse Source
This commit is contained in:
Nadyr
2021-10-27 20:25:43 -04:00
committed by GitHub
parent a4efe1b256 2b394a1bf0
commit 7f5305920d
91 changed files with 2753 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
code/modules/clothing/masks/miscellaneous.dm
View File

@@ -294,77 +294,6 @@
desc = "A black veil, typically worn at funerals or by goths."
w_class = ITEMSIZE_TINY
body_parts_covered = FACE
<<<<<<< HEAD
icon_state = "veil"
||||||| parent of d86c1ee773... Merge pull request #11715 from PastelPrinceDan/gaitersecondtry
icon_state = "veil"
/obj/item/clothing/mask/paper
name = "paper mask"
desc = "A neat, circular mask made out of paper. Perhaps you could try drawing on it with a pen!"
w_class = ITEMSIZE_SMALL
body_parts_covered = FACE
icon_state = "papermask"
/obj/item/clothing/mask/paper/attackby(obj/item/I as obj, mob/living/user as mob, proximity)
if(!proximity) return
if(istype(I, /obj/item/weapon/pen))
var/drawtype = tgui_alert(user, "Choose what you'd like to draw.", "Faces", list("blank","neutral","eyes","sleeping", "heart", "core", "plus", "square", "bullseye", "vertical", "horizontal", "X", "bug eyes", "double", "mark" ))
switch(drawtype)
if("blank")
src.icon_state = "papermask"
if("neutral")
src.icon_state = "neutralmask"
if("eyes")
src.icon_state = "eyemask"
if("sleeping")
src.icon_state = "sleepingmask"
if("heart")
src.icon_state = "heartmask"
if("core")
src.icon_state = "coremask"
if("plus")
src.icon_state = "plusmask"
if("square")
src.icon_state = "squaremask"
if("bullseye")
src.icon_state = "bullseyemask"
if("vertical")
src.icon_state = "verticalmask"
if("horizontal")
src.icon_state = "horizontalmask"
if("X")
src.icon_state = "xmask"
if("bug eyes")
src.icon_state = "bugmask"
if("double")
src.icon_state = "doublemask"
if("mark")
src.icon_state = "markmask"
return
/obj/item/clothing/mask/emotions
name = "emotional mask"
desc = "Express your happiness or hide your sorrows with this modular cutout. Draw your current emotions onto it with a pen!"
w_class = ITEMSIZE_SMALL
body_parts_covered = FACE
icon_state = "joy"
/obj/item/clothing/mask/emotions/attackby(obj/item/I as obj, mob/living/user as mob, proximity)
if(!proximity) return
if(istype(I, /obj/item/weapon/pen))
var/drawtype = tgui_alert(user, "Choose what emotions you'd like to display.", "Emotions", list("joy","pensive","angry","flushed" ))
switch(drawtype)
if("joy")
src.icon_state = "joy"
if("pensive")
src.icon_state = "pensive"
if("angry")
src.icon_state = "angry"
if("flushed")
src.icon_state = "flushed"
return
=======
icon_state = "veil"
/obj/item/clothing/mask/paper
@@ -458,5 +387,4 @@
/obj/item/clothing/mask/gaiter/green
name = "green neck gaiter"
icon_state = "gaiter_green"
>>>>>>> d86c1ee773... Merge pull request #11715 from PastelPrinceDan/gaitersecondtry
icon_state = "gaiter_green"