cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-21 03:51:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into placeholder

Browse Source
This commit is contained in:
Ferner
2021-01-25 22:46:09 +01:00
parent 2468f83158 06dc129749
commit 271a1eb9d8
23 changed files with 95 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+2 -1
View File
@@ -216,7 +216,8 @@
new /obj/item/clothing/head/bandana/engineering(src)
new /obj/item/clothing/head/bandana/engineering(src)
new /obj/item/clothing/head/bandana/engineering(src)
return
new /obj/item/clothing/suit/storage/toggle/highvis(src)
new /obj/item/clothing/suit/storage/toggle/highvis(src)
/obj/structure/closet/wardrobe/white
code/game/objects/structures/watercloset.dm
+1 -1
View File
@@ -529,7 +529,7 @@
// Short of a rewrite, this is necessary to stop monkeycubes being washed.
else if(istype(O, /obj/item/reagent_containers/food/snacks/monkeycube))
return
else if(istype(O, /obj/item/mop))
else if(istype(O, /obj/item/mop) || istype(O, /obj/item/reagent_containers/glass/rag))
O.reagents.add_reagent(/decl/reagent/water, 5)
to_chat(user, SPAN_NOTICE("You wet \the [O] in \the [src]."))
playsound(loc, 'sound/effects/slosh.ogg', 25, 1)