Fixes and minor change

- Fixes goliaths infinitely dropping hides.
- Makes the basilisk anti-infinidrop bug not use a var specifically for
it, and instead just check if the mob is already dead before trying to
drop (living basilisks will drop items, THEN die).
- Minor mapping changes (added lights I forgot to add to previously
changed areas, made the entrance area of the western mining outpost
slightly larger and added another air vent to it.)
This commit is contained in:
DZD
2015-07-29 17:14:00 -04:00
parent 9c46fe994b
commit c11effafa0
2 changed files with 52 additions and 51 deletions
@@ -80,7 +80,6 @@
aggro_vision_range = 9
idle_vision_range = 2
turns_per_move = 5
var/droppeddiamond = 0 // Safety check to prevent diamond duplication bug
/obj/item/projectile/temp/basilisk
name = "freezing blast"
@@ -113,12 +112,11 @@
adjustBruteLoss(110)
/mob/living/simple_animal/hostile/asteroid/basilisk/Die()
if(!droppeddiamond)
if(stat != DEAD)
var/counter
for(counter=0, counter<2, counter++)
var/obj/item/weapon/ore/diamond/D = new /obj/item/weapon/ore/diamond(src.loc)
D.layer = 4.1
droppeddiamond = 1
..()
/mob/living/simple_animal/hostile/asteroid/goldgrub
@@ -354,7 +352,7 @@
speed = 3
maxHealth = 300
health = 300
harm_intent_damage = 0
harm_intent_damage = 1 //Only the manliest of men can kill a Goliath with only their fists.
melee_damage_lower = 25
melee_damage_upper = 25
attacktext = "pulverizes"
@@ -382,6 +380,9 @@
/mob/living/simple_animal/hostile/asteroid/goliath/Die()
anchored = 0
if(stat != DEAD)
var/obj/item/asteroid/goliath_hide/G = new /obj/item/asteroid/goliath_hide(src.loc)
G.layer = 4.1
..()
/mob/living/simple_animal/hostile/asteroid/goliath/OpenFire()
@@ -441,18 +442,14 @@
M.Stun(5)
M.adjustBruteLoss(rand(10,15))
latched = 1
visible_message("<span class='danger'>The [src.name] grabs hold of [M.name]!</span>")
if(src && M)
visible_message("<span class='danger'>The [src.name] grabs hold of [M.name]!</span>")
if(!latched)
qdel(src)
else
spawn(50)
qdel(src)
/mob/living/simple_animal/hostile/asteroid/goliath/Die()
var/obj/item/asteroid/goliath_hide/G = new /obj/item/asteroid/goliath_hide(src.loc)
G.layer = 4.1
..()
/obj/item/asteroid/goliath_hide
name = "goliath hide plates"
desc = "Pieces of a goliath's rocky hide, these might be able to make your suit a bit more durable to attack from the local fauna."