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 branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

Browse Source 
Conflicts:
	code/defines/obj/hydro.dm
	code/game/mecha/mecha.dm
	code/game/objects/devices/PDA/PDA.dm
	code/game/objects/devices/flashlight.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/papers_bins.dm
	code/game/objects/radio/radio.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/mob.dm
This commit is contained in:
Erthilo
2012-08-23 13:56:12 +01:00
parent 66ef336259 7508c64fbf
commit 3510a8adf0
7 changed files with 76 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/carbon/amorph/life.dm
View File

@@ -57,7 +57,7 @@
handle_disabilities()
//Status updates, death etc.
UpdateLuminosity()
// UpdateLuminosity()
handle_regular_status_updates()
if(client)

4
code/modules/mob/living/silicon/robot/life.dm
View File

@@ -13,7 +13,7 @@
handle_regular_status_updates()
if(client)
UpdateLuminosity()
// UpdateLuminosity()
handle_regular_hud_updates()
update_items()
if (src.stat != DEAD) //still using power
@@ -301,4 +301,4 @@
/mob/living/silicon/robot/update_canmove()
if(paralysis || stunned || weakened || buckled || lockcharge) canmove = 0
else canmove = 1
return canmove
return canmove