Commit Graph

95 Commits

Author SHA1 Message Date
Ergovisavi 642f79bb59 Replaces the fireball book in the dragon chest with a book of sacred flame, a new spell. 2016-08-22 17:44:14 -07:00
KorPhaeron eb39ca8e6e Kinetic Accelerator Mods (#19942)
* KA Mods

* Better examing

* Removes excess returns

* WHY indeed

* Updates projectiles properly

* Removes or replaces old hyper KA stuff

* Nerfs cooldown mod
2016-08-19 21:04:25 +12:00
Joan Lung 61cff4e7bc Merge pull request #19940 from KorPhaeron/summons
Summon Magic now functions like summon guns
2016-08-18 22:31:02 -04:00
KorPhaeron f3200ee88a Summon Magic 2016-08-17 19:33:32 -05:00
Joan Lung 0ad2a3c4df Containment fields can no longer contain megafauna 2016-08-15 18:02:22 -04:00
xxalpha 8181ac9aa7 Fixed Spacetime Distortion spell being upgradeable. (#19830) 2016-08-12 13:20:56 -05:00
Cruix e422532da4 Fixed wizard lightning cooldown breaking under some circumstances. (#19763) 2016-08-09 15:28:59 +02:00
GunHog 6e07244bf4 Xenomorph Tweaks (#19720)
* Xenomorph Tweaks

- Xenos are now considered female.
- (Nerf) Hunter pounce are now always blocked by shields, and may be
blocked more often by other protective items.
- (Buff) Alien Queen is 2 points faster.
- Adjusted larva growth sprites.
- Removed 20% facehugger failure chance for masks.
- (Tweak) Disarm now always forces a person to drop an item in the
active hand, and if a person's hand is empty/undroppable, Disarm will
always result in a tackle.
- (Nerf) Borgs are no longer stunned by Xeno disarms.
- (Buff) Tail Sweep now has a slightly longer stun.

* Teaks and Fixes

- Pouncing is now a LEAP_ATTACK, and is now ALWAYS blocked by shields.
- Changed Disarm combat for borgs: First disarm strike disables the
borg's active module. The second strike pushes the borg back and stuns
it.

* Mini Fix

* Get that one too
2016-08-09 09:38:10 +12:00
Cheridan c7d78a9a44 Merge pull request #19679 from Fox-McCloud/whyyyyyyyyy
WHYYY DEL WHY
2016-08-04 15:13:50 -05:00
Fox-McCloud c021879ac0 WHYYY DEL WHY 2016-08-03 11:33:07 -04:00
lordpidey ec2f666f29 Devil agent (#19391)
add: Added Devil agent gamemode, where multiple devils are each trying to buy more souls than the next in line.
add: If you've already sold your soul, you can sell it again to a different devil. You can even go back and forth for INFINITE POWER.

This adds a new gamemode. Devil Agent. It works much like Double Agent, except devils instead of traitors, and instead of killing, the devil simply has to control more souls than the enemy.

Also, whether this is included in the rotation depends on the config settings. By default, it will be disabled.
2016-07-31 17:02:21 +12:00
GunHog 3a6df6950a Fixes Fireball clicking issues (#19423)
* Fixes Fireball clicking issues

- Attempts to fix clicking issues with Fireball during mob changes and
other edge cases.

* Alien spit now turns off when used when out of plasma.
2016-07-23 14:28:10 +12:00
Shadowlight213 9112e71914 Fixes merge conflicts 2016-07-22 01:04:45 -07:00
Shadowlight213 ed55cefcc2 Adds admin_spawned atom var that is set when something is spawned by admin means or is var edited.
This can be bypassed by using debug-game if needed.
Stats will not be tracked for admin spawned atoms
2016-07-20 15:26:24 -07:00
Joan Lung fa257f92ab Misc fixes (#19375)
* Misc fixes

* river

* delta

* waterfall

* cloudburst

* thunderstorm
2016-07-20 20:12:49 +12:00
lordpidey 810f3d9052 Small devil fixes (#19302)
* Removes errant cast from devilinfo.add_soul()

* Clarifies a banishment ritual in the Codex Gigas.

Sprinkling holy water isn't enough, it needs to be in the devil's bloodstream.

* Infernal jaunt now correctly extinguishes the user.
Revival contracts no longer actually set the target on fire, but rather uses a fake fire.

* Pitchforks don't burn devils or soulless on use/pickup anymore.
Adds cast charge time to infernal jaunt, so that it's impossible to jaunt while already jaunting.
Adds feedback to using infernal jaunt to jaunt in.
2016-07-14 19:41:01 +12:00
AnturK 523a2b29fe Implant chair refactor (#19272)
Removes some copypasta
Refactors implant chairs. Adds some fun variations.
2016-07-13 12:59:06 +12:00
GunHog e2cfcb0bd1 Aimed Fireball Spells! (#19030)
* Fireball Spell Changes

- Changes the fireball spell to be click-to-fire.
- Converted Devil and Wand fireballs as well.
- Moved some code to the /proc_holder level to work across the /alien
and /spell branches.

* Tweaks and Fixes

- Infernal Fireball is now a projectile and has the right explosion
values.
- Removed non-projectile spell versions of fireball, as they are unused
- Fixed fireball not seeking adjacent targets.
- Fixed incorrect bolding slashes.

* Fix

Fixes the fireball sometimes missing.

* Fixes and tweak

- Uses TRUE/FALSE defines instead of 0 and 1 for boolean variables.
- Ranged abilities now remove themselves tries to use an ability in a
disabled state. (Such as being knocked out)
- Define for the click cooldown.
2016-07-05 09:06:01 +12:00
Jack Edge a09544992c Merge branch 'master' into shuttle-processing
Conflicts:
	code/modules/shuttle/ripple.dm
2016-06-26 01:00:25 +01:00
Jack Edge 201da77121 Fixing some bugs with sparkles 2016-06-25 16:51:19 +01:00
Jack Edge 27d6c284ed Merge branch 'fun-balloon' into shuttle-processing
Conflicts:
	_maps/shuttles/emergency_bar.dmm
	_maps/shuttles/emergency_narnar.dmm
	code/modules/spells/spell_types/wizard.dm
2016-06-25 16:26:22 +01:00
Jack Edge df9bd80c03 More spawn() removal and timers and stuff 2016-06-25 11:55:21 +01:00
Jack Edge 81a4e188bc Code review 2016-06-19 10:15:26 +01:00
Jack Edge e33692b1c1 Removes spawn() from things I
- Removes from Sin of Greed slot machine (also cleans up the visible
message to make a difference between viewer and user)
- Removes from ferry request cooldown
- Removes from knock opening doors and closets
2016-06-19 01:06:51 +01:00
Cruix ac0bad5d61 Added priority overlay system. (#18225)
Added priority overlays to atoms, which will not be removed when overlays are cut and will always remain on top when new overlays are added. This requires everyone to use add_overlay() and cut_overlays() instead of overlays += and overlays.Cut(). These procs are found in __HELPERS/icons.dm, and the priority overlay list is found in game/atoms.dm. Everything else is replacing deprecated overlay manipulation.
2016-06-17 10:11:53 +12:00
Jack Edge 5722bbe714 Sentience balloon added 2016-06-15 21:12:39 +01:00
kevinz000 fe3faada41 mekhihasnosenseofrightandwrong 2016-06-15 03:32:21 -07:00
lordpidey f640d7ddb7 Devil fixes (#18520)
Numerous small fixes/changes/balances to devils.

Notable changes:
It now requires more souls to increase. It is now 3,7,12 souls, up from 3,6,9.
Devils now have extra rules, no coercing into signing contracts with violence, and no intentionally physically harming another devil.
Burial garment banishment now works on true devils. <--- Unreported issue, can I use that fix for the mergetoken?
Renamed all demon files to devil
Updated religious supplies to have burial garments.
Burial garments re-added to box/meta
Increased infernal fireball cooldown
Soulsellers can now use a pitchfork without being harmed.
Added new book crate, which includes a codex gigas to cargo.
2016-06-14 15:43:33 +12:00
PKPenguin321 1bb13e13da fixes spacetime distortions moving through spacetime (#18527)
fixes spacetime distortions moving through spacetime by anchoring them
2016-06-14 14:18:15 +12:00
oranges b20a5642de Merge pull request #18473 from RemieRichards/setDir()
Set dir()
2016-06-13 00:03:44 +12:00
Remie Richards fda2c699fc Automatic conversion via Regex 2016-06-11 18:37:48 +01:00
xxalpha 1a01acf4af Prevent the game from hanging if bullets find an infinite loop. 2016-06-10 19:47:55 +01:00
xxalpha a33f30e87f Spacetime Distortion wizard spell. 2016-06-10 18:56:38 +01:00
oranges 07bd09da5c Merge pull request #18340 from coiax/fix-18338
Repulse sparkles now disappear
2016-06-09 09:14:32 +12:00
Mike Long 1fbd8d71f9 Merge remote-tracking branch 'tgstation/master' into jauntfix
# Conflicts:
#	code/modules/spells/spell_types/demon.dm
2016-06-08 13:20:04 -04:00
AnturK 19eb97ae18 Moves some list initializations to New
Fixes missing ..() calls in New()
2016-06-07 18:39:13 +02:00
Jack Edge da134e2eeb Repulse sparkles now disappear
It wasn't kevinz000's fault, it was mine.
2016-06-07 11:20:44 +01:00
Mike Long b12a9fb7fc Refactor & nerf infernal jaunt.
Infernal jaunt now has a warm up time for entering and exiting the jaunt.

Plus it looks nicer too.
2016-06-06 23:01:23 -04:00
GunHog bfd644231f Merge remote-tracking branch 'remotes/upstream/master' into Aimed_Spit_For_Mista_Jay
# Conflicts:
#	code/modules/mob/living/living_defines.dm
#	icons/mob/actions.dmi
2016-06-06 20:05:23 -05:00
Jack Edge a01b48aa48 Removes spawn() from some things
Yay, refactoring.
2016-06-05 20:08:36 +01:00
Thunder12345 a9a97f5a81 Fixes for Merge Tokens (#18168)
* fixes #15649
fixes #16575

* oops forgot those lines
2016-06-03 14:46:42 -05:00
GunHog 4b9aada951 Uses client click intercept
- Alien spit now uses click intercepts in the client
- Risk of bugs greatly increased
2016-06-02 11:01:45 -05:00
GunHog 9e3a55e2e1 Aimed Xeno Spit
- Neurotoxic spit is now an aimed projectile.
- Research analyzer action button updated
- Framework for adding more aimed things later
2016-06-01 13:43:19 -05:00
Cheridan 737cddee68 Merge pull request #18018 from Xhuis/general_rabbits
Clockwork Post-Merge Patch II
2016-05-29 13:34:58 -05:00
Xhuis 76c033cfdc Several changes to clockcult 2016-05-29 00:50:02 -04:00
Lularian 8aa135f470 fixes some of the crap maybe 2016-05-28 11:08:46 -05:00
Joan Lung 2cfb2d8eed Layers are now defines (#17949)
* Layers are now defines

* this looks better

* GAS_phil_LAYER

* no message

* remove the three unneeded defines

* no message
2016-05-27 22:16:21 +02:00
oranges 8d6da5d01f Merge pull request #17796 from bgobandit/sofuckingmetal
Runed metal no longer deletes girders when used on them.
2016-05-21 22:56:45 +12:00
AnturK c2e3a4d2b6 Merge pull request #17703 from coiax/eight-chamber-heart
Lungs and hearts for mutant species
2016-05-21 11:08:05 +02:00
bgobandit b2ea93323d Runed metal no longer deletes girders when used on them. 2016-05-19 16:46:57 -04:00