shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Thalpy
2019-07-21 01:50:41 +01:00
committed by GitHub
parent d73fabffff 39dea966ae
commit 15ab1a26a4
115 changed files with 1351 additions and 473 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/helpers.dm
+6 -13
View File
@@ -110,22 +110,15 @@
return 0.5
/proc/get_location_accessible(mob/M, location)
/proc/get_location_accessible(mob/living/M, location)
var/covered_locations = 0 //based on body_parts_covered
var/face_covered = 0 //based on flags_inv
var/eyesmouth_covered = 0 //based on flags_cover
if(iscarbon(M))
var/mob/living/carbon/C = M
for(var/obj/item/clothing/I in list(C.back, C.wear_mask, C.head))
covered_locations |= I.body_parts_covered
face_covered |= I.flags_inv
eyesmouth_covered |= I.flags_cover
if(ishuman(C))
var/mob/living/carbon/human/H = C
for(var/obj/item/I in list(H.wear_suit, H.w_uniform, H.shoes, H.belt, H.gloves, H.glasses, H.ears))
covered_locations |= I.body_parts_covered
face_covered |= I.flags_inv
eyesmouth_covered |= I.flags_cover
for(var/A in M.get_equipped_items())
var/obj/item/I = A
covered_locations |= I.body_parts_covered
face_covered |= I.flags_inv
eyesmouth_covered |= I.flags_cover
switch(location)
if(BODY_ZONE_HEAD)
code/modules/surgery/organs/augments_arms.dm
+1 -1
View File
@@ -132,7 +132,7 @@
else
var/list/choice_list = list()
for(var/obj/item/I in items_list)
choice_list[I] = getFlatIcon(I)
choice_list[I] = image(I)
var/obj/item/choice = show_radial_menu(owner, owner, choice_list)
if(owner && owner == usr && owner.stat != DEAD && (src in owner.internal_organs) && !holder && (choice in contents))
// This monster sanity check is a nice example of how bad input is.