Fixing broken magic missiles, corrupted form and rev/cult tweaks (#1766)

-fix magic missiles not working
-corrupt form should not strip the wizard, should last longer and the fully upgraded form was buffed
-heads of staff, except implanted ones, can be converted to rev now
-cultists gets the cult language
-loyalty implants will stop rev convertion
-probably fixed ai and cyborgs being selected as cultists and getting access to aooc
- Fixes #1777
This commit is contained in:
Alberyk
2017-02-17 20:15:10 +02:00
committed by skull132
parent 6e16ad88ff
commit 539be7f192
10 changed files with 35 additions and 17 deletions
+1 -1
View File
@@ -231,7 +231,7 @@
/datum/language/unathi_azaziba
name = LANGUAGE_AZAZIBA
desc = "A language of Moghes consisting of a combination of spoken word and gesticulation. While waning since Moghes entered the glactic stage, it enjoys popular use by Unathi that never fell to the Hegemony's cultural dominance."
desc = "A language of Moghes consisting of a combination of spoken word and gesticulation. While waning since Moghes entered the galactic stage, it enjoys popular use by Unathi that never fell to the Hegemony's cultural dominance."
speech_verb = "hisses"
ask_verb = "hisses"
exclaim_verb = "roars"
@@ -305,11 +305,11 @@
return W.afterattack(target,src)
var/randn = rand(1, 100)
if(!(species.flags & NO_SLIP) && randn <= 25)
if(randn <= 25)
if(H.gloves && istype(H.gloves,/obj/item/clothing/gloves/force))
apply_effect(6, WEAKEN, run_armor_check(affecting, "melee"))
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
visible_message("\red <B>[M] hurls [src] to the floor!</B>")
visible_message("<span class='danger'>[M] hurls [src] to the floor!</span>")
step_away(src,M,15)
sleep(3)
step_away(src,M,15)
@@ -1,5 +1,5 @@
/datum/species/human/gravworlder
name = "grav-adapted Human"
name = "Grav-Adapted Human"
name_plural = "grav-adapted Humans"
blurb = "Heavier and stronger than a baseline human, gravity-adapted people have \
thick radiation-resistant skin with a high lead content, denser bones, and recessed \
@@ -17,7 +17,7 @@
spawn_flags = IS_RESTRICTED
/datum/species/human/spacer
name = "space-adapted Human"
name = "Space-Adapted Human"
name_plural = "space-adapted Humans"
blurb = "Lithe and frail, these sickly folk were engineered for work in environments that \
lack both light and atmosphere. As such, they're quite resistant to asphyxiation as well as \
@@ -33,7 +33,7 @@
spawn_flags = IS_RESTRICTED
/datum/species/human/vatgrown
name = "vat-grown Human"
name = "Vat-Grown Human"
name_plural = "vat-grown Humans"
blurb = "With cloning on the forefront of human scientific advancement, cheap mass production \
of bodies is a very real and rather ethically grey industry. Vat-grown humans tend to be paler than \
@@ -56,7 +56,7 @@
// These guys are going to need full resprites of all the suits/etc so I'm going to
// define them and commit the sprites, but leave the clothing for another day.
/datum/species/human/chimpanzee
name = "uplifted Chimpanzee"
name = "Uplifted Chimpanzee"
name_plural = "uplifted Chimpanzees"
blurb = "Ook ook."
icobase = 'icons/mob/human_races/subspecies/r_upliftedchimp.dmi'
@@ -23,7 +23,6 @@
amt_stunned = 3
amt_dam_fire = 10
cast_prox_range = 0
/spell/targeted/projectile/magic_missile/prox_cast(var/list/targets, atom/spell_holder)
spell_holder.visible_message("<span class='danger'>\The [spell_holder] pops with a flash!</span>")
+6 -3
View File
@@ -131,9 +131,12 @@
invocation_type = SpI_EMOTE
spell_flags = INCLUDEUSER
range = -1
duration = 100
duration = 300
charge_max = 1200
cooldown_min = 600
drop_items = 0
share_damage = 0
level_max = list(Sp_TOTAL = 3, Sp_SPEED = 2, Sp_POWER = 2)
@@ -153,7 +156,7 @@
newVars = list("name" = "\proper corruption incarnate",
"melee_damage_upper" = 35,
"resistance" = 6,
"health" = 250,
"maxHealth" = 250)
"health" = 450, //since it is foverer i guess it would be fine to turn them into some short of boss
"maxHealth" = 450)
duration = 0
return "You revel in the corruption. There is no turning back."