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

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

Browse Source 
Conflicts:
	code/_helpers/unsorted.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
This commit is contained in:
PsiOmegaDelta
2015-07-31 10:00:16 +02:00
parent 485a3bb122 6663f02b29
commit c28b3721b4
27 changed files with 241 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/_helpers/unsorted.dm
View File

@@ -1317,3 +1317,7 @@ var/mob/dview/dview_mob = new
color = origin.color
set_light(origin.light_range, origin.light_power, origin.light_color)
/mob/dview/New()
// Do nothing except call parent. We don't want to be in any mob lists; we're a dummy not a mob.
..()