cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleans up washing machines a bit

Browse Source 
Pun not intended.  Now you can decontaminate armor vests and such.
This commit is contained in:
Neerti
2016-07-10 01:01:05 -04:00
parent 3a298d1df0
commit f04edd4700
1 changed files with 8 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
code/game/machinery/washing_machine.dm
View File

@@ -20,6 +20,10 @@
var/gibs_ready = 0 var/gibs_ready = 0
var/obj/crayon var/obj/crayon
var/list/washing = list() var/list/washing = list()
var/list/disallowed_types = list(
/obj/item/clothing/suit/space,
/obj/item/clothing/head/helmet/space
)
/obj/machinery/washing_machine/New() /obj/machinery/washing_machine/New()
circuit = new circuit(src) circuit = new circuit(src)
@@ -107,53 +111,12 @@
state = 3 state = 3
else else
..() ..()
else if(istype(W,/obj/item/stack/material/hairlesshide) || \
istype(W,/obj/item/clothing/under) || \
istype(W,/obj/item/clothing/mask) || \
istype(W,/obj/item/clothing/head) || \
istype(W,/obj/item/clothing/gloves) || \
istype(W,/obj/item/clothing/shoes) || \
istype(W,/obj/item/clothing/suit) || \
istype(W,/obj/item/weapon/bedsheet))
//YES, it's hardcoded... saves a var/can_be_washed for every single clothing item. else if(is_type_in_list(W, disallowed_types))
if ( istype(W,/obj/item/clothing/suit/space ) ) user << "<span class='warning'>You can't fit \the [W] inside.</span>"
user << "This item does not fit." return
return
if ( istype(W,/obj/item/clothing/suit/syndicatefake ) )
user << "This item does not fit."
return
// if ( istype(W,/obj/item/clothing/suit/powered ) )
// user << "This item does not fit."
// return
if ( istype(W,/obj/item/clothing/suit/cyborg_suit ) )
user << "This item does not fit."
return
if ( istype(W,/obj/item/clothing/suit/bomb_suit ) )
user << "This item does not fit."
return
if ( istype(W,/obj/item/clothing/suit/armor ) )
user << "This item does not fit."
return
if ( istype(W,/obj/item/clothing/suit/armor ) )
user << "This item does not fit."
return
if ( istype(W,/obj/item/clothing/mask/gas ) )
user << "This item does not fit."
return
if ( istype(W,/obj/item/clothing/mask/smokable/cigarette ) )
user << "This item does not fit."
return
if ( istype(W,/obj/item/clothing/head/syndicatefake ) )
user << "This item does not fit."
return
// if ( istype(W,/obj/item/clothing/head/powered ) )
// user << "This item does not fit."
// return
if ( istype(W,/obj/item/clothing/head/helmet ) )
user << "This item does not fit."
return
else if(istype(W, /obj/item/clothing))
if(washing.len < 5) if(washing.len < 5)
if ( state in list(1, 3) ) if ( state in list(1, 3) )
user.drop_item() user.drop_item()