cyberpresidentvanellope/Aurora-Old
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora-Old.git synced 2026-08-24 05:06:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #200 from LikelyMeowness/master

Browse Source 
New Stuff // Hope this works
This commit is contained in:
skull132
2014-07-30 16:33:33 +03:00
parent 0f9e01da7d 9c6feb0ed2
commit 7e45de7c20
4 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/clothing.dm
+17 -3
View File
@@ -252,6 +252,7 @@ BLIND // can't see anything
var/obj/item/clothing/tie/hastie = null
var/displays_id = 1
var/rolled_down = 0
var/rolled_sleeves = 0
var/basecolor
/obj/item/clothing/under/attackby(obj/item/I, mob/user)
@@ -370,13 +371,26 @@ BLIND // can't see anything
if(!istype(usr, /mob/living)) return
if(usr.stat) return
if(copytext(item_color,-2) != "_d")
if(copytext(item_color,-2) != "_d" && rolled_sleeves == 0)
basecolor = item_color
if(basecolor + "_d_s" in icon_states('icons/mob/uniform.dmi'))
item_color = item_color == "[basecolor]" ? "[basecolor]_d" : "[basecolor]"
usr.update_inv_w_uniform()
else
usr << "<span class='notice'>You cannot roll down the uniform!</span>"
rolled_down = 1
/obj/item/clothing/under/verb/rollsleeve()
set name = "Roll Up Sleeves"
set category = "Object"
set src in usr
if(!istype(usr, /mob/living)) return
if(usr.stat) return
if(copytext(item_color,-2) != "_r" && rolled_down == 0)
basecolor = item_color
if(basecolor + "_r_s" in icon_states('icons/mob/uniform.dmi'))
item_color = item_color == "[basecolor]" ? "[basecolor]_r" : "[basecolor]"
usr.update_inv_w_uniform()
rolled_sleeves = 1
/obj/item/clothing/under/proc/remove_accessory(mob/user as mob)
if(!hastie)