Commit Graph

1958 Commits

Author SHA1 Message Date
Remie Richards edfb957bd2 Merge pull request #13088 from as334/master
Plasmamen fixes
2015-11-29 19:17:11 +00:00
as334 dc98e67f05 Just fuck my shit up fam 2015-11-29 13:48:58 -05:00
duncathan salt a4151bb212 Merge pull request #13280 from Anonus/mmbuff
Fixes inflict_handler spells not doing burn damage in some cases
2015-11-29 12:36:18 -06:00
Jordie 38eddb1421 Merge pull request #13179 from AnturK/academy
Wizard Academy Away Update
2015-11-29 21:06:34 +11:00
Jordie 7b1a92885c Merge pull request #13024 from TheNightingale/Nighting
Elite Syndicate Hardsuit
2015-11-29 21:05:36 +11:00
as334 611fb49c1c Wake me up inside 2015-11-29 00:58:30 -05:00
Nerd Lord e9bbebfd36 Fixes inflict_handler spells not doing burn damage if brute damage was 0. 2015-11-28 11:42:38 -05:00
AnturK b14e9133d2 Academy Update 2015-11-28 12:35:41 +01:00
AnturK 9fd9e5c21d Makes user explicit in spell code 2015-11-28 12:35:40 +01:00
Remie Richards efd06ba92f Merge pull request #13165 from Menshin/login_runtimes_fix
Fixes login runtimes for round start observers
2015-11-27 20:14:49 +00:00
Remie Richards 4079e1bb7f Merge pull request #13158 from KorPhaeron/Nya
Removes references to "valid" from purrbation
2015-11-27 20:01:17 +00:00
as334 ce9ea0ca46 FUCK THIS FUCK EVERYTHING 2015-11-26 22:22:07 -05:00
AnturK e36853d7c9 Convert bots to simple animals - Updated 7.0 2015-11-26 22:06:07 +01:00
Razharas 955406bc55 Merge pull request #13216 from tkdrg/why
Fixes VV not updating properly for non-datums
2015-11-26 23:36:39 +03:00
YotaXP 9fe9c2faa4 Remove side effects from Character Setup 2015-11-25 18:06:05 -05:00
Tkdrg f7c4ac2d9d Fixes VV not updating properly for non-datums
Fixes #13211
2015-11-25 16:35:59 -03:00
Cheridan 67da7b7117 Merge pull request #13085 from Incoming5643/I_only_get_like_one_controversal_pull_a_year_I_better_make_this_count
A number of nerfs and buffs to stunning spells
2015-11-25 11:13:09 -06:00
KorPhaeron 4d3046e5cb Terrible pun 2015-11-25 08:42:21 -06:00
phil235 34a3dcba9f Merge pull request #12879 from MrStonedOne/burnbabyburn
Tweaks burn rate such that fires last longer but bombs are weaker.
2015-11-25 14:10:50 +01:00
Menshin bbbd4360d0 Fixes login runtimes for observers.
Some failsafes for new_player login.
2015-11-23 00:19:35 +01:00
KorPhaeron c646656e79 Valid 2015-11-22 06:41:30 -06:00
Cheridan 4c899d2b34 Merge pull request #13063 from Incoming5643/subtypesof
Adds subtypesof(path)
2015-11-19 16:31:09 -06:00
Remie Richards 0710ce5def Merge pull request #13070 from octareenroon91/patch-30
Introduce the four-color pen
2015-11-19 18:42:26 +00:00
Remie Richards 7333bede43 Merge pull request #13055 from Anonus/actionbuttons
Gives constructs action buttons, adds cool effects to cult turfs.
2015-11-18 20:26:47 +00:00
Cheridan cba8a9a325 Merge branch 'c4runtimeFix' of git://github.com/phil235/-tg-station into phil235-c4runtimeFix
Conflicts:
	code/modules/mob/mob.dm
2015-11-18 01:44:29 -06:00
as334 c98a7a0d7e Fixes merge conflicts, also a minor slipup with flags 2015-11-17 20:59:43 -05:00
Incoming b12fc38946 A number of mixed nerfs and buffs to stunning spells:
Lightning Bolt:
*You can no longer throw the bolt whenever you want, it will fire itself once it's done charging. Fixes #12849
*Getting hit by a bolt will do a flat 30 burn now, as opposed to scaling with how long you spent charging the spell. Unless you made a habit of charging lightning bolt to near maximum every time you cast it this is a buff.
*Every time the bolt jumps the next shock will do five less burn damage.
*Lightning bolts can still jump back to the same body, so the maximum number of bolts you can be hit by in a single casting is three, and the maximum amount of damage you could take for that is 60 burn.
*Stun time is unaffected

Magic Missile:
*Cooldown raised to 20 seconds, up from 15
*Cooldown reduction from taking the spell multiple times raised from 1.5 seconds to 3.5 seconds. Rank 5 magic missile now has a cooldown of 6 seconds, down from 9, and is effectively a permastun.

