Random Fixes (#7683)

This commit is contained in:
FluffMedic
2024-02-04 10:00:51 -05:00
committed by GitHub
parent f134c70c9d
commit 66d0bcc78b
5 changed files with 198 additions and 42 deletions

View File

@@ -3,7 +3,7 @@
desc = "An oddly lightweight rigsuit from a strange crystaline creature."
suit_type = "crystal hardsuit"
icon = 'modular_chomp/icons/obj/rig_modules_ch.dmi'
icon_state = "aegis_rig"
icon_state = "crystal_rig"
armor = list(melee = 50, bullet = 50, laser = 30, energy = 30, bomb = 0, bio = 100, rad = 100)
emp_protection = 50

View File

@@ -58,7 +58,8 @@
reload_max = 7 // Not the best default, but it fits the pistol
ai_holder_type = /datum/ai_holder/simple_mob/merc/eclipse/ranged
loot_list = list(/obj/item/slime_extract/sepia = 0.1,
loot_list = list(/obj/item/slime_extract/sepia = 1,
/obj/item/weapon/bone/skull = 100
)
special_attack_cooldown = 15 SECONDS
@@ -257,6 +258,10 @@
glow_range = 5
glow_intensity = 3
loot_list = list(/obj/item/slime_extract/sepia = 1,
/obj/item/weapon/bone/skull/unathi = 100
)
projectiletype = /obj/item/projectile/energy/declone/burn
var/rads = 5
@@ -557,6 +562,10 @@
icon_living = "eclipse_guardian"
reload_max = 10
loot_list = list(/obj/item/slime_extract/sepia = 1,
/obj/item/slime_extract/grey = 100
)
/mob/living/simple_mob/humanoid/eclipse/solar/guardian/handle_special()
if(stat != DEAD)
heal_aura()
@@ -620,6 +629,10 @@
ranged_attack_delay = 1.5 SECONDS
hovering = TRUE
loot_list = list(/obj/item/slime_extract/sepia = 1,
/obj/item/slime_extract/grey = 100
)
var/exploded = FALSE
var/explosion_dev_range = 0
var/explosion_heavy_range = 1
@@ -700,6 +713,10 @@
icon_state = "miner"
icon_living = "miner"
loot_list = list(/obj/item/slime_extract/sepia = 1,
/obj/item/slime_extract/grey = 100
)
/mob/living/simple_mob/humanoid/eclipse/lunar/miner/do_special_attack(atom/A)
new /mob/living/simple_mob/mechanical/mining_drone/scavenger/eclipse (src.loc)
..(null,"creates a mining drone.")

View File

@@ -20,6 +20,7 @@
special_attack_min_range = 1
special_attack_max_range = 8
loot_list = list(/obj/item/weapon/gun/energy/flamegun = 100,
/obj/item/weapon/bone/skull = 100
)
@@ -132,6 +133,7 @@
loot_list = list(/obj/item/weapon/circuitboard/mecha/hades/targeting = 100,
/obj/item/weapon/circuitboard/mecha/hades/peripherals = 100,
/obj/item/weapon/circuitboard/mecha/hades/main = 100,
/obj/item/weapon/bone/skull = 100
)
var/obj/item/shield_projector/shield1 = null
@@ -208,7 +210,8 @@
/obj/item/weapon/cell/device/weapon/recharge/alien = 60,
/obj/item/weapon/bluespace_harpoon = 60,
/obj/item/weapon/flame/lighter/supermatter/syndismzippo = 60,
/obj/item/weapon/gun/energy/medigun = 60
/obj/item/weapon/gun/energy/medigun = 60,
/obj/item/weapon/bone/skull = 100
)
var/obj/item/shield_projector/shield1 = null

View File

@@ -20,12 +20,13 @@
reload_time = 10
move_delay = 0
firemodes = list(
list(mode_name="normal", fire_delay=5, projectile_type=/obj/item/projectile/energy/frostsphere, charge_cost = 80),
list(mode_name="shotgun", fire_delay=15, projectile_type=/obj/item/projectile/bullet/frostshotgun, charge_cost = 240),
)
/obj/item/weapon/gun/energy/flamegun
name = "Flame Crystal Projector"
desc = "A strange gun pulsing with energy, it's touch warming you up."
@@ -46,6 +47,8 @@
recoil_mode = 0
charge_meter = 1
move_delay = 0
charge_cost = 80
reload_time = 10
@@ -74,25 +77,28 @@
recoil_mode = 0
charge_meter = 1
move_delay = 0
charge_cost = 160
reload_time = 20
firemodes = list(
list(mode_name="fire", fire_delay=15, projectile_type=/obj/item/projectile/bullet/flamegun, charge_cost = 160),
list(mode_name="lighting", fire_delay=20, projectile_type=/obj/item/projectile/beam/lightingsurge, charge_cost = 480),
list(mode_name="frost", burst=3, fire_delay=15, projectile_type=/obj/item/projectile/energy/frostsphere, charge_cost = 240),
list(mode_name="acid", fire_delay=1, projectile_type=/obj/item/projectile/energy/muckblob, charge_cost = 10),
list(mode_name="fire", burst=1, fire_delay=15, projectile_type=/obj/item/projectile/bullet/flamegun, charge_cost = 160, modifystate="avatarfire"),
list(mode_name="lighting", burst=1, fire_delay=20, projectile_type=/obj/item/projectile/beam/lightingsurge, charge_cost = 480, modifystate="avatarlighting"),
list(mode_name="frost", burst=3, fire_delay=15, projectile_type=/obj/item/projectile/energy/frostsphere, charge_cost = 260, modifystate="avatarfrost"),
list(mode_name="acid", burst=1, fire_delay=0.5, projectile_type=/obj/item/projectile/energy/muckblob, charge_cost = 10, modifystate="avataracid"),
)
/obj/item/weapon/gun/energy/elementalray/emag_act(var/remaining_charges, var/mob/user)
..()
to_chat(user, "<span class='notice'>You short circuit the internal locking mechanisms of \the [src]!</span>")
firemodes = list(
list(mode_name="fire", fire_delay=15, projectile_type=/obj/item/projectile/bullet/flamegun, charge_cost = 160),
list(mode_name="lighting", fire_delay=20, projectile_type=/obj/item/projectile/beam/lightingsurge, charge_cost = 480),
list(mode_name="frost", burst=3, fire_delay=15, projectile_type=/obj/item/projectile/energy/frostsphere, charge_cost = 240),
list(mode_name="acid", fire_delay=1, projectile_type=/obj/item/projectile/energy/muckblob, charge_cost = 10),
list(mode_name="error", fire_delay=30, projectile_type=/obj/item/projectile/bullet/errorelement, charge_cost = 1040)
list(mode_name="fire", burst=1, fire_delay=15, projectile_type=/obj/item/projectile/bullet/flamegun, charge_cost = 160),
list(mode_name="lighting", burst=1, fire_delay=20, projectile_type=/obj/item/projectile/beam/lightingsurge, charge_cost = 480),
list(mode_name="frost", burst=3, fire_delay=15, projectile_type=/obj/item/projectile/energy/frostsphere, charge_cost = 160),
list(mode_name="acid", burst=1, fire_delay=0.5, projectile_type=/obj/item/projectile/energy/muckblob, charge_cost = 10),
list(mode_name="error", burst=1, fire_delay=30, projectile_type=/obj/item/projectile/bullet/errorelement, charge_cost = 1040),
)
return 1
@@ -130,7 +136,7 @@
on_expired_text = "<span class='notice'>You are no longer covered in muck.</span>"
stacks = MODIFIER_STACK_ALLOWED
slowdown = 0.5
slowdown = 0.2
/obj/item/weapon/gun/energy/pulseglove