cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-24 12:36:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into SILENCEDMP5A5_FLUFF

Browse Source
This commit is contained in:
Cameron653
2018-04-11 00:37:26 -04:00
committed by GitHub
parent 1b447796de d4d706ca1d
commit b3efd60a72
98 changed files with 1252 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/gloves/miscellaneous_vr.dm
-17
View File
@@ -1,20 +1,3 @@
/obj/item/clothing/gloves/weddingring
name = "golden wedding ring"
desc = "For showing your devotion to another person. It has a golden glimmer to it."
icon = 'icons/obj/clothing/gloves_vr.dmi'
icon_state = "wedring_g"
item_state = "wedring_g"
var/partnername = ""
/obj/item/clothing/gloves/weddingring/attack_self(mob/user)
partnername = copytext(sanitize(input(user, "Would you like to change the holoengraving on the ring?", "Name your betrothed", "Bae") as null|text),1,MAX_NAME_LEN)
name = "[initial(name)] - [partnername]"
/obj/item/clothing/gloves/weddingring/silver
name = "silver wedding ring"
icon_state = "wedring_s"
item_state = "wedring_s"
/obj/item/clothing/gloves/color
desc = "A pair of gloves, they don't look special in any way."
item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white")
code/modules/clothing/rings/rings_vr.dm
+17
View File
@@ -0,0 +1,17 @@
/obj/item/clothing/gloves/ring/wedding
name = "golden wedding ring"
desc = "For showing your devotion to another person. It has a golden glimmer to it."
icon = 'icons/obj/clothing/gloves_vr.dmi'
icon_state = "wedring_g"
item_state = "wedring_g"
var/partnername = ""
/obj/item/clothing/gloves/ring/wedding/attack_self(mob/user)
partnername = copytext(sanitize(input(user, "Would you like to change the holoengraving on the ring?", "Name your spouse", "Bae") as null|text),1,MAX_NAME_LEN)
name = "[initial(name)] - [partnername]"
/obj/item/clothing/gloves/ring/wedding/silver
name = "silver wedding ring"
desc = "For showing your devotion to another person. It has a silver glimmer to it."
icon_state = "wedring_s"
item_state = "wedring_s"
code/modules/clothing/under/accessories/accessory.dm
+4 -2
View File
@@ -26,7 +26,9 @@
if(icon_override)
if("[tmp_icon_state]_tie" in icon_states(icon_override))
tmp_icon_state = "[tmp_icon_state]_tie"
inv_overlay = image(icon = INV_ACCESSORIES_DEF_ICON, icon_state = tmp_icon_state, dir = SOUTH)
inv_overlay = image(icon = icon_override, icon_state = tmp_icon_state, dir = SOUTH)
else
inv_overlay = image(icon = INV_ACCESSORIES_DEF_ICON, icon_state = tmp_icon_state, dir = SOUTH)
return inv_overlay
/obj/item/clothing/accessory/proc/get_mob_overlay()
@@ -387,4 +389,4 @@
/obj/item/clothing/accessory/bracelet/material/glass/New(var/newloc)
..(newloc, "glass")
..()
..()