cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 22:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/game/machinery/vending.dm
This commit is contained in:
PsiOmega
2015-04-10 15:25:34 +02:00
parent 05da117d10 4c44482dfc
commit 1ba8dcbca9
12 changed files with 1093 additions and 1077 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,10 +130,11 @@
if (src.stat != 0)
uneq_all()
if(!is_component_functioning("radio"))
radio.on = 0
else
radio.on = 1
if(radio)
if(!is_component_functioning("radio"))
radio.on = 0
else
radio.on = 1
if(is_component_functioning("camera"))
src.blinded = 0

2
code/modules/mob/living/silicon/robot/robot_modules.dm
View File

@@ -191,7 +191,7 @@
src.modules += R
var/obj/item/stack/sheet/plasteel/cyborg/S = new /obj/item/stack/sheet/plasteel/cyborg(src)
S.synths = list(metal)
S.synths = list(plasteel)
src.modules += S
var/obj/item/stack/sheet/glass/reinforced/cyborg/RG = new /obj/item/stack/sheet/glass/reinforced/cyborg(src)