cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Borg Icon Optimization and Weapon Modulation (#9655)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2024-12-19 20:56:15 -07:00
committed by GitHub
parent c5fb5d13ae
commit 0192924910
26 changed files with 537 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
modular_chomp/code/modules/mob/living/silicon/robot/dogborg/dog_modules.dm
View File

@@ -6,12 +6,6 @@
if(water.energy < 5)
. += span_notice("[src] is dry.")
/obj/item/gun/energy/taser/mounted/cyborg/flare
name = "flare gun"
desc = "A flare-gun"
projectile_type = /obj/item/projectile/energy/flash/flare
fire_sound = 'sound/weapons/tablehit1.ogg'
/obj/item/shield_projector/line/exploborg
name = "expirmental shield projector"
description_info = "This creates a shield in a straight line perpendicular to the direction where the user was facing when it was activated. \
@@ -23,41 +17,6 @@
line_length = 7 // How long the line is. Recommended to be an odd number.
offset_from_center = 2 // How far from the projector will the line's center be.
/obj/item/melee/combat_borgblade/explotailspear
name = "energy tail"
desc = "A glowing tail spear with a moderate range. It appears to be extremely sharp."
force = 45
armor_penetration = 25 //30 to try and make it not useless against armored mobs but not fully nullify it.
reach = 3
projectile_parry_chance = 15.
/obj/item/melee/dogborg/jaws/big/explojaws
name = "explo jaws"
desc = "Highly lethal jaws for close range combat."
force = 60
armor_penetration = 25 //To try and make it not useless against armored mobs but not fully nullify it
projectile_parry_chance = 15
/obj/item/gun/energy/medigun/mounted/smallmedigun
name = "borg directed restoration system"
desc = "An adapted version of the BL-3 'Phoenix, for expiremental useage in borgs."
projectile_type = /obj/item/projectile/beam/medical_cell/borg
accept_cell_type = /obj/item/cell/device
cell_type = /obj/item/cell/device/weapon
charge_cost = 600
fire_delay = 6
/obj/item/projectile/beam/medical_cell/borg
range = 4
/obj/item/projectile/beam/medical_cell/borg/on_hit(var/mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(target.stat != DEAD)
target.adjustBruteLoss(-3.75)
target.adjustFireLoss(-3.75)
else
return 1
// To repair a single module
/obj/item/self_repair_system
name = "plating repair system"
@@ -133,3 +92,69 @@
power_tick = 10
repair_time = 15
repair_amount = 3
// Robot Weapons
/obj/item/gun/energy/robotic/flare
name = "flare gun"
desc = "A flare-gun"
projectile_type = /obj/item/projectile/energy/flash/flare
fire_sound = 'sound/weapons/tablehit1.ogg'
icon = 'icons/obj/gun.dmi'
icon_state = "taser"
charge_cost = 480
borg_flags = COUNTS_AS_ROBOT_GUN | COUNTS_AS_ROBOT_TASER
/obj/item/gun/energy/robotic/smallmedigun
name = "borg directed restoration system"
desc = "An adapted version of the BL-3 'Phoenix, for expiremental useage in borgs."
projectile_type = /obj/item/projectile/beam/medical_cell/borg
accept_cell_type = /obj/item/cell/device
cell_type = /obj/item/cell/device/weapon
charge_cost = 600
fire_delay = 6
force = 5
icon_state = "medbeam"
icon = 'icons/obj/gun_vr.dmi'
accuracy = 100
fire_sound = 'sound/weapons/eluger.ogg'
self_recharge = 1
use_external_power = 1
/obj/item/projectile/beam/medical_cell/borg
range = 4
/obj/item/projectile/beam/medical_cell/borg/on_hit(var/mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(target.stat != DEAD)
target.adjustBruteLoss(-3.75)
target.adjustFireLoss(-3.75)
else
return 1
/obj/item/melee/robotic/blade/explotailspear
name = "energy tail"
desc = "A glowing tail spear with a moderate range. It appears to be extremely sharp."
force = 45
armor_penetration = 25 //30 to try and make it not useless against armored mobs but not fully nullify it.
reach = 3
projectile_parry_chance = 15.
/obj/item/melee/robotic/jaws/big/explojaws
name = "explo jaws"
desc = "Highly lethal jaws for close range combat."
force = 60
armor_penetration = 25 //To try and make it not useless against armored mobs but not fully nullify it
projectile_parry_chance = 15
/obj/item/gun/energy/robotic/phasegun
name = "EW26 Artemis Mounted"
desc = "The RayZar EW26 Artemis, also known as the 'phase carbine', is a downsized energy-based weapon specifically designed for use against wildlife. This one has a safety interlock that prevents firing while in proximity to the facility." //ChompEDIT
description_fluff = "RayZar is Ward-Takahashi’s main consumer weapons brand, known for producing and licensing a wide variety of specialist energy weapons of various types and quality primarily for the civilian market."
icon = 'icons/obj/gun.dmi'
icon_state = "phasecarbine"
charge_cost = 160
recharge_time = 16
projectile_type = /obj/item/projectile/energy/phase
use_external_power = 1
self_recharge = 1
borg_flags = COUNTS_AS_ROBOT_GUN | COUNTS_AS_ROBOT_LASER

8
modular_chomp/code/modules/mob/living/silicon/robot/modules/exploration.dm
View File

@@ -29,15 +29,15 @@
/obj/item/robot_module/robot/exploration/New(var/mob/living/silicon/robot/R)
src.modules += new /obj/item/dogborg/sleeper/exploration(src)
src.modules += new /obj/item/cataloguer(src)
src.modules += new /obj/item/gun/energy/taser/mounted/cyborg/flare(src)
src.modules += new /obj/item/gun/energy/robotic/flare(src)
src.modules += new /obj/item/dogborg/pounce(src)
src.modules += new /obj/item/melee/combat_borgblade/explotailspear(src)
src.modules += new /obj/item/gun/energy/medigun/mounted/smallmedigun(src)
src.modules += new /obj/item/melee/robotic/blade/explotailspear(src)
src.modules += new /obj/item/gun/energy/robotic/smallmedigun(src)
src.modules += new /obj/item/shield_projector/line/exploborg(src)
src.modules += new /obj/item/roller_holder(src)
src.modules += new /obj/item/self_repair_system(src)
src.modules += new /obj/item/card/id/exploration/borg(src)
src.emag += new /obj/item/melee/dogborg/jaws/big/explojaws(src)
src.emag += new /obj/item/melee/robotic/jaws/big/explojaws(src)
..()

20
modular_chomp/code/modules/mob/living/silicon/robot/sprites/combat.dm
View File

@@ -27,17 +27,7 @@
/datum/robot_sprite/dogborg/wide/combat
module_type = "Combat"
has_custom_equipment_sprites = TRUE
var/has_gun_sprite = FALSE
var/has_taser_sprite = FALSE
var/has_blade_sprite = FALSE
/datum/robot_sprite/dogborg/wide/combat/handle_extra_icon_updates(var/mob/living/silicon/robot/ourborg)
if(has_gun_sprite && (istype(ourborg.module_active, /obj/item/gun/energy/laser/mounted) || istype(ourborg.module_active, /obj/item/gun/energy/lasercannon/mounted)))
ourborg.add_overlay("[sprite_icon_state]-laser")
if (has_taser_sprite && (istype(ourborg.module_active, /obj/item/gun/energy/taser/mounted/cyborg/ertgun)))
ourborg.add_overlay("[sprite_icon_state]-taser")
if (has_blade_sprite && (istype(ourborg.module_active, /obj/item/melee/combat_borgblade)))
ourborg.add_overlay("[sprite_icon_state]-blade")
has_eye_sprites = FALSE
/datum/robot_sprite/dogborg/wide/combat/blade/do_equipment_glamour(var/obj/item/robot_module/module)
if(!has_custom_equipment_sprites)
@@ -45,11 +35,11 @@
..()
var/obj/item/melee/combat_borgblade/CBB = locate() in module.modules
var/obj/item/melee/robotic/blade/CBB = locate() in module.modules
if(CBB)
CBB.name = "combat saw"
CBB.desc = "A high frequency blade attached to the end of a cyborg's tail. It appears to be extremely sharp."
var/obj/item/melee/borg_combat_shocker/BCS = locate() in module.modules
var/obj/item/melee/robotic/borg_combat_shocker/BCS = locate() in module.modules
if(BCS)
BCS.name = "combat jaws"
BCS.desc = "Shockingly chompy!"
@@ -64,6 +54,4 @@
sprite_icon_state = "blade"
sprite_hud_icon_state = "ert"
rest_sprite_options = list()
has_gun_sprite = TRUE
has_taser_sprite = TRUE
has_blade_sprite = TRUE
sprite_flags = ROBOT_HAS_LASER_SPRITE | ROBOT_HAS_DISABLER_SPRITE | ROBOT_HAS_DAGGER_SPRITE

8
modular_chomp/code/modules/mob/living/silicon/robot/sprites/security.dm
View File

@@ -4,8 +4,6 @@
sprite_icon_state = "secvale"
sprite_hud_icon_state = "k9"
has_eye_light_sprites = TRUE
has_laser_sprite = FALSE //Missing from the dmi
has_taser_sprite = FALSE //ditto
/datum/robot_sprite/dogborg/security/cat
name = "Cat"
@@ -13,8 +11,6 @@
sprite_icon_state = "vixsec"
sprite_hud_icon_state = "k9"
has_eye_light_sprites = TRUE
has_laser_sprite = FALSE //Missing from the dmi
has_taser_sprite = FALSE //ditto
/datum/robot_sprite/dogborg/tall/security/dullahan
@@ -25,8 +21,6 @@
name = "Dullahan"
sprite_icon_state = "dullahansec"
sprite_hud_icon_state = "k9"
has_laser_sprite = FALSE //Missing from the dmi
has_taser_sprite = FALSE //ditto
has_eye_light_sprites = TRUE
has_vore_belly_sprites = TRUE
@@ -34,8 +28,6 @@
name = "Dullahan v2"
sprite_icon_state = "dullahansec_alt"
sprite_hud_icon_state = "k9"
has_laser_sprite = FALSE //Missing from the dmi
has_taser_sprite = FALSE //ditto
has_eye_light_sprites = TRUE
has_vore_belly_sprites = TRUE