cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12

Browse Source 
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
	code/setup.dm
This commit is contained in:
Chinsky
2013-01-22 23:46:42 +04:00
parent 79b17d0c1d 5ee45a018d
commit 7a66e7e524
217 changed files with 23617 additions and 12408 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/surgery.dm
+1 -1
View File
@@ -68,7 +68,7 @@ proc/do_surgery(mob/living/M, mob/living/user, obj/item/tool)
if (user.a_intent == "harm") //check for Hippocratic Oath
return 0
for(var/datum/surgery_step/S in surgery_steps)
if( S.isright(tool) || S.isacceptable(tool) && \
if( (S.isright(tool) || S.isacceptable(tool)) && \
S.can_use(user, M, user.zone_sel.selecting, tool)) //check if tool is right or close enough and if this step is possible
S.begin_step(user, M, user.zone_sel.selecting, tool) //start on it
if(do_mob(user, M, rand(S.min_duration, S.max_duration))) //if user did nto move or changed hands