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 https://github.com/Baystation12/Baystation12 into bs12_with_tgport (used bs12 icon for the new smes sprites, but this may cause other issues)

Browse Source 
Conflicts:
	icons/obj/power.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-09-08 20:25:15 +10:00
parent bfdf486a1e cf04246f96
commit 17621adbd8
3 changed files with 55 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/power/generator_type2.dm
View File

@@ -15,8 +15,8 @@
/obj/machinery/power/generator_type2/New()
..()
spawn(5)
input1 = locate(/obj/machinery/atmospherics/unary/generator_input) in get_step(src,WEST)
input2 = locate(/obj/machinery/atmospherics/unary/generator_input) in get_step(src,EAST)
input1 = locate(/obj/machinery/atmospherics/unary/generator_input) in get_step(src,turn(dir, 90))
input2 = locate(/obj/machinery/atmospherics/unary/generator_input) in get_step(src,turn(dir, -90))
if(!input1 || !input2)
stat |= BROKEN
updateicon()