Skip to content

Commit

Permalink
more lol
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon committed Apr 4, 2024
1 parent 32ad922 commit d5046c5
Show file tree
Hide file tree
Showing 19 changed files with 4 additions and 1,081 deletions.
1 change: 0 additions & 1 deletion code/__DEFINES/DNA.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#define GLOWY /datum/mutation/human/glow
#define ANTIGLOWY /datum/mutation/human/glow/anti
#define TELEPATHY /datum/mutation/human/telepathy
#define FIREBREATH /datum/mutation/human/firebreath
#define VOID /datum/mutation/human/void
#define TONGUESPIKE /datum/mutation/human/tonguespike
#define TONGUESPIKECHEM /datum/mutation/human/tongue_spike/chem
Expand Down
4 changes: 0 additions & 4 deletions code/datums/components/fantasy/suffixes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,7 @@
/obj/projectile/bullet/honker = 15,
/obj/projectile/temp = 15,
/obj/projectile/ion = 15,
/obj/projectile/magic/door = 15,
/obj/projectile/magic/locker = 15,
/obj/projectile/magic/fetch = 15,
/obj/projectile/beam/emitter = 15,
/obj/projectile/magic/flying = 15,
/obj/projectile/energy/net = 15,
/obj/projectile/bullet/incendiary/c9mm = 15,
/obj/projectile/temp/hot = 15,
Expand Down
2 changes: 0 additions & 2 deletions code/datums/dna.dm
Original file line number Diff line number Diff line change
Expand Up @@ -659,8 +659,6 @@
O.Remove(src)
visible_message("<span class='danger'>[src] vomits up their [O.name]!</span>", "<span class='danger'>You vomit up your [O.name]</span>") //no "vomit up your the heart"
O.forceMove(drop_location())
if(prob(20))
O.animate_atom_living()
if(9 to 10)
ForceContractDisease(new/datum/disease/gastrolosis())
to_chat(src, "<span class='notice'>Oh, I actually feel quite alright!</span>")
Expand Down
61 changes: 0 additions & 61 deletions code/datums/mutations/actions.dm
Original file line number Diff line number Diff line change
Expand Up @@ -88,67 +88,6 @@
if(direction_text)
to_chat(user,"<span class='notice'>You consider [tracking_target]'s scent. The trail leads <b>[direction_text].</b></span>")

/datum/mutation/human/firebreath
name = "Fire Breath"
desc = "An ancient mutation that gives lizards breath of fire."
quality = POSITIVE
difficulty = 12
locked = TRUE
text_gain_indication = "<span class='notice'>Your throat is burning!</span>"
text_lose_indication = "<span class='notice'>Your throat is cooling down.</span>"
power = /obj/effect/proc_holder/spell/aimed/firebreath
instability = 30
energy_coeff = 1
power_coeff = 1

/datum/mutation/human/firebreath/modify()
if(power)
var/obj/effect/proc_holder/spell/aimed/firebreath/S = power
S.strength = GET_MUTATION_POWER(src)

/obj/effect/proc_holder/spell/aimed/firebreath
name = "Fire Breath"
desc = "You can breathe fire at a target."
school = "evocation"
charge_max = 600
clothes_req = FALSE
range = 20
projectile_type = /obj/projectile/magic/aoe/fireball/firebreath
base_icon_state = "fireball"
action_icon_state = "fireball0"
sound = 'sound/magic/demon_dies.ogg' //horrifying lizard noises
active_msg = "You built up heat in your mouth."
deactive_msg = "You swallow the flame."
var/strength = 1

/obj/effect/proc_holder/spell/aimed/firebreath/before_cast(list/targets)
. = ..()
if(iscarbon(usr))
var/mob/living/carbon/C = usr
if(C.is_mouth_covered())
C.adjust_fire_stacks(2)
C.IgniteMob()
to_chat(C,"<span class='warning'>Something in front of your mouth caught fire!</span>")
return FALSE

/obj/effect/proc_holder/spell/aimed/firebreath/ready_projectile(obj/projectile/P, atom/target, mob/user, iteration)
if(!istype(P, /obj/projectile/magic/aoe/fireball))
return
var/obj/projectile/magic/aoe/fireball/F = P
switch(strength)
if(1 to 3)
F.exp_light = strength-1
if(4 to INFINITY)
F.exp_heavy = strength-3
F.exp_fire += strength

