Commit Graph

72 Commits

Author SHA1 Message Date
D3athrow
59cec39b90 runtime sanity 2015-08-26 17:06:09 -05:00
D3athrow
57c8aa2d22 Merge branch Bleeding-Edge into snowflake_the_world
Conflicts:
	code/game/objects/effects/overlays.dm
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/beams.dm
2015-08-25 04:18:02 -05:00
D3athrow
562c477fe1 fix being able to cast spells while being under the influcence of zombie powder. 2015-08-24 00:54:15 -05:00
D3athrow
1968448a95 something something paralysis 2015-08-23 19:28:19 -05:00
D3athrow
efbbd98ebb spell fixes 2015-08-22 16:04:58 -05:00
D3athrow
b889795a17 The world 2015-08-22 06:21:05 -05:00
D3athrow
13a64985f6 lightning tweaks 2015-08-20 19:57:42 -05:00
D3athrow
49767e3684 probably maybe fix hitting yourself with lightning on a bounce? 2015-08-19 23:41:49 -05:00
D3athrow
38c01935a6 i dont know how this is runtiming. 2015-08-17 14:49:35 -05:00
D3athrow
e9c9d94d81 sleep and lightning spell changes. 2015-08-16 17:14:17 -05:00
D3athrow
4d344fc978 zibbityzab mofugga 2015-08-16 02:34:08 -05:00
D3athrow
c3a9905811 Like wizards n shit, zap mothafucka 2015-08-15 22:45:37 -05:00
D3athrow
6751a66a4a lower fall CD to 2 minutes. 2015-08-15 15:08:38 -05:00
PJB3005
9d7ff729b6 Atom locking 2015-08-15 15:06:04 +02:00
D3athrow
4819a30550 absolutely disgusting 2015-08-14 21:32:05 -05:00
D3athrow
c427681616 worst idea in the world 2015-08-14 17:51:06 -05:00
DeityLink
32f99eb040 better-cult 2015-08-11 03:17:10 +00:00
DeityLink
9c9c336d97 better_artificer_building 2015-08-11 03:17:09 +00:00
Kurfursten
9b72bdf168 Update 2015-07-27 21:52:41 -05:00
Kurfursten
1276703a3d Delicious pie 2015-07-27 21:50:17 -05:00
ComicIronic
0285638161 Merge pull request #5462 from Intigracy/5430
Modifies silent frenchie hon hon hon making wiz spell.
2015-07-26 13:16:12 +02:00
clusterfack
6382437a63 Jaunt fix + airflow fix
Jaunt with a low enough cooldown would allow you to double cast jaunt making it flip the fuck out, so instead your spells are now silenced during jaunt. Your click and attack delayers as a jaunter are now delayed until the end of the jaunting session.

Airflow now checks for flags & invulnerable, which is the flag that is meant to prevent effects from occurring to that atom. This should fix an issue I've been seeing since hellish ZAS was recently turned on from virtualhearers and jaunters being blown into things.

Also fixed another reported bug that huds would report on invisible people, they lacked the see_invisible check that mechs had.
2015-07-26 03:09:17 -05:00
Intigracy
4c5cb34a51 Modifies frenchy curse a small bit.
Gives the new mime the forcewall spell (but not the break oath spell), makes them actually have miming set = 1 so they fail most speech checks. Gave the spell because they cannot remove the masks even with acid.

Fixes #5430
2015-07-22 05:07:42 -07:00
PJB3005
3bc5d86263 LIGHTING IS BACK.
AND A SHITLOAD FASTER.

SANIC.
2015-07-21 14:16:27 +02:00
D3athrow
d59f6a07b0 comment out panicwriter and saytesting 2015-07-20 16:04:48 -05:00
D3athrow
7a3ff4efc3 THE LIGHTING IS DEAD, LONG LIVE DAL 2015-07-18 23:05:18 -05:00
D3athrow
41d7df01fd just fuck my shit up 2015-07-18 02:30:51 -05:00
clusterfack
95a29b19fe Improves jaunt
-No longer causes 2 deletions!
-You can now see yourself while jaunting! Spoopy 125 alpha, ghost style so you know you are jaunting!
-Fuck you copypasted vampire mist proc!
-Uses standard procs for animations
-Options to enable/disable mist, change animation type
2015-07-15 22:22:42 -05:00
D3athrow
f18f105ce0 Fix issue with wizards casting spells while inside of something due to it reporting their zlevel being zero. 2015-07-12 13:26:41 -05:00
D3athrow
206d443370 I'm a fucking dumb 2015-06-24 10:45:29 -05:00
D3athrow
70a954d31a Add debug output for this. 2015-06-23 12:13:06 -05:00
PJB3005
ae7ab25539 BAY LIGHTING PEOPLE 2015-06-06 22:15:21 +02:00
ComicIronic
5726f5db06 Spell menu fixing
Spells now contain a ref to their UI element.
The UI element is now shown in the stat panel, and can be clicked. There are no easy workarounds on this.
Mind Transfer changed to use add_spell(), which should fix spells not being transferred with UI.
2015-06-06 15:39:13 +01:00
ComicIronic
df3f48183a Moves some spells to a new equipping type
Equip-type spells now read from an assoc list of slot ids and types, as well as using OOP procs for item generation.
Clowncurse, frenchcurse, and horsemask have been migrated to this system.
This is framework that hopefully clockcult and other summon-item spells can use.
2015-05-27 22:54:44 +01:00
Arthurdentist
bd4e7984c8 final 2015-05-12 17:41:47 +01:00
Arthurdentist
2a35adeef0 Add spell to spellbook and other changes 2015-05-10 19:43:26 +01:00
Arthurdentist
f7086a6481 [DNM] Clown Curse 2015-05-09 21:57:54 +01:00
D3athrow
01d2471fc9 Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge
Conflicts:
	code/ATMOSPHERICS/pipe/pipe_dispenser.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/embedded_controller/embedded_controller_base.dm
	code/modules/mining/money_bag.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/silicon/mommi/mommi.dm
	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
	code/modules/research/destructive_analyzer.dm
	code/modules/research/rdconsole.dm
	code/modules/research/xenoarchaeology/machinery/analysis_base.dm
	code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
	code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
2015-04-12 16:40:59 -05:00
Arthurdentist
42d3a56207 Final touches 2015-04-10 21:31:16 +03:00
Arthurdentist
0e7bde1f7e Shoe Snatching Charm
Might need more work but it actually works
2015-04-10 12:18:45 +03:00
ComicIronic
37a21f9836 Fixes #3786.
Was caused by checks against null users, checks against null targets, checks against null locs, and lots of nulls.
2015-04-05 23:56:28 +01:00
ComicIronic
11c3a73dc1 Fixes #3697. 2015-04-02 15:04:19 +01:00
ComicIronic
804853cb70 Fixes #3582.
Inheriting the parent proc was causing an issue with targets.
There was no check for negative range, which is occasionally used.
2015-03-27 15:51:55 +00:00
ComicIronic
247d5af9e1 Spell bugfixes.
Fixes #3571: selectable targets can now be cancelled.
Fixes #3563: spell lists are now started properly, so blocks should correctly remove spells.
Fixes #3565: user wasn't being passed properly, which was causing an issue.
Fixes #3552: regular spell smoke would cause all tiles to smoke up, so it needed custom code.
2015-03-25 19:17:12 +00:00
D3athrow
0e8e1dd51f Fixes #3565 2015-03-25 13:17:58 -05:00
d3athrow
a10d83dc06 Merge pull request #3534 from ComicIronic/SpellButtons
Spell fixes.
2015-03-24 11:31:16 -05:00
D3athrow
452eee126a french curse will not cause you to drop your pocket items, ID, or belt now. 2015-03-23 13:00:33 -05:00
ComicIronic
0dfbb0b468 Spell fixes.
Fixes #3531: the need for clothes wasn't being changed in the flags.
Fixes #3463: damage should mean fireball is no longer a dickle tickle.
2015-03-22 18:50:42 +00:00
d3athrow
9d9a09da12 Merge pull request #3421 from ComicIronic/SpellButtons
Spell HUD buttons
2015-03-21 20:09:07 -05:00
ComicIronic
794334dff4 More genetic changes.
Added the last of the icons.
Turned a few mob procs into spells.
These are : remoteobserve, melt, remotesay.
2015-03-22 00:44:11 +00:00