cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 00:23:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2489 from Fox-McCloud/circuit-board-pathing

Browse Source 
Circuit Board Repathing and Swarmer Fixes
This commit is contained in:
TheDZD
2015-11-06 21:51:39 -05:00
parent 06862ceceb 16a208f545
commit 6deffa0535
31 changed files with 95 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/drone/drone_console.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon_screen = "power"
icon_keyboard = "power_key"
req_access = list(access_engine_equip)
circuit = "/obj/item/weapon/circuitboard/drone_control"
circuit = /obj/item/weapon/circuitboard/drone_control
//Used when pinging drones.
var/drone_call_area = "Engineering"
code/modules/mob/living/simple_animal/bot_swarm/swarmer.dm
+4 -2
View File
@@ -227,6 +227,9 @@
/obj/item/stack/cable_coil/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)//Wiring would be too effective as a resource
S << "<span class='warning'>This object does not contain enough materials to work with.</span>"
/obj/item/weapon/circuitboard/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
S << "<span class='warning'>This object does not contain enough materials to work with.</span>"
/obj/machinery/porta_turret/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
S << "<span class='warning'>Attempting to dismantle this machine would result in an immediate counterattack. Aborting.</span>"
@@ -323,8 +326,7 @@
if(istype(target, /obj/machinery/computer))
var/obj/machinery/computer/C = target
if(C.circuit)
var/obj/item/weapon/circuitboard/circuit = text2path(C.circuit)
new circuit(get_turf(M))
new C.circuit(get_turf(M))
qdel(target)