Merge pull request #10473 from Aurorablade/HONK

Ports Clown Goblins, Adds Honk Missle, Fixes Space Carp Event, Adds Honomoly Event
This commit is contained in:
variableundefined
2018-12-24 09:20:24 +08:00
committed by GitHub
9 changed files with 104 additions and 3 deletions
+1
View File
@@ -170,6 +170,7 @@ var/list/event_last_fired = list()
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Brand Intelligence", /datum/event/brand_intelligence, 50, list(ASSIGNMENT_ENGINEER = 25), 1),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Space Dust", /datum/event/dust, 50, list(ASSIGNMENT_ENGINEER = 50)),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Dimensional Tear", /datum/event/tear, 0, list(ASSIGNMENT_SECURITY = 35)),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Honknomoly", /datum/event/tear/honk, 0),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Vent Clog", /datum/event/vent_clog, 250),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Wormholes", /datum/event/wormholes, 150),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Pyro Anomaly", /datum/event/anomaly/anomaly_pyro, 75, list(ASSIGNMENT_ENGINEER = 60)),
+1 -1
View File
@@ -1,4 +1,4 @@
/datum/event/carp_migration
/datum/event/carp_migration/koi
spawned_mobs = list(
/mob/living/simple_animal/hostile/retaliate/carp/koi = 95,
/mob/living/simple_animal/hostile/retaliate/carp/koi/honk = 2,
+3 -2
View File
@@ -28,6 +28,7 @@
density = 0
anchored = 1
luminosity = 3
var/list/tear_critters = list()
/obj/effect/tear/New()
..()
@@ -38,10 +39,10 @@
animation.master = src
// flick("newtear",usr)
spawn(15)
if(animation) qdel(animation)
if(animation)
qdel(animation)
spawn(rand(30,120))
var/list/tear_critters = list()
for(var/T in typesof(/mob/living/simple_animal))
var/mob/living/simple_animal/SA = T
if(initial(SA.gold_core_spawnable) == CHEM_MOB_SPAWN_HOSTILE)
+41
View File
@@ -0,0 +1,41 @@
/datum/event/tear
var/obj/effect/tear/honk/HE //i could just inherit but its being finicky.
/datum/event/tear/honk/announce()
event_announcement.Announce("A Honknomoly has opened. Expected location: [impact_area.name].", "Honknomoly Alert", 'sound/items/airhorn.ogg')
/datum/event/tear/honk/start()
var/turf/T = pick(get_area_turfs(impact_area))
if(T)
HE = new /obj/effect/tear/honk(T.loc)
/datum/event/tear/end()
if(HE)
qdel(HE)
/obj/effect/tear/honk
name="Honkmensional Tear"
desc="A tear in the dimensional fabric of sanity."
icon='icons/effects/tear.dmi'
icon_state="tear"
tear_critters = list(/mob/living/simple_animal/hostile/retaliate/clown/goblin)
/obj/effect/tear/honk/New()
var/atom/movable/overlay/animation = null
animation = new(loc)
animation.icon_state = "newtear"
animation.icon = 'icons/effects/tear.dmi'
animation.master = src
spawn(15)
if(animation)
qdel(animation)
spawn(rand(30,120))
for(var/i in 1 to 6)
var/chosen = pick(tear_critters)
var/mob/living/simple_animal/C = new chosen
C.forceMove(get_turf(src))
if(prob(50))
for(var/j = 1, j <= rand(1, 3), j++)
step(C, pick(NORTH,SOUTH,EAST,WEST))
@@ -29,3 +29,23 @@
heat_damage_per_tick = 15 //amount of damage applied if animal's body temperature is higher than maxbodytemp
cold_damage_per_tick = 10 //same as heat_damage_per_tick, only if the bodytemperature it's lower than minbodytemp
unsuitable_atmos_damage = 10
/mob/living/simple_animal/hostile/retaliate/clown/goblin
name = "clown goblin"
desc = "A tiny walking mask and clown shoes. You want to honk his nose!"
icon_state = "clowngoblin"
icon_living = "clowngoblin"
icon_dead = null
response_help = "honks the"
speak = list("Honk!")
speak_emote = list("sqeaks")
emote_see = list("honks")
maxHealth = 100
health = 100
speed = -1
turns_per_move = 1
del_on_death = TRUE
loot = list(/obj/item/clothing/mask/gas/clown_hat, /obj/item/clothing/shoes/clown_shoes)