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

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source 
Conflicts:
	code/ZAS/Controller.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/stripping.dm
	code/modules/mob/living/carbon/human/update_icons.dm
This commit is contained in:
PsiOmegaDelta
2015-08-27 08:53:22 +02:00
parent d567e775a8 9a23275755
commit d293b9ea25
11 changed files with 90 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+1 -1
View File
@@ -207,7 +207,7 @@
/mob/living/carbon/human/show_inv(mob/user as mob)
if(user.incapacitated())
if(user.incapacitated() || !user.Adjacent(src))
return
var/obj/item/clothing/under/suit = null
code/modules/mob/living/carbon/human/stripping.dm
+1 -1
View File
@@ -3,7 +3,7 @@
if(!slot_to_strip || !istype(user))
return
if(user.incapacitated())
if(user.incapacitated() || !user.Adjacent(src))
user << browse(null, text("window=mob[src.name]"))
return
code/modules/mob/living/carbon/human/update_icons.dm
+1 -1
View File
@@ -208,7 +208,7 @@ var/global/list/damage_icon_parts = list()
O.update_icon()
if(O.damage_state == "00") continue
var/icon/DI
var/cache_index = "[O.damage_state]/[O.icon_name]/[species.blood_color]/[species.name]"
var/cache_index = "[O.damage_state]/[O.icon_name]/[species.blood_color]/[species.get_bodytype()]"
if(damage_icon_parts[cache_index] == null)
DI = new /icon(species.damage_overlays, O.damage_state) // the damage icon for whole human
DI.Blend(new /icon(species.damage_mask, O.icon_name), ICON_MULTIPLY) // mask with this organ's pixels