cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-29 19:43:16 +00: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

1
code/modules/organs/organ.dm
View File

@@ -345,6 +345,7 @@ var/list/organ_cache = list()
user.drop_from_inventory(src)
var/obj/item/weapon/reagent_containers/food/snacks/organ/O = new(get_turf(src))
O.name = name
O.icon = icon
O.icon_state = icon_state
// Pass over the blood.