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

Merge branch 'master' of https://github.com/tgstation/-tg-station into bugsarethemotheroffeatures

Browse Source
This commit is contained in:
Jordie0608
2015-05-20 01:16:16 +10:00
parent ffcba8cb61 dbb2999c85
commit 8329b10890
19 changed files with 103 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food&drinks/kitchen machinery/microwave.dm
+1 -1
View File
@@ -108,7 +108,7 @@
else if(istype(O, /obj/item/weapon/soap/)) // If they're trying to clean it then let them
var/obj/item/weapon/soap/P = O
user.visible_message( \
"[user] starts to clean the microwave.S", \
"[user] starts to clean the microwave.", \
"<span class='notice'>You start to clean the microwave...</span>" \
)
if (do_after(user, P.cleanspeed))
code/modules/reagents/Chemistry-Holder.dm
+4 -4
View File
@@ -425,14 +425,14 @@ datum/reagents/proc/clear_reagents()
del_reagent(R.id)
return 0
datum/reagents/proc/reaction(var/atom/A, var/method=TOUCH, var/volume_modifier=0,var/show_message=1)
datum/reagents/proc/reaction(var/atom/A, var/method=TOUCH, var/volume_modifier=1,var/show_message=1)
for(var/datum/reagent/R in reagent_list)
if(ismob(A))
R.reaction_mob(A, method, R.volume+volume_modifier, show_message)
R.reaction_mob(A, method, R.volume*volume_modifier, show_message)
if(isturf(A))
R.reaction_turf(A, R.volume+volume_modifier, show_message)
R.reaction_turf(A, R.volume*volume_modifier, show_message)
if(isobj(A))
R.reaction_obj(A, R.volume+volume_modifier, show_message)
R.reaction_obj(A, R.volume*volume_modifier, show_message)
return