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

borg recharge fixes (#16463)

Browse Source
This commit is contained in:
SteelSlayer
2021-07-31 14:08:08 -05:00
committed by GitHub
parent 33eaf68d42
commit 761be93029
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/robot.dm
+3 -3
View File
@@ -138,6 +138,9 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
radio = new /obj/item/radio/borg(src)
common_radio = radio
if(!cell) // Make sure a new cell gets created *before* executing initialize_components(). The cell component needs an existing cell for it to get set up properly
cell = new default_cell_type(src)
init(alien, connect_to_AI, ai_to_sync_to)
if(has_camera && !camera)
@@ -151,9 +154,6 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
mmi = new /obj/item/mmi/robotic_brain(src) //Give the borg an MMI if he spawns without for some reason. (probably not the correct way to spawn a robotic brain, but it works)
mmi.icon_state = "boris"
if(!cell) // Make sure a new cell gets created *before* executing initialize_components(). The cell component needs an existing cell for it to get set up properly
cell = new default_cell_type(src)
initialize_components()
//if(!unfinished)
// Create all the robot parts.
code/modules/mob/living/silicon/robot/robot_modules.dm
+9 -2
View File
@@ -570,6 +570,7 @@
/obj/item/gun/energy/pulse/cyborg,
/obj/item/crowbar/cyborg
)
special_rechargables = list(/obj/item/gun/energy/pulse/cyborg)
// Sydicate assault cyborg module.
/obj/item/robot_module/syndicate
@@ -662,7 +663,10 @@
/obj/item/pickaxe/drill/jackhammer, // for breaking walls to execute flanking moves
/obj/item/borg/destroyer/mobility
)
special_rechargables = list(/obj/item/melee/baton/loaded)
special_rechargables = list(
/obj/item/melee/baton/loaded,
/obj/item/gun/energy/immolator/multi/cyborg
)
/obj/item/robot_module/combat
name = "combat robot module"
@@ -678,7 +682,10 @@
/obj/item/restraints/handcuffs/cable/zipties/cyborg,
/obj/item/pickaxe/drill/jackhammer // for breaking walls to execute flanking moves
)
special_rechargables = list(/obj/item/melee/baton/loaded)
special_rechargables = list(
/obj/item/melee/baton/loaded,
/obj/item/gun/energy/immolator/multi/cyborg
)
// Xenomorph cyborg module.
/obj/item/robot_module/alien/hunter