cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-02 05:22:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12

Browse Source
This commit is contained in:
Zuhayr
2013-06-25 23:54:47 -07:00
parent 722a336e2a 6f0d2d37d4
commit e363157b2a
14 changed files with 109 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@
/mob/living/silicon/robot/proc/use_power()
if (is_component_functioning("power cell"))
if (is_component_functioning("power cell") && cell)
if(src.cell.charge <= 0)
uneq_all()
src.stat = 1

8
code/modules/mob/living/silicon/robot/robot.dm
View File

@@ -116,13 +116,13 @@
cell.maxcharge = 7500
cell.charge = 7500
..()
if(cell)
var/datum/robot_component/cell_component = components["power cell"]
cell_component.wrapped = cell
cell_component.installed = 1
..()
playsound(loc, 'sound/voice/liveagain.ogg', 75, 1)
// setup the PDA and its name
@@ -725,7 +725,7 @@
var/datum/robot_component/C = components["power cell"]
if(wiresexposed)
user << "Close the panel first."
else if(cell || C.installed)
else if(cell)
user << "There is a power cell already installed."
else
user.drop_item()
@@ -1015,6 +1015,8 @@
user.put_in_active_hand(cell)
user << "You remove \the [cell]."
cell = null
cell_component.wrapped = null
cell_component.installed = 0
updateicon()
else if(cell_component.installed == -1)
cell_component.installed = 0