cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 13:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-freeze' into dev

Browse Source 
Conflicts:
	maps/tgstation2.dmm
This commit is contained in:
Chinsky
2014-03-10 19:05:24 +04:00
parent 13b9747504 b014e22972
commit 0e08c90571
8 changed files with 71 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/generic.dm
+4
View File
@@ -6,6 +6,8 @@
/datum/surgery_step/generic/
can_infect = 1
can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
if (isslime(target))
return 0
if (target_zone == "eyes") //there are specific steps for eye surgery
return 0
if (!hasorgans(target))
@@ -112,6 +114,8 @@
max_duration = 110
can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
if(isslime(target))
return 0
var/datum/organ/external/affected = target.get_organ(target_zone)
return ..() && affected.open == 0 && target_zone != "mouth"
code/modules/surgery/implant.dm
+2
View File
@@ -106,6 +106,8 @@
max_duration = 100
can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
if(isslime(target))
return 0
var/datum/organ/external/affected = target.get_organ(target_zone)
var/can_fit = !affected.hidden && affected.cavity && tool.w_class <= get_max_wclass(affected)
return ..() && can_fit