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

fixed compile errors

Browse Source
This commit is contained in:
paprka
2014-12-24 21:03:22 -08:00
parent 7842ff8803
commit 595ad8df58
11 changed files with 49 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/crafting/recipes.dm
+1 -1
View File
@@ -38,7 +38,7 @@
/obj/item/robot_parts/r_leg = 1,
/obj/item/stack/sheet/metal = 5,
/obj/item/stack/cable_coil = 5,
/obj/item/weapon/gun/energy/taser = 1,
/obj/item/weapon/gun/energy/gun/advtaser = 1,
/obj/item/weapon/stock_parts/cell = 1,
/obj/item/device/assembly/prox_sensor = 1,
/obj/item/robot_parts/r_arm = 1)
code/modules/projectiles/guns/energy/nuclear.dm
-40
View File
@@ -12,46 +12,6 @@
select_fire(user)
update_icon()
/obj/item/weapon/gun/energy/gun/advtaser
name = "advanced taser"
desc = "A hybrid taser designed to fire both short-range high-power electrodes and long-range disabler beams."
icon_state = "advtaser"
ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/disabler)
/obj/item/weapon/gun/energy/gun/advtaser/cyborg
name = "advanced taser"
desc = "An integrated advanced taser that draws directly from a cyborg's power cell. The weapon contains a limiter to prevent the cyborg's power cell from overheating."
cell_type = "/obj/item/weapon/stock_parts/cell/secborg"
var/charge_tick = 0
var/recharge_time = 10
/obj/item/weapon/gun/energy/gun/advtaser/cyborg/New()
..()
processing_objects.Add(src)
/obj/item/weapon/gun/energy/gun/advtaser/cyborg/Destroy()
processing_objects.Remove(src)
..()
/obj/item/weapon/gun/energy/gun/advtaser/cyborg/process() //Every [recharge_time] ticks, recharge a shot for the cyborg
charge_tick++
if(charge_tick < recharge_time) return 0
charge_tick = 0
if(!power_supply) return 0 //sanity
if(isrobot(src.loc))
var/mob/living/silicon/robot/R = src.loc
if(R && R.cell)
var/obj/item/ammo_casing/energy/shot = ammo_type[select] //Necessary to find cost of shot
if(R.cell.use(shot.e_cost)) //Take power from the borg...
power_supply.give(shot.e_cost) //... to recharge the shot
update_icon()
return 1
/obj/item/weapon/gun/energy/gun/nuclear
name = "advanced energy gun"
desc = "An energy gun with an experimental miniaturized nuclear reactor that automatically charges the internal power cell."
code/modules/projectiles/guns/energy/stun.dm
+38 -1
View File
@@ -7,7 +7,6 @@
ammo_type = list(/obj/item/ammo_casing/energy/electrode)
cell_type = "/obj/item/weapon/stock_parts/cell/crap"
/obj/item/weapon/gun/energy/stunrevolver
name = "stun revolver"
desc = "A high-tech revolver that fires internal, reusable stun cartidges in a revolving cylinder."
@@ -16,6 +15,44 @@
ammo_type = list(/obj/item/ammo_casing/energy/electrode/gun)
cell_type = "/obj/item/weapon/stock_parts/cell"
/obj/item/weapon/gun/energy/gun/advtaser
name = "advanced taser"
desc = "A hybrid taser designed to fire both short-range high-power electrodes and long-range disabler beams."
icon_state = "advtaser"
ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/disabler)
/obj/item/weapon/gun/energy/gun/advtaser/cyborg
name = "advanced taser"
desc = "An integrated advanced taser that draws directly from a cyborg's power cell. The weapon contains a limiter to prevent the cyborg's power cell from overheating."
cell_type = "/obj/item/weapon/stock_parts/cell/secborg"
var/charge_tick = 0
var/recharge_time = 10
/obj/item/weapon/gun/energy/gun/advtaser/cyborg/New()
..()
processing_objects.Add(src)
/obj/item/weapon/gun/energy/gun/advtaser/cyborg/Destroy()
processing_objects.Remove(src)
..()
/obj/item/weapon/gun/energy/gun/advtaser/cyborg/process() //Every [recharge_time] ticks, recharge a shot for the cyborg
charge_tick++
if(charge_tick < recharge_time) return 0
charge_tick = 0
if(!power_supply) return 0 //sanity
if(isrobot(src.loc))
var/mob/living/silicon/robot/R = src.loc
if(R && R.cell)
var/obj/item/ammo_casing/energy/shot = ammo_type[select] //Necessary to find cost of shot
if(R.cell.use(shot.e_cost)) //Take power from the borg...
power_supply.give(shot.e_cost) //... to recharge the shot
update_icon()
return 1
/obj/item/weapon/gun/energy/crossbow
name = "mini energy crossbow"