shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New Content Update (#43)

Browse Source 
* New Content Update

* readded shuttle autocall
This commit is contained in:
unusualcrow
2016-09-18 13:04:47 -04:00
committed by TalkingCactus
parent 8a9bbcf97d
commit 24c10b1b7f
52 changed files with 972 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
+25 -24
View File
@@ -118,37 +118,38 @@
force = 25
damtype = BURN
hitsound = 'sound/weapons/sear.ogg'
var/obj/machinery/lavaland_controller/linked_machine
var/storm_cooldown = 0
/obj/item/weapon/staff_of_storms/attack_self(mob/user)
if(storm_cooldown > world.time)
user << "<span class='warning'>The staff is still recharging!</span>"
return
if(user.z != ZLEVEL_LAVALAND)
user << "<span class='warning'>You can't seem to control the weather here!</span>"
return
if(!linked_machine || linked_machine.z != user.z)
for(var/obj/machinery/lavaland_controller/controller in machines)
if(controller.z == user.z)
linked_machine = controller
break
var/datum/weather/ash_storm/A
for(var/V in SSweather.existing_weather)
var/datum/weather/W = V
if(W.name == "ash storm")
A = W
break
if(!A)
user << "<span class='warning'>How odd! The planet seems to have lost its atmosphere!</span>"
return
if(linked_machine && linked_machine.ongoing_weather)
if(linked_machine.ongoing_weather.stage == WIND_DOWN_STAGE || linked_machine.ongoing_weather.stage == END_STAGE)
user << "<span class='warning'>The storm is already ending. It would be a waste to use the staff now.</span>"
if(A.stage != END_STAGE)
if(A.stage == WIND_DOWN_STAGE)
user << "<span class='warning'>The storm is already ending! It would be a waste to use the staff now.</span>"
return
user.visible_message("<span class='warning'>[user] holds [src] skywards, causing its orb to flare!</span>", \
"<span class='notice'>With an appropriately dramatic flourish, you dispel the storm!</span>")
playsound(get_turf(src),'sound/magic/Staff_Change.ogg', 200, 0)
storm_cooldown = world.time + 600
linked_machine.ongoing_weather.stage = WIND_DOWN_STAGE
linked_machine.ongoing_weather.weather_wind_down()
else if (linked_machine && !linked_machine.ongoing_weather)
user.visible_message("<span class='warning'>[user] holds [src] skywards, causing its orb to flare!</span>", \
"<span class='danger'>You lift your staff skywards, calling down a terrible storm!</span>")
playsound(get_turf(src),'sound/magic/Staff_Chaos.ogg', 200, 0)
storm_cooldown = world.time + 600
linked_machine.weather_cooldown = 0
user.visible_message("<span class='warning'>[user] holds [src] skywards as an orange beam travels into the sky!</span>", \
"<span class='notice'>You hold [src] skyward, dispelling the ash storm!</span>")
playsound(user, 'sound/magic/Staff_Change.ogg', 200, 0)
A.wind_down()
else
user << "You can't seem to control the weather here."
user.visible_message("<span class='warning'>[user] holds [src] skywards as red lightning crackles into the sky!</span>", \
"<span class='notice'>You hold [src] skyward, calling down a terrible storm!</span>")
playsound(user, 'sound/magic/Staff_Chaos.ogg', 200, 0)
A.telegraph()
storm_cooldown = world.time + 600
code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
+2 -2
View File
@@ -15,6 +15,7 @@
var/icon_aggro = null // for swapping to when we get aggressive
see_in_dark = 8
see_invisible = SEE_INVISIBLE_MINIMUM
mob_size = MOB_SIZE_LARGE
/mob/living/simple_animal/hostile/asteroid/Aggro()
..()
@@ -264,7 +265,7 @@
else
feedback_add_details("hivelord_core", "[type]|stabilizer")
/obj/item/organ/hivelord_core/proc/go_inert()
inert = TRUE
desc = "The remains of a hivelord that have become useless, having been left alone too long after being harvested."
@@ -660,7 +661,6 @@
move_to_delay = 6
transform *= 2
environment_smash = 2
mob_size = MOB_SIZE_LARGE
speed = 1
addtimer(src, "Deflate", 100)