/obj/projectile/magic/aoe/fireball/firebreath
name = "fire breath"
exp_heavy = 0
exp_light = 0
exp_flash = 0
exp_fire= 4

/datum/mutation/human/void
name = "Void Magnet"
desc = "A rare genome that attracts odd forces not usually observed."
Expand Down
5 changes: 0 additions & 5 deletions code/game/objects/items/dna_injector.dm
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,6 @@
desc = "This will make you big and strong, but give you a bad skin condition."
add_mutations = list(HULK)

/obj/item/dnainjector/firebreath
name = "\improper DNA injector (Fire Breath)"
desc = "Restores the dragon ancestry."
add_mutations = list(FIREBREATH)

/obj/item/dnainjector/xraymut
name = "\improper DNA injector (X-ray)"
desc = "Finally you can see what the Captain does."
Expand Down
1 change: 0 additions & 1 deletion code/game/objects/structures/icemoon/cave_entrance.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1047,7 +1047,6 @@ GLOBAL_LIST_INIT(ore_probability, list(
if(prob(45))
new /obj/item/dnainjector/dwarf(loc)
if(prob(35))
new /obj/item/dnainjector/firebreath(loc)
new /mob/living/simple_animal/hostile/gorilla(loc)
if(prob(35))
new /mob/living/simple_animal/hostile/gorilla(loc)
Expand Down
2 changes: 0 additions & 2 deletions code/modules/admin/verbs/randomverbs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -735,8 +735,6 @@
M.audible_message("<span class='hear'>...wabbajack...wabbajack...</span>")
playsound(M.loc, 'sound/magic/staff_change.ogg', 50, TRUE, -1)

wabbajack(M)

message_admins("Mass polymorph started by [who_did_it] is complete.")


Expand Down
75 changes: 0 additions & 75 deletions code/modules/events/wizard/magicarp.dm

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
exotic_bloodtype = "L"
disliked_food = GRAIN | DAIRY | CLOTH | GROSS
liked_food = GORE | MEAT
inert_mutation = FIREBREATH
deathsound = 'sound/voice/lizard/deathsound.ogg'
wings_icons = list("Dragon")
species_language_holder = /datum/language_holder/lizard
Expand Down
55 changes: 0 additions & 55 deletions code/modules/projectiles/ammunition/special/magic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,58 +4,3 @@
projectile_type = /obj/projectile/magic
firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/magic
heavy_metal = FALSE

/obj/item/ammo_casing/magic/change
projectile_type = /obj/projectile/magic/change

/obj/item/ammo_casing/magic/animate
projectile_type = /obj/projectile/magic/animate

/obj/item/ammo_casing/magic/teleport
projectile_type = /obj/projectile/magic/teleport
harmful = FALSE

/obj/item/ammo_casing/magic/safety
projectile_type = /obj/projectile/magic/safety
harmful = FALSE

/obj/item/ammo_casing/magic/door
projectile_type = /obj/projectile/magic/door
harmful = FALSE

/obj/item/ammo_casing/magic/fireball
projectile_type = /obj/projectile/magic/aoe/fireball

/obj/item/ammo_casing/magic/chaos
projectile_type = /obj/projectile/magic

/obj/item/ammo_casing/magic/spellblade
projectile_type = /obj/projectile/magic/spellblade

/obj/item/ammo_casing/magic/honk
projectile_type = /obj/projectile/bullet/honker

/obj/item/ammo_casing/magic/locker
projectile_type = /obj/projectile/magic/locker

/obj/item/ammo_casing/magic/flying
projectile_type = /obj/projectile/magic/flying

/obj/item/ammo_casing/magic/bounty
projectile_type = /obj/projectile/magic/bounty

/obj/item/ammo_casing/magic/antimagic
projectile_type = /obj/projectile/magic/antimagic

/obj/item/ammo_casing/magic/sapping
projectile_type = /obj/projectile/magic/sapping

/obj/item/ammo_casing/magic/necropotence
projectile_type = /obj/projectile/magic/necropotence

/obj/item/ammo_casing/magic/wipe
projectile_type = /obj/projectile/magic/wipe

/obj/item/ammo_casing/magic/nothing
projectile_type = /obj/projectile/magic/nothing
harmful = FALSE
Loading

0 comments on commit d5046c5

Please sign in to comment.