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

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

Browse Source 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
This commit is contained in:
Mloc-Argent
2014-05-14 22:42:03 +01:00
parent 586f3982a7 5af92b2906
commit e24dd57a65
10 changed files with 529 additions and 487 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/port_gen.dm
+1 -1
View File
@@ -42,7 +42,7 @@ display round(lastgen) and phorontank amount
//Baseline portable generator. Has all the default handling. Not intended to be used on it's own (since it generates unlimited power).
/obj/machinery/power/port_gen
name = "Portable Generator"
name = "Placeholder Generator" //seriously, don't use this. It can't be anchored without VV magic.
desc = "A portable generator for emergency backup power"
icon = 'icons/obj/power.dmi'
icon_state = "portgen0"