mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-10 01:49:19 +00:00
Removes dragoontomb ruin and loot. (#1290)
This commit is contained in:
CitadelStationBot
committed by
kevinz000
kevinz000
parent
fa305c2aec
commit
f8505883d4
File diff suppressed because it is too large
Load Diff
@@ -242,9 +242,3 @@
|
||||
suffix = "miracle.dmm"
|
||||
name = "Ordinary Space Tile"
|
||||
description = "Absolutely nothing strange going on here please move along, plenty more space to see right this way!"
|
||||
|
||||
/datum/map_template/ruin/space/dragoon
|
||||
id = "dragoon"
|
||||
suffix = "dragoontomb.dmm"
|
||||
name = "Sky Bulge Tomb"
|
||||
description = "A tomb of a dice-loving dragoon in space. Turns out he got too good and jumped too high. Contains the Sky Bulge, which when thrown, warps the thrower."
|
||||
|
||||
@@ -699,55 +699,3 @@
|
||||
|
||||
/obj/item/weapon/twohanded/bonespear/update_icon()
|
||||
icon_state = "bone_spear[wielded]"
|
||||
|
||||
/*
|
||||
* Sky Bulge (Gae Bolg, tradtional dragoon lance from many FF games.)
|
||||
*/
|
||||
/obj/item/weapon/twohanded/skybulge //Copy+paste job from bonespear because no explosions.
|
||||
icon_state = "sky_bulge0"
|
||||
name = "Sky Bulge"
|
||||
desc = "A legendary stick with a very pointy tip. Looks to be used for throwing. And jumping. Can be stubborn if you throw too much." //TODO: Be funnier.
|
||||
force = 10 //This thing aint for robusting.
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
slot_flags = SLOT_BACK
|
||||
force_unwielded = 10
|
||||
force_wielded = 18 //Same as regular spear. This is a utility weapon.
|
||||
throwforce = 24 //And that utility is throwing. 24 so it takes 5 hits instead of 4.
|
||||
throw_speed = 4
|
||||
embedded_impact_pain_multiplier = 0 //If you somehow embed this, it's not going to hurt.
|
||||
armour_penetration = 15 //Same as Bone Spear
|
||||
embed_chance = 0 //Would ruin the whole theme of the thing.
|
||||
hitsound = 'sound/weapons/bladeslice.ogg'
|
||||
attack_verb = list("attacked", "poked", "jabbed", "torn", "gored", "lanced") //Added lanced for flavour.
|
||||
sharpness = IS_SHARP
|
||||
var/maxdist = 16
|
||||
var/throw_cooldown = 0 //Should equate to half a second. Not supposed to be varedited.
|
||||
|
||||
/obj/item/weapon/twohanded/skybulge/update_icon()
|
||||
icon_state = "sky_bulge[wielded]"
|
||||
|
||||
/obj/item/weapon/twohanded/skybulge/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback) //Throw cooldown and offhand-proofing.
|
||||
if(throw_cooldown > world.time)
|
||||
var/mob/user = thrownby
|
||||
user.put_in_hands(src)
|
||||
return
|
||||
unwield(src)
|
||||
..()
|
||||
|
||||
/obj/item/weapon/twohanded/skybulge/throw_impact(atom/target) //Praise be the ratvar spear for showing me how to use this proc.
|
||||
var/turf/turfhit = get_turf(target)
|
||||
var/mob/user = thrownby
|
||||
var/turf/source = get_turf(thrownby)
|
||||
|
||||
if(source.z == ZLEVEL_STATION && get_dist(turfhit, source) < maxdist || source.z != ZLEVEL_STATION)
|
||||
..()
|
||||
if(do_after_mob(user, src, 5, uninterruptible = 1, progress = 0))
|
||||
if(QDELETED(src))
|
||||
return
|
||||
var/turf/landing = get_turf(src)
|
||||
if (loc != landing)
|
||||
return
|
||||
user.forceMove(landing)
|
||||
throw_cooldown = world.time + 5 //Half a second between throws.
|
||||
user.put_in_hands(src)
|
||||
playsound(src, 'sound/weapons/laser2.ogg', 20, 1)
|
||||
|
||||
@@ -1,89 +0,0 @@
|
||||
//Will probably eventually be expanded to fit multiple types of Flan because I am a nerd.
|
||||
|
||||
/mob/living/simple_animal/hostile/flan
|
||||
name = "Flan"
|
||||
desc = "Definitely not a dessert."
|
||||
var/casting = 0
|
||||
icon_state = "flan" //Required for the inheritance of casting animations.
|
||||
icon_living = "flan"
|
||||
icon_dead = "flan_dead"
|
||||
turns_per_move = 5
|
||||
environment_smash = ENVIRONMENT_SMASH_NONE
|
||||
speed = -2
|
||||
maxHealth = 50
|
||||
health = 50
|
||||
harm_intent_damage = 5
|
||||
damage_coeff = list(BRUTE = 0.75, BURN = 1.5, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
|
||||
melee_damage_lower = 5
|
||||
melee_damage_upper = 10
|
||||
attacktext = "headbutts"
|
||||
attack_sound = 'sound/weapons/punch1.ogg'
|
||||
a_intent = INTENT_HARM
|
||||
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
|
||||
unsuitable_atmos_damage = 0
|
||||
ranged = 1
|
||||
retreat_distance = 2
|
||||
minimum_distance = 4
|
||||
AIStatus = AI_IDLE
|
||||
ranged_message = "begins to cast something"
|
||||
ranged_cooldown_time = 15
|
||||
var/spellname = "a generic spell!"
|
||||
var/spellsound = 'sound/effects/spray3.ogg'
|
||||
var/spellanimation = ATTACK_EFFECT_SMASH //More in defines/misc.dm
|
||||
var/spelldamagetype = BRUTE
|
||||
var/spelldamage = 15
|
||||
var/spellcasttime = 15 //if you varedit this also varedit ranged_cooldown_time else the mob will attack again before the spell hits, looking weird but still working
|
||||
|
||||
/mob/living/simple_animal/hostile/flan/Initialize() //Required for the inheritance of casting animations.
|
||||
..()
|
||||
casting = 0
|
||||
icon_state = "[initial(icon_state)][casting]"
|
||||
|
||||
/mob/living/simple_animal/hostile/flan/proc/spellaftereffects(mob/living/A) //Inherit and override. Allows for spells that stun and do basically anything you'd want.
|
||||
return
|
||||
|
||||
/mob/living/simple_animal/hostile/flan/OpenFire(mob/living/A) //Spellcasting!
|
||||
if(isliving(A)) //A is originally an atom, this is here to prevent that from fucking this up.
|
||||
visible_message("<span class='danger'><b>[src]</b> [ranged_message] at [A]!</span>")
|
||||
casting = 1
|
||||
icon_state = "[initial(icon_state)][casting]"
|
||||
if(do_after_mob(src, A, spellcasttime, uninterruptible = 1, progress = 0)) //Break LOS to dodge.
|
||||
if(QDELETED(src))
|
||||
return
|
||||
if((A in view(src)))
|
||||
A.do_attack_animation(A, spellanimation)
|
||||
playsound(A, spellsound, 20, 1)
|
||||
A.apply_damage(damage = spelldamage,damagetype = spelldamagetype, def_zone = null, blocked = 0)
|
||||
visible_message("<span class='danger'><b>[A]</b> has been hit by [spellname]</span>")
|
||||
spellaftereffects(A,src)
|
||||
ranged_cooldown = world.time + ranged_cooldown_time
|
||||
casting = 0
|
||||
icon_state = "[initial(icon_state)][casting]"
|
||||
|
||||
/mob/living/simple_animal/hostile/flan/fire
|
||||
name = "Flame Flan"
|
||||
desc = "You'd think they'd be spicy, but nobody has ever tried."
|
||||
icon_state = "fireflan"
|
||||
icon_living = "fireflan"
|
||||
icon_dead = "fireflan_dead"
|
||||
damage_coeff = list(BRUTE = 1.5, BURN = 0.75, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
|
||||
spellname = "a Fire spell!"
|
||||
spellsound = 'sound/effects/fuse.ogg'
|
||||
spelldamagetype = BURN
|
||||
spellcasttime = 20
|
||||
|
||||
/mob/living/simple_animal/hostile/flan/fire/spellaftereffects(mob/living/A)
|
||||
A.adjust_fire_stacks(2)
|
||||
A.IgniteMob()
|
||||
|
||||
/mob/living/simple_animal/hostile/flan/water
|
||||
name = "Water Flan"
|
||||
desc = "Is pretty likely to dampen your spirits."
|
||||
icon_state = "flan"
|
||||
icon_living = "flan"
|
||||
icon_dead = "flan_dead"
|
||||
spellname = "a Water spell!"
|
||||
spelldamage = 10 //Basic flan, learn the dance with em.
|
||||
|
||||
/mob/living/simple_animal/hostile/flan/water/spellaftereffects(mob/living/A)
|
||||
A.ExtinguishMob()
|
||||
@@ -1741,7 +1741,6 @@
|
||||
#include "code\modules\mob\living\simple_animal\hostile\creature.dm"
|
||||
#include "code\modules\mob\living\simple_animal\hostile\eyeballs.dm"
|
||||
#include "code\modules\mob\living\simple_animal\hostile\faithless.dm"
|
||||
#include "code\modules\mob\living\simple_animal\hostile\flan.dm"
|
||||
#include "code\modules\mob\living\simple_animal\hostile\giant_spider.dm"
|
||||
#include "code\modules\mob\living\simple_animal\hostile\headcrab.dm"
|
||||
#include "code\modules\mob\living\simple_animal\hostile\hivebot.dm"
|
||||
|
||||
Reference in New Issue
Block a user