cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-24 09:03:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11247 from Hubblenaut/laundry

Browse Source 
Adds laundry basket
This commit is contained in:
PsiOmegaDelta
2015-10-31 11:16:14 +01:00
parent 06b2a24620 ba19c28c33
commit a9f7b3a325
7 changed files with 99 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/game/objects/structures/crates_lockers/closets.dm
View File

@@ -217,6 +217,15 @@
M.show_message("<span class='notice'>\The [src] has been cut apart by [user] with \the [WT].</span>", 3, "You hear welding.", 2)
qdel(src)
return
if(istype(W, /obj/item/weapon/storage/laundry_basket) && W.contents.len)
var/obj/item/weapon/storage/laundry_basket/LB = W
var/turf/T = get_turf(src)
for(var/obj/item/I in LB.contents)
LB.remove_from_storage(I, T)
user.visible_message("<span class='notice'>[user] empties \the [LB] into \the [src].</span>", \
"<span class='notice'>You empty \the [LB] into \the [src].</span>", \
"<span class='notice'>You hear rustling of clothes.</span>")
return
if(isrobot(user))
return
if(W.loc != user) // This should stop mounted modules ending up outside the module.

2
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
View File

@@ -65,6 +65,8 @@
/obj/structure/closet/secure_closet/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(src.opened)
if(istype(W, /obj/item/weapon/storage/laundry_basket))
return ..(W,user)
if(istype(W, /obj/item/weapon/grab))
var/obj/item/weapon/grab/G = W
if(src.large)