mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-24 13:47:33 +01:00
Random Fixes (#7683)
This commit is contained in:
+18
-1
@@ -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.")
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user