cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 20:17:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

item_state cleanup

Browse Source
This commit is contained in:
SinTwo
2016-07-11 22:31:32 -04:00
parent bc0b9792bc
commit 7192bf08fd
130 changed files with 451 additions and 675 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/bedsheet_bin.dm
+31 -31
View File
@@ -39,67 +39,67 @@ LINEN BINS
/obj/item/weapon/bedsheet/blue
icon_state = "sheetblue"
item_state = "sheetblue"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/green
icon_state = "sheetgreen"
item_state = "sheetgreen"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/orange
icon_state = "sheetorange"
item_state = "sheetorange"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/purple
icon_state = "sheetpurple"
item_state = "sheetpurple"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/rainbow
icon_state = "sheetrainbow"
item_state = "sheetrainbow"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/red
icon_state = "sheetred"
item_state = "sheetred"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/yellow
icon_state = "sheetyellow"
item_state = "sheetyellow"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/mime
icon_state = "sheetmime"
item_state = "sheetmime"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/clown
icon_state = "sheetclown"
item_state = "sheetclown"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/captain
icon_state = "sheetcaptain"
item_state = "sheetcaptain"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/rd
icon_state = "sheetrd"
item_state = "sheetrd"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/medical
icon_state = "sheetmedical"
item_state = "sheetmedical"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/hos
icon_state = "sheethos"
item_state = "sheethos"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/hop
icon_state = "sheethop"
item_state = "sheethop"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/ce
icon_state = "sheetce"
item_state = "sheetce"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/brown
icon_state = "sheetbrown"
item_state = "sheetbrown"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/ian
icon_state = "sheetian"
@@ -111,63 +111,63 @@ LINEN BINS
/obj/item/weapon/bedsheet/bluedouble
icon_state = "doublesheetblue"
item_state = "sheetblue"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/greendouble
icon_state = "doublesheetgreen"
item_state = "sheetgreen"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/orangedouble
icon_state = "doublesheetorange"
item_state = "sheetorange"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/purpledouble
icon_state = "doublesheetpurple"
item_state = "sheetpurple"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/doublerainbow //all the way across the sky.
icon_state = "doublesheetrainbow"
item_state = "sheetrainbow"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/doublered
icon_state = "doublesheetred"
item_state = "sheetred"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/doubleyellow
icon_state = "doublesheetyellow"
item_state = "sheetyellow"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/doublemime
icon_state = "doublesheetmime"
item_state = "sheetmime"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/doubleclown
icon_state = "doublesheetclown"
item_state = "sheetclown"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/doublecaptain
icon_state = "doublesheetcaptain"
item_state = "sheetcaptain"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/doublerd
icon_state = "doublesheetrd"
item_state = "sheetrd"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/doublehos
icon_state = "doublesheethos"
item_state = "sheethos"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/doublehop
icon_state = "doublesheethop"
item_state = "sheethop"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/doublece
icon_state = "doublesheetce"
item_state = "sheetce"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/doublebrown
icon_state = "doublesheetbrown"
item_state = "sheetbrown"
item_state = "bedsheet"
/obj/item/weapon/bedsheet/doubleian
icon_state = "doublesheetian"
code/game/objects/structures/watercloset.dm
-5
View File
@@ -328,9 +328,6 @@
desc = "Rubber ducky you're so fine, you make bathtime lots of fuuun. Rubber ducky I'm awfully fooooond of yooooouuuu~" //thanks doohl
icon = 'icons/obj/watercloset.dmi'
icon_state = "rubberducky"
item_state = "rubberducky"
/obj/structure/sink
name = "sink"
@@ -388,7 +385,6 @@
for(var/mob/V in viewers(src, null))
V.show_message("<span class='notice'>[user] washes their hands using \the [src].</span>")
/obj/structure/sink/attackby(obj/item/O as obj, mob/user as mob)
if(busy)
user << "<span class='warning'>Someone's already washing here.</span>"
@@ -444,7 +440,6 @@
"<span class='notice'>[user] washes \a [I] using \the [src].</span>", \
"<span class='notice'>You wash \a [I] using \the [src].</span>")
/obj/structure/sink/kitchen
name = "kitchen sink"
icon_state = "sink_alt"