Time Stop:
*Time Stop field now persists for 10 seconds, up from 9
*Cooldown raised to 50 seconds, up from 40
*Cooldown reduction from taking the spell multiple times raised from  7.75 seconds to 10 seconds. Rank 5 time stop now has a cooldown of 10 seconds, up from 9, and is effectively a permastun.
2015-11-17 19:04:38 -05:00
octareenroon91 a33df9b39b Make four-color pen available through cargo
Adds two of /obj/item/weapon/pen/fourcolor to the Bureaucracy crate.
2015-11-16 21:32:13 -06:00
Incoming 1f9f0dfc40 Adds subtypesof(). It's shorthand for typesof(path) - path.
Replaces typesof(path) - path with subtypesof(path) in obvious places. I was a bit conservative, there's probably a few more places that could use this.
2015-11-16 18:55:57 -05:00
Nerd Lord 757d009e4f Constructs now have action buttons!
Cult floors and walls now have a glow effect when spawning in.
Nar-Sie uses a span class just for it spawning. Get spook.
2015-11-16 15:20:13 -05:00
duncathan salt 3860981936 Merge pull request #13025 from tkdrg/imdumb
Improves antag_hud transfer_to() logic
2015-11-15 15:59:51 -06:00
duncathan salt 31e30ab768 Merge pull request #12955 from CosmicScientist/FixingThePast
Makes the dehydrated carp less ambiguous and decreases its TC cost
2015-11-14 23:42:58 -06:00
Tkdrg 459619594f Improves antag_hud transfer_to() logic
Fixes #13019
Fixes #11996
2015-11-14 16:06:01 -03:00
TheNightingale dca36b1723 * Elite Syndicate hardsuit added
** Operative-only; fireproof, with bonus resistances
** Added to Operative uplinks
2015-11-14 17:43:43 +00:00
as334 ef6af4ef5b Unfucking shit ass plasma memes part 1 2015-11-13 21:28:00 -05:00
as334 a6eaf76d72 Fixes merge conflicts, adds new sprites, hopefully fixes weird helmet sprite bug. 2015-11-12 21:54:08 -05:00
francinum e0df93d2b8 Fixes #12970 2015-11-11 15:43:51 -05:00
duncathan salt d5fd4440ea Merge pull request #12067 from AnturK/resequencing
Changes to DNA Injectors
2015-11-11 10:50:30 -06:00
duncathan salt 0769ba5c00 Merge pull request #12945 from torger597/master
Adds a Syringe to the Uplink Poison/Chemical kit
2015-11-11 10:47:40 -06:00
duncathan salt 40cf13e575 Merge pull request #12942 from AnturK/mindfu
Fixes mind swap kicking out the victim client
2015-11-11 10:46:38 -06:00
AnturK d82010caf3 Makes injectors timed
Update
Lowers the scanner buffer transfer radiation.
Makes injector duration scale with upgrades.
Time coefficent values
2015-11-11 17:27:55 +01:00
phil235 79d25ef2d9 Fixes remotely detonating planted c4 with signaler.
Move CanUseTopic() procs to the correct files.
2015-11-11 15:57:05 +01:00
CosmicScientist 1369b84782 That may find a place in this world. 2015-11-11 01:02:39 +00:00
CosmicScientist d0e5bf65a7 And hope that something stronger grows there. 2015-11-11 00:02:40 +00:00
CosmicScientist af74475cad Because I cannot bear it. 2015-11-10 23:41:59 +00:00
Torger597 cbdc72272b Edit
Changed description of the kit itself to comment on the fact it now
comes with a syringe, added a change log entry for the change itself.
2015-11-09 20:55:01 -06:00
AnturK 6e32dd4197 Fixes mind swap kicking out the victim client 2015-11-09 22:03:47 +01:00
Nerd Lord 97697bcac4 Makes the lich beam dark green, and thus much more spooky. 2015-11-08 20:31:54 -05:00
Tkdrg 8fce742d0a Merge remote-tracking branch 'upstream/master' into fuk
Conflicts:
	data/mode.txt
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/gloves.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
2015-11-07 15:56:39 -03:00
Tkdrg d966c37c6a Hand of God Fixes/Tweaks
Fixes healing fountain construction sprite.
Nexus are now destroyed properly.
Borged cultists will now lose antag status properly.
Round end message fixed.
Feedback messages improved to be clearer, and lots of typos fixed.
Smite no longer uses up faith if there is no valid target in the turf.
Adds an atom/attack_god() proc.
Fixes the greeting messages for prophets and followers, improves god msg.
Fixes nexus being spawned on dense turf after 2min, and general sanity.
Fixes attacking structures with abstract items.
Adds click delay and attack animation for attacking structures.
Fixes a lot more typos.
Fixes defense pylon friendly fire.
Makes defense pylon togglable on its god's click.
Cleans up gun_turret code a little in general.
Adds deconversion by loyalty implant or holy water (basically rev+cult).
Gods will now die when they have no followers left.
Adds the HoG gods to the traitor panel.
2015-11-07 15:25:28 -03:00