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

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19

Browse Source 
# Conflicts:
#	code/_onclick/hud/hud.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
This commit is contained in:
Leshana
2018-01-19 17:52:25 -05:00
parent 169a188ad0 8255744c2b
commit 3c3dac7102
81 changed files with 2358 additions and 16423 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+2
View File
@@ -29,6 +29,8 @@
new /obj/item/clothing/under/rank/security2(src)
new /obj/item/clothing/under/rank/security2(src)
new /obj/item/clothing/under/rank/security2(src)
new /obj/item/clothing/under/rank/security/skirt(src)
new /obj/item/clothing/under/rank/security/skirt(src)
new /obj/item/clothing/shoes/boots/jackboots(src)
new /obj/item/clothing/shoes/boots/jackboots(src)
new /obj/item/clothing/shoes/boots/jackboots(src)
code/game/objects/structures/janicart.dm
+2 -2
View File
@@ -17,7 +17,7 @@
/obj/structure/janitorialcart/New()
create_reagents(100)
create_reagents(300)
/obj/structure/janitorialcart/examine(mob/user)
@@ -178,7 +178,7 @@
/obj/structure/bed/chair/janicart/New()
create_reagents(100)
create_reagents(300)
update_layer()
code/game/objects/structures/mop_bucket.dm
+4 -4
View File
@@ -12,18 +12,18 @@
/obj/structure/mopbucket/New()
create_reagents(100)
create_reagents(300)
..()
/obj/structure/mopbucket/examine(mob/user)
if(..(user, 1))
user << "[src] \icon[src] contains [reagents.total_volume] unit\s of water!"
to_chat(user, "[src] \icon[src] contains [reagents.total_volume] unit\s of water!")
/obj/structure/mopbucket/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/weapon/mop) || istype(I, /obj/item/weapon/soap) || istype(I, /obj/item/weapon/reagent_containers/glass/rag)) //VOREStation Edit - "Allows soap and rags to be used on mopbuckets"
if(reagents.total_volume < 1)
user << "<span class='warning'>\The [src] is out of water!</span>"
to_chat(user, "<span class='warning'>\The [src] is out of water!</span>")
else
reagents.trans_to_obj(I, 5)
user << "<span class='notice'>You wet \the [I] in \the [src].</span>"
to_chat(user, "<span class='notice'>You wet \the [I] in \the [src].</span>")
playsound(loc, 'sound/effects/slosh.ogg', 25, 1)