Commit Graph

280 Commits

Author SHA1 Message Date
Kurfursten
a9eab4bb4f Merge pull request #23047 from small-boss/highlanderbundle
Highlander Bundle for Uplink
2019-06-01 14:23:24 -05:00
Shifty/Anthomansland
d834f05564 Merge branch 'Bleeding-Edge' of https://github.com/vgstation-coders/vgstation13 into Holyweapons 2019-05-30 19:17:42 +02:00
Kurfursten
176cb1dafa Merge pull request #23050 from I-VAPE-VOX-CLOACA-EVERY-DAY-OF-MY-LIFE/ee
Fixes slight goof in rare episode names
2019-05-27 02:33:29 -05:00
I-VAPE-VOX-CLOACA-EVERY-DAY-OF-MY-LIFE
4cd738be6e Typo 2019-05-26 22:29:26 -03:00
smallboss
11e531f1aa Highlander Uplink Bundle 2019-05-26 21:25:49 +02:00
boy2mantwicethefam
bc18793706 Renames every instance of wizmobile into firebird (#23043)
* Renames every instance of wizmobile into firebird

* Update test_box.dmm
2019-05-26 21:25:41 +02:00
boy2mantwicethefam
15de47e4a8 Disorient spell now has an empowered variant (#22764)
* Disorient empowerment

* note

* Like what Tencent says, "To copy is not evil", but I am no chink and instead it fucked me up

* Bugfix

* Consistency
2019-05-21 07:15:20 -05:00
Dimitar Dihanov
eca6d83a0d fixed slip on tele (#22843) 2019-05-08 12:08:16 -05:00
Shifty/Anthomansland
13336719d3 Vampires and holy weapons : a mini rework 2019-05-06 20:16:11 +02:00
DamianX
df475913aa Fixed targeted mind_affecting spells not checking for tinfoil hats (#22801) 2019-05-06 12:03:31 -03:00
ShiftyRail
d9475e11d4 Mist form removes restraints (#22564) 2019-04-28 10:55:14 -03:00
ShiftyRail
9a2cff9326 Chaplains are ALWAYS resistant to vampire powers (#22561) 2019-04-28 10:54:21 -03:00
ShiftyRail
af5f51f6f1 Changes the shapeshift spell to be more flexible. (#22559)
* WiP

* How could this happen
2019-04-28 10:53:33 -03:00
ShiftyRail
acd768878d Shadowstep removes restrains (#22563) 2019-04-28 10:52:52 -03:00
boy2mantwicethefam
2290f1826c Here's your fix bro (#22586) 2019-04-27 12:49:31 -07:00
boy2mantwicethefam
1c6597c66c Bugfix to bugfix 2019-04-25 14:16:04 +03:00
boy2mantwicethefam
f50356f500 Bugfix 2019-04-25 13:33:22 +03:00
Shifty/Anthomansland
6c90ad78b0 Rambler 2019-04-07 23:16:27 +02:00
Shifty/Anthomansland
d897698792 Makes shapeshift less retarded 2019-04-07 23:11:34 +02:00
boy2mantwicethefam
76051f72e0 Brian Damag and the prisoners of Shoutstakistan (#22149)
* yes

* Brian

* bruh moment

* local man kills very popular and widely appreciated reference, depriving an entire generation of a possible cultural revolution.

* adds a new invocation line as per suggestion

* Oops
2019-03-27 14:17:47 -03:00
boy2mantwicethefam
a2a7437ca9 FIXES LIGHTNING (#22007) 2019-03-11 16:15:08 -05:00
SirSkeleto
c7c8be5b91 Buffs cheat death by letting you keep at most 10 blood. (#21676)
* Update undeath.dm

* Update undeath.dm
2019-02-26 14:27:41 -06:00
MadmanMartian
0dcf631f1a Adds Ice Barrage (#21621)
* Adds Ice Barrage

* NO SENSE OF RIGHT OR WRONG

* Some runtime fixes

* Fixes conflicts
2019-02-26 12:57:55 -06:00
boy2mantwicethefam
8499ca67d4 Merge branch 'Bleeding-Edge' into It's-treason-then 2019-02-19 12:17:12 +02:00
MadmanMartian
d8e562439e Fixes being able to spam out bunches of overlays as an artificer (#21724) 2019-02-17 08:24:56 -03:00
boy2mantwicethefam
678d486a4e Adds the clothes and a halved damage version of the spell, adds sandals for wizard garb 2019-02-16 11:39:15 +02:00
dylanstrategie
99c16287d0 Teleport cooldown changed to 45 sec, minus 10 per upgrade, 5 sec min (#21601) 2019-02-10 13:18:42 -03:00
dylanstrategie
03dc6ec05a Nerf Blink's smoke to not act like a free smoke bomb spam spell (#21600) 2019-02-09 12:07:34 -08:00
MadmanMartian
9f4ae5e2a4 Removes blinded from glare (#21573) 2019-02-08 11:12:55 -03:00
boy2mantwicethefam
0a908f5d28 Adds the brain damage spell for Wizards. (#21229)
* Adds the brain damage spell.

- The code itself, a spell that deals 30 brain damage on click and 90 brain damage when upgraded
- New brain damage var for targeted spells
- Two new icons, for normal and upgraded versions of the spell (icons done by MadmanMartian)
- Allows for multiple possible invocations when using spells, from brain-damage lines and Scrungularity. Literally impossible without MadmanMartian

* Update retard.dm

* Nerfs brain damage spell

* nerfs cooldown

* fixes conflict

* 1

* 2

* 3

* Revert "3"

This reverts commit 5f72d6ae07.

* YOU SHIT

* GITHUB YOU FUCK IT'S NOT A CONFLICT IF IT CHANGES THE FILE AND EVERYTHING STILL EXISTS

* 4

* Revert "4"

This reverts commit 09d64a3a8d.

* 5

* forgot this one
2019-02-06 15:20:39 -03:00
MadmanMartian
4f3e37d2f3 The thing can not cast fist if it has no hands (#21483)
* The thing can not punch if it has no hands

* BETTER HAND CHECKS
2019-02-04 09:15:21 -03:00
I_VAPE_VOX_CLOACA_EVERY_DAY_OF_MY_LIFE
9379df85d0 Names 2019-01-25 17:15:43 -03:00
MadmanMartian
bafef13a8b Prestidigitation bundle (#20617)
* Prestidigitation bundle

Adds a bundle that grants an assortment of spells
 - Extinguish: Extinguish the target
 - Sparks: Create sparks at the given location
 - Clean: Cleans the targeted object
 - Dirty: Drops the targeted object into the realm of blood for a moment, covering it in ichor
 - Summon mundane trinket: Creates a coin for 30 seconds
 - Warm object: Warms the targeted object
 - Cool object: Cools the targeted object

* Capitalism

* TRADER COIN
2019-01-15 09:57:52 -03:00
ShiftyRail
5637481bd5 Fixes a compile warning (#21270) 2019-01-09 16:15:31 +00:00
Emilc4h
4844c533ed Fixes Time Stop's upgrade text (#21215) 2019-01-03 16:56:56 -03:00
I-VAPE-VOX-CLOACA-EVERY-DAY-OF-MY-LIFE
cd48baef1f Credits use [audio] instead of world << (#21153)
* Just having some fun with episode names

* Credits use [audio] instead of world <<

* More episode names

* THE GANG SUGGESTS EPISODE NAMES

* Makes some names more common to account for namebloat

* MORE NAMES

* Names for revs and successful nukies
2019-01-01 20:35:41 -03:00
MadmanMartian
e7784cdcfc Unatomic spell tweaks (#21181)
Adds a new flag for spells for whether they are preserved on mindswap.
Fist spell is no longer preserved on Mind Transfer.
Spell code now uses a setter for setting the holder.
Staff of change no longer preserves spells in its own way, so now it defaults down to Role/PostMindTransfer
2019-01-01 20:34:40 -03:00
ShiftyRail
87aa86a97d Sanity for vampire spells (#21109) 2018-12-26 08:04:38 -03:00
ShiftyRail
f60c92c498 Nullrods now blocks vamp spells, unless vamp is young (#21019)
* Nullrods now blocks unmature vamp spells.

* Mature => Immature
2018-12-16 16:39:08 -08:00
MadmanMartian
7b33cd990c Holy futureproofing (#21024)
Rather than several istype(I, /obj/item/weapon/nullrod), now it uses macros

Two macros:

 - Isholyweapon: Used when checking if something is being struck by something holy
 - Isholyprotection: Used when checking if there's something holy that may protect the user
2018-12-13 15:12:00 +01:00
DeityLink
32e430e013 cultfixes (#20932) 2018-12-06 21:18:03 -03:00
DeityLink
e35719ecea Cult 3.0 (#20662)
* altar stuff

* bloodstone

* dance

* objectives

* Early fixes

* some fixes

* conflicts etc
2018-11-11 20:51:37 -02:00
soyconsumer
33599c0592 Small vamp fixes (#20656)
* adds blood cost to Rejuvenate

* Update undeath.dm
2018-11-11 15:37:11 +01:00
ShiftyRail
bf8f48b0c4 Fixes stuff with vampire. (#20580) 2018-11-06 00:15:44 +00:00
MadmanMartian
e1070740af Hot pumpkin! (#20525)
* Hot pumpkin!

* remove slash
2018-11-01 18:02:35 +01:00
soyconsumer
6d12bd9026 added blood costs to name (#20469) 2018-10-27 14:21:11 -07:00
Kyunny
fb4f17de6c Wizard spell for breaking lightbulbs. (#20199)
* Wizard spell for breaking lightbulbs.

* Update vgstation13.dme

* update
2018-10-20 21:22:33 +01:00
Shadowmech88
8110f34870 Fixes NPC Wizards Speaking in Deadchat (#19963)
* NPC wizards should no longer die before saying their death phrase.

* Uses invisibility instead of alpha.

* Doppelgangers only live once.
2018-10-20 14:49:24 +01:00
DamianX
afc1db14de Fixed mime walls having no sprite and freezing clients on examine (#20269) 2018-10-18 01:16:31 -04:00
Shadowmech88
18f9fc718b Fixes the eat power not allowing you to eat your handcuffs while restrained. (#20194) 2018-10-17 07:14:05 -03:00