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

Merge pull request #4166 from Neerti/10/26/2017_shields

Browse Source 
Adds New Advanced Shields, Tweaks
This commit is contained in:
Anewbe
2017-10-27 20:38:27 -05:00
committed by GitHub
parent 957b6daecc 446927fa21
commit 6dfea97220
4 changed files with 64 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shieldgen/shield_capacitor.dm
+7 -1
View File
@@ -4,7 +4,7 @@
/obj/machinery/shield_capacitor
name = "shield capacitor"
desc = "Machine that charges a shield generator."
desc = "A machine that charges a shield generator."
icon = 'icons/obj/machines/shielding.dmi'
icon_state = "capacitor"
var/active = 0
@@ -19,6 +19,12 @@
var/charge_rate = 100000 //100 kW
var/obj/machinery/shield_gen/owned_gen
/obj/machinery/shield_capacitor/advanced
name = "advanced shield capacitor"
desc = "A machine that charges a shield generator. This version can store, input, and output more electricity."
max_charge = 12e6
max_charge_rate = 600000
/obj/machinery/shield_capacitor/emag_act(var/remaining_charges, var/mob/user)
if(prob(75))
src.locked = !src.locked
code/modules/shieldgen/shield_gen.dm
+10 -2
View File
@@ -1,6 +1,6 @@
/obj/machinery/shield_gen
name = "bubble shield generator"
desc = "Machine that generates an impenetrable field of energy when activated."
desc = "A machine that generates a field of energy optimized for blocking meteorites when activated."
icon = 'icons/obj/machines/shielding.dmi'
icon_state = "generator0"
var/active = 0
@@ -20,10 +20,15 @@
var/target_field_strength = 10
var/max_field_strength = 10
var/time_since_fail = 100
var/energy_conversion_rate = 0.0002 //how many renwicks per watt?
var/energy_conversion_rate = 0.0002 //how many renwicks per watt? Higher numbers equals more effiency.
var/z_range = 0 // How far 'up and or down' to extend the shield to, in z-levels. Only works on MultiZ supported z-levels.
use_power = 0 //doesn't use APC power
/obj/machinery/shield_gen/advanced
name = "advanced bubble shield generator"
desc = "A machine that generates a field of energy optimized for blocking meteorites when activated. This version comes with a more efficent shield matrix."
energy_conversion_rate = 0.0004
/obj/machinery/shield_gen/New()
spawn(1 SECOND)
if(anchored)
@@ -259,11 +264,14 @@
/obj/machinery/shield_gen/update_icon()
if(stat & BROKEN)
icon_state = "broke"
set_light(0)
else
if (src.active)
icon_state = "generator1"
set_light(4, 2, "#00CCFF")
else
icon_state = "generator0"
set_light(0)
//grab the border tiles in a circle around this machine
/obj/machinery/shield_gen/proc/get_shielded_turfs()
code/modules/shieldgen/shield_gen_external.dm
+5 -2
View File
@@ -7,8 +7,11 @@
/turf/space,
/turf/simulated/floor/outdoors,
)
/obj/machinery/shield_gen/external/New()
..()
/obj/machinery/shield_gen/external/advanced
name = "advanced hull shield generator"
desc = "A machine that generates a field of energy optimized for blocking meteorites when activated. This version comes with a more efficent shield matrix."
energy_conversion_rate = 0.0004
//Search for space turfs within range that are adjacent to a simulated turf.
/obj/machinery/shield_gen/external/get_shielded_turfs_on_z_level(var/turf/gen_turf)