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

Added Peacekeeper borgs, removing thermals, giving them blue eyes, etc

Browse Source
This commit is contained in:
ZomgPonies
2015-11-20 19:21:39 -05:00
parent 589239f3cd
commit bd0dd2ab4b
6 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/robot.dm
+2 -2
View File
@@ -1435,8 +1435,8 @@ var/list/robot_verbs_default = list(
/mob/living/silicon/robot/peacekeeper/New()
..()
var/module_sprites[0] //Used to store the associations between sprite names and sprite index.
module = new /obj/item/weapon/robot_module/combat(src)
module_sprites["Combat Android"] = "droidpeace"
module = new /obj/item/weapon/robot_module/peacekeeper(src)
module_sprites["Peacekeeper Android"] = "droidpeace"
//languages
module.add_languages(src)
//subsystems
code/modules/mob/living/silicon/robot/robot_damage.dm
+8 -8
View File
@@ -68,12 +68,12 @@
//Combat shielding absorbs a percentage of damage directly into the cell.
var/obj/item/borg/combat/shield/shield
if((module_state_1 && istype(module_state_1,/obj/item/borg/combat/shield))
if(module_state_1 && istype(module_state_1,/obj/item/borg/combat/shield))
shield = module_state_1
else if(module_state_2 && istype(module_state_2,/obj/item/borg/combat/shield))
shield = module_state 2
else if(module_state 3 && istype(module_state_3,/obj/item/borg/combat/shield))
shield = module_state 3
shield = module_state_2
else if(module_state_3 && istype(module_state_3,/obj/item/borg/combat/shield))
shield = module_state_3
if(shield)
//Shields absorb a certain percentage of damage based on their power setting.
var/absorb_brute = brute*shield.shield_level
@@ -119,12 +119,12 @@
//Combat shielding absorbs a percentage of damage directly into the cell.
var/obj/item/borg/combat/shield/shield
if((module_state_1 && istype(module_state_1,/obj/item/borg/combat/shield))
if(module_state_1 && istype(module_state_1,/obj/item/borg/combat/shield))
shield = module_state_1
else if(module_state_2 && istype(module_state_2,/obj/item/borg/combat/shield))
shield = module_state 2
else if(module_state 3 && istype(module_state_3,/obj/item/borg/combat/shield))
shield = module_state 3
shield = module_state_2
else if(module_state_3 && istype(module_state_3,/obj/item/borg/combat/shield))
shield = module_state_3
if(shield)
//Shields absorb a certain percentage of damage based on their power setting.
var/absorb_brute = brute*shield.shield_level
code/modules/mob/living/silicon/robot/robot_modules.dm
+15
View File
@@ -423,6 +423,21 @@
fix_modules()
/obj/item/weapon/robot_module/peacekeeper
name = "peacekeepert robot module"
/obj/item/weapon/robot_module/peacekeeper/New()
src.modules += new /obj/item/device/flash/cyborg(src)
src.modules += new /obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg(src)
src.modules += new /obj/item/weapon/gun/energy/gun/cyborg(src)
src.modules += new /obj/item/weapon/gun/energy/plasmacutter(src)
src.modules += new /obj/item/borg/combat/shield(src)
src.modules += new /obj/item/borg/combat/mobility(src)
src.modules += new /obj/item/weapon/wrench(src) //Is a combat android really going to be stopped by a chair?
src.emag = new /obj/item/weapon/gun/energy/lasercannon/cyborg(src)
fix_modules()
/obj/item/weapon/robot_module/alien/hunter
name = "alien hunter module"