cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/projectiles/targeting.dm
This commit is contained in:
GinjaNinja32
2015-04-13 12:49:07 +01:00
parent f205ce4327 6cf08526bc
commit d4eb42b38b
7 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/machinery/kitchen/smartfridge.dm
View File

@@ -140,6 +140,7 @@
S.dry = 1
item_quants[S.name]--
S.name = "dried [S.name]"
S.color = "#AAAAAA"
S.loc = loc
else
var/D = S.dried_type