Commit Graph

161 Commits

Author SHA1 Message Date
oranges 41a6efd987 Revert "Fixes instant summons and probably a few other edge cases" (#22917) 2017-01-10 20:55:26 -05:00
Joan Lung 75999e1c6c Fixes instant summons and probably a few other edge cases (#22890)
* Fixes instant summons and probably a few other edge cases

* woken in a fog don't sweat it
and reckon none of it had come from you

* echo

* no lesson in magic, just untimely dreams

* slapdash code queen
2017-01-11 12:53:05 +13:00
oranges 2f5a1a519b Merge pull request #22840 from KorPhaeron/summon_item
Fixes embedded object interaction with instant summons
2017-01-10 10:11:31 +13:00
KorPhaeron 7dc40c46e6 Fixes embedded object interaction with instant summons 2017-01-07 22:39:15 -06:00
Joan Lung be6a7642a6 hmm 2017-01-06 17:01:18 -05:00
Joan Lung 5b59050d15 ) 2017-01-06 16:57:17 -05:00
Joan Lung b0f3a27261 Changes a few things into temporary visual effects 2017-01-06 16:45:36 -05:00
Kyle Spier-Swenson bee4b132a3 [READY]Makes addtimer use callbacks (#22660)
* Makes addtimer use callbacks

* I broke the comment

* I fucked up the regex

* this was a silly idea.
2017-01-04 16:02:56 +13:00
Kyle Spier-Swenson 280dbe20c3 [Ready] SSthrowing + callbacks! (#22476)
* SSthrowing + callbacks!
Throwing is now a subsystem.
It's low priority, but is a ticker subsystem so is ran before most other subsystems.
To allow for shit to run after the throw finishes, throwing now supports a callback.
A callback datum system was created, conversion of addtimer is planned for another PR.
Throwing now has a limit of 2048 turfs (was 600)
Throwing now ticks every world.tick, and properly converts the speed arg from 1ds to what ever tick_lag is.
Throwing now properly accounts for missed ticks.
Throwing no longer uses sleep.
Throwing should no longer lag since it's not filling the sleep queue up

* Smoother tentacles

* Some improvements

* Missed a spot.

* Makes shit quicker.
Inlines the thrownthing.tick() proc.
Raises missed ticks value
Lowers max dist value
Inlines the two sister overrides for /atom/movable/Moved() because that just seemed like a waste

* >PRs open that use procs i'm removing.

* STOP THE PRESSES!

* throw_at now runs the first throw tick() immediately
This will help some with throwing while running.

* Item throwing now imparts the momentum of the user throwing.

(ie, running in the direction you are throwing makes you throw faster, running away from the direction you are throwing makes you throw the item slower)

* Moves throwing momentum from carbon/throw_item to movable/throw_at.
There are other things that cause a mob to "throw" an item, I figured we keep this universal since thrower is already an arg.

* Explosions throw shit faster.
This was stupid, "Hey, lets set the item's throw_speed to 4 so embedding works, but lets make it throw at the base 2 throw speed for no reason."

* Fixes explosion embedding.
This also acts as a nice example of how to override a callback in an override of throw_at properly.
2017-01-02 20:08:03 +11:00
Incoming5643 a57cb1ec21 Fixes the charge spell with being too greedy with charges 2016-12-26 01:12:07 -05:00
Incoming5643 123426b9c9 Fixes all the occasions where a wizard could find/make sandals and get the nerfed sandals instead of the new ones introduced in #22164 (#22237) 2016-12-17 14:22:46 -05:00
Mervill c2e2440953 Merge branch 'master' into w_class
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
2016-12-02 21:44:24 -08:00
Mervill 09ea5ad2e5 w_class now uses defines 2016-12-01 21:33:14 -08:00
Mervill 01d4232570 Remove slash from end of type refs/defs 2016-11-30 19:23:15 -08:00
Remie Richards b82f4111be New Devil Obligation: Dance Off (#21765)
* New Devil Obligation: Dance Off
New Devil Spell: Summon Dancefloor

* Typofix

* typofix round 2
2016-11-28 23:04:45 +13:00
oranges af7e6d1323 Fixes all remaining addtimers missed 2016-11-27 08:31:07 +00:00
oranges b5e898ce4c Merge pull request #21615 from KorPhaeron/dragon_form
Changes to drake transformation
2016-11-20 14:52:46 +13:00
Incoming5643 0f3b7d459e Adds the warp whistle and summon magic 2016 (#21599)
* Adds the warp whistle, and updates summon magic

* spelling counts

* Changes things up to account for qdeletion

* Don't code in the web editor
2016-11-19 22:31:42 +13:00
Incoming5643 fe7656b953 Repairs the charge spell's effects on guns (#21593)
* Repairs the charge spell's effects on guns

* Had placed a check in the wrong elif, my bad
2016-11-18 22:57:25 +01:00
KorPhaeron 79636a23e6 Dragon Form 2016-11-17 22:02:09 -06:00
Lzimann 1f4a5434c8 Fixes conflicts and updates spell description. 2016-11-13 22:05:57 -02:00
oranges 3d72f09de2 Merge pull request #21507 from coiax/phylactery-poi
Lich phylacteries are now points of interest
2016-11-14 12:01:20 +13:00
Lzimann ba0af67f47 Adds a way to disallow having certains spells together. Only added to lesser summon guns/arcane barrage for now. 2016-11-13 20:10:52 -02:00
Lzimann dc1aebd403 Uncomment the throw/message after shooting with the regular enchanted mosin. 2016-11-13 17:44:30 -02:00
Lzimann 9d23e5ab3c Changes the Lesser Summon guns to Arcane barrage. 2016-11-13 17:30:42 -02:00
oranges be360f628b Merge pull request #21480 from GunHog/Of_Wizards_And_Fireballs
Wizard Fireball Auto-Disable
2016-11-13 10:48:35 +13:00
Jack Edge 46f2bd13d0 Lich phylacteries are now points of interest
🆑 coiax
add: Lich phylacteries are now in the "points of interest" for ghosts.
/🆑

Also, a phylactery just appends to the description of the item, rather
than clobbering it.

Balance consideration: if a lich summons magic and a crewmember get a
scrying orb, they'll be able to locate the phylactery immediately. So I
guess this is a lich nerf?
2016-11-12 18:44:56 +00:00
Cheridan 0e99bd6100 Merge pull request #21469 from ChangelingRain/pronouns
Couple more pronoun things
2016-11-11 22:33:22 -06:00
Joan Lung 1a608de394 Merge pull request #21453 from KorPhaeron/forcwall
Buffs Forcewall
2016-11-11 14:46:02 -05:00
GunHog 3d7631a559 Move auto-disable to cast line
Will only auto-disable if cast suceeded
2016-11-11 09:33:03 -06:00
GunHog da18273d8d Wizard Fireball auto-disable
Wizard (and Devil) fireballs now automatically toggle off once fired.
2016-11-11 09:18:51 -06:00
Joan Lung fbeb7f958f Couple more pronoun things 2016-11-10 17:29:57 -05:00
KorPhaeron 66a43add17 Replaces spawn with some fancy proc 2016-11-10 12:12:46 -06:00
KorPhaeron eae845abf4 Somehow half a file was not committed 2016-11-09 20:35:50 -06:00
KorPhaeron 0defbccc84 Buffs Forcewall 2016-11-09 20:35:31 -06:00
KorPhaeron f5e7d48d6b Fix merge conflicts 2016-11-09 18:23:12 -06:00
KorPhaeron 1c88f35f06 Fixes rod form breaking when upgraded 2016-11-08 23:59:44 -06:00
KorPhaeron 634538fee5 Rod Form spell for wizard 2016-11-08 02:10:27 -06:00
phil235 b7efc2cef4 Make energy guns able to use burst fire. (#21005)
* Make energy guns able to use burst fire.

* Changed obj/item/weapon/gun/projectile to /gun/ballistic and the name of the folder from "projectile" to "ballistic" to avoid confusion between actually projectiles and guns.

Syringe gun, energy guns and magic guns can now use burst fire.

* fixing merge conflict shit

* fixing map conflicts

* more map conflict fix

* two tiny fixes.

* tiny tweak

* fixing merge conflicts.
Moving the practice mini egun to the gun module.
Renamed nuclear.dm to energy_gun.dm

* map conflict fixes
2016-11-02 16:16:21 +13:00
phil235 2dc956bea0 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
# Conflicts:
#	code/game/gamemodes/clock_cult/clock_scripture.dm
#	code/game/gamemodes/clock_cult/clock_structures.dm
2016-10-31 19:59:00 +01:00
Joan Lung 663ef769f7 Reworks Guvax (#21202)
Guvax is now targeted; invoking it charges your slab to bind and start converting the next target attacked in melee within 10 seconds. This makes your slab visible in-hand.
tweak: Above 5 Servants, the invocation to charge your slab is not whispered, and the conversion time is increased for each Servant above 5.

Using Guvax on an already bound target will stun them. The bound target can resist out, which will prevent conversion.

Sentinel's Compromise is now targeted, like Guvax, but can select any target in vision range.

Sentinel's Compromise now also removes holy water from the target Servant.

Clicking your slab will cancel these scriptures.

Both of these will change your cursor, to make it obvious they're active and you can't do anything else.


Convert times are faster at very high servant amounts, but it's much easier for 1-on-1 conversions to go wrong and have the target escape. (Though the binding makes early conversions slightly easier.)

Resist time for the binding is a flat 4 seconds, and moving/being moved while chanting will break it immediately.
Formula for conversion time is 5 + (0.5 for each valid servant above 5) seconds up to a maximum of 10 seconds at 15 servants.
2016-10-29 18:16:21 +13:00
oranges 6ed7d6681d Merge pull request #21208 from XDTM/WheelchairWizard
Wizards no longer need sandals to cast robed spells
2016-10-29 18:13:52 +13:00
XDTM 77b41c5edb No sandals 2016-10-27 00:49:23 +02:00
Razharas 2c9e07698f Merge pull request #21186 from ChangelingRain/rangedreference
Ranged abilities now have a reference to their user
2016-10-26 20:21:17 +04:00
Joan Lung f6738d0e2a Ranged abilities now have a reference to their user 2016-10-25 11:18:51 -04:00
lordpidey 3b16e0c83e Adds LARPing. (#21053)
* Starts to add a new wizard spell, based on the LIGHTNING BOLT! LIGHTNING BOLT! LIGHTNING BOLT meme.

* Adds spell to spellbook, and makes it functional.

* Fixes compile error

* Casting the spell now automatically readies your throw.

* Pitchforks don't auto throw

Summon pitchfork no longer also auto throws.
2016-10-25 15:13:16 +13:00
Joan Lung 40d331ab5a The Judicial Visor no longer requires an open hand to use (#21138)
* The Judicial Visor no longer requires an open hand to use

* SMITE

* ew ew ew
2016-10-24 22:54:04 +13:00
phil235 1ce672c630 fixing stuff about atom_colours. 2016-10-21 01:30:42 +02:00
phil235 029bc65b93 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
# Conflicts:
#	code/game/atoms.dm
#	code/game/gamemodes/nuclear/nuclearbomb.dm
2016-10-19 01:56:02 +02:00
phil235 240f3a4c49 Adding var/list/atom_colours to /atom .
The var will be used to store the various coloring that happen for the atom so that we can separate paint coloring from color that must be inherent to the atom (an initial color for example), or from certain coloring effect like revenant's blight, mob electrocution's black color, admin edit of the color var, green color from holding the greentext item, etc.
The list has four elements, used for four categories:
ADMIN_COLOUR_PRIORITY for admin varedits and very rate color effect like holding the greentext item (and other effects that should prime over any other potential source of coloring even temporary effects).
TEMPORARY_COLOUR_PRIORITY for short color effects like revenant blight on mob, mob electrocution making you all black for a couple seconds, effects that should be appearing above paint coloring.
WASHABLE_COLOUR_PRIORITY for pretty much all paint coloring like colorful reagent on mobs, coloring turfs with paint, etc.
FIXED_COLOUR_PRIORITY for color inherent to the atom, like a blob's color, any object with a color value given in its definition.

Fixes electocution animation on mob not making the mob all black (with the skeleton overlay blinking over it)
Spray cleaner and soap can now wash paint off mobs, turfs and objects.
2016-10-19 01:51:30 +02:00