Commit Graph

3078 Commits

Author SHA1 Message Date
hornygranny b199af9698 Merge pull request #14472 from KorPhaeron/nerfs
Nerfs LSG
2016-01-06 23:52:34 -08:00
KorPhaeron ff09481e5e LSG 2016-01-07 01:48:50 -06:00
tkdrg aa605a1db5 Merge pull request #14385 from AnturK/morphmessagespam
Fixes morph eating message showing up multiple times for the same object
2016-01-07 02:06:58 -03:00
tkdrg ff5712db5b Merge pull request #14429 from KorPhaeron/intro_text
Adds intro text to malf/traitor AI
2016-01-07 01:51:27 -03:00
AnturK 1a5bffc424 Fixes morph eating message showing up multiple times for the same object 2016-01-06 11:51:40 +01:00
KorPhaeron d4ac9b3cdd Adds intro text to malf AI 2016-01-05 22:48:19 -06:00
duncathan salt bee40cf9cd Merge pull request #14388 from ChangelingRain/notsosimpleisit
Fixes simple animal damage type handling
2016-01-05 22:23:23 -06:00
duncathan salt 33ce734c03 Merge pull request #14404 from KorPhaeron/gang
Fixes gang implanter message
2016-01-05 22:18:26 -06:00
KorPhaeron 060fd8b529 Fixes gang implanter message 2016-01-04 20:22:24 -06:00
Nerd Lord c2a3be931b Adds a space after the ghost follow link for messages that lacked it 2016-01-04 19:26:07 -05:00
duncathan salt c3aff8dffe Merge pull request #14355 from ChangelingRain/justwatchthem
Adds follow links to overmind, revenant, and abductor chat
2016-01-05 01:15:10 +01:00
duncathan salt ede4a3b378 Merge pull request #14335 from KorPhaeron/refunds
Uplink refund refactor/fixes cyborg spawners not appearing in nuke purchase log
2016-01-05 01:11:26 +01:00
Nerd Lord 41eeedfc46 Fixes doubled shadowling messages 2016-01-04 18:23:29 -05:00
Nerd Lord 3d32bde4a6 I mean, you shouldn't make any of these immune to damage types but it won't break the healing if you do. 2016-01-04 15:41:08 -05:00
Nerd Lord 4815a0f37c Simple animals no longer convert other damage types to brute using the brute damage proc, allowing you to make mobs immune to brute but not all damage types.
No, no, do it properly not half-ass it
2016-01-04 15:29:23 -05:00
duncathan salt 04fcc515aa Merge pull request #14309 from tkdrg/hahaha_fuck
Fixes issues with destroying the narsie shell
2016-01-04 20:32:11 +01:00
duncathan salt b922a105dc Merge pull request #14336 from AnturK/flax
Fixes changeling form swap
2016-01-04 20:24:32 +01:00
Nerd Lord 8dfd29e84d Adds follow links to overmind and revenant chat 2016-01-03 15:49:16 -05:00
tkdrg 8612333265 Merge pull request #14133 from KorPhaeron/follow
Adds follow links to all forms of chat
2016-01-03 16:31:11 -03:00
AnturK 5738de679b Fixes changeling form swap 2016-01-03 12:08:57 +01:00
KorPhaeron 8a72f5a55c Fixes cyborg teleport 2016-01-03 04:11:19 -06:00
KorPhaeron b3b579c60c Adds Follow Links to everything 2016-01-03 01:33:16 -06:00
Aranclanos 0c6ae04a99 Merge pull request #14284 from KorPhaeron/remove_extra_message
Removes "error" message from roundstart logout report
2016-01-03 03:05:50 -03:00
KorPhaeron 4338e551e7 Remove extra message 2016-01-01 23:25:09 -06:00
Tkdrg 8b99b64c63 Fixes issues with destroying the narsie shell
Mostly misguiding messages and docking an uncalled shuttle.
2016-01-02 00:00:01 -03:00
tkdrg 0949e89a5a Merge pull request #14031 from KorPhaeron/AI
New malf power (lipreading) + points rebalancing
2016-01-01 23:19:26 -03:00
tkdrg 8c21c8561c Merge pull request #14185 from KorPhaeron/revert-14123-multiverse
Revert "Multiverse clones are now identical to the summoner"
2016-01-01 00:47:53 -03:00
tkdrg 3d1e20f9b1 Merge pull request #14180 from KorPhaeron/challenge
Using challenge ops delays shuttle refuel
2015-12-31 21:54:23 -03:00
KorPhaeron 2c7d5ef326 Proper delay 2015-12-31 18:48:41 -06:00
duncathan salt 397025b292 Merge pull request #14074 from MrStonedOne/HOLYFUCKINGGHOSTPOPUPS
[ready]Ghost popup re-work
2015-12-31 23:58:03 +01:00
MrStonedOne 3ebc6749af Brings shade selection into the pollCanidates system 2015-12-31 14:15:49 -08:00
tkdrg 52a45b6292 Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework
OBJECTIVES REWORK: Better Objectives Generation
2015-12-31 03:11:41 -03:00
Nerd Lord 071cb63930 fine okay no helper 2015-12-30 23:32:58 -05:00
Nerd Lord 96f1ec92b0 ACTION CONFLICTING 2015-12-30 23:14:32 -05:00
tkdrg 4485cc3dfb Merge pull request #14146 from KorPhaeron/guns
Lesser Summon Guns
2015-12-30 23:32:13 -03:00
KorPhaeron d969d4442e Revert "Multiverse clones are now identical to the summoner" 2015-12-30 20:13:55 -06:00
KorPhaeron 943ce2ff95 Shuttle Delay 2015-12-30 18:49:01 -06:00
AndrewJacksonThe2nd 0121f6691f fixes 2015-12-30 13:14:28 -08:00
AndrewJacksonThe2nd 59d6768610 fixes 2015-12-29 22:00:24 -08:00
Nerd Lord ab9e0a7fbe Blob mobs now hear overmind chat.
Removes five unused istype helpers.
2015-12-29 17:27:26 -05:00
tkdrg 14da386e28 Merge pull request #14123 from KorPhaeron/multiverse
Multiverse clones are now identical to the summoner
2015-12-29 19:00:35 -03:00
Nerd Lord f79e871bfd Blob chat is now big and easy to see. 2015-12-29 15:10:24 -05:00
Nerd Lord bf394afb80 Storage blobs are gone, blobbernauts now poll candidates, early blob burst is gone, replaced with a help button(of dubious usefulness) 2015-12-29 13:35:13 -05:00
KorPhaeron 9bcca100ca Lesser Summon Guns 2015-12-29 10:58:27 -06:00
Remie Richards 664a3aec11 Merge pull request #14071 from tkdrg/cuuuuult
More cult tweaks
2015-12-29 07:07:07 +00:00
AndrewJacksonThe2nd 7bfc5fb4e5 disables Debrain from random objective generation 2015-12-28 19:22:20 -08:00
tkdrg dc0c056fc9 Merge pull request #14109 from Incoming5643/guns_and_guns_and_more_guns
Summon Guns 2016
2015-12-28 22:58:47 -03:00
Incoming 326937efc6 Merge branch 'guns_and_guns_and_more_guns' of https://github.com/Incoming5643/-tg-station into guns_and_guns_and_more_guns
# Conflicts:
#	code/game/gamemodes/wizard/rightandwrong.dm
2015-12-28 20:50:50 -05:00
Incoming b7ecdf6a2f Adds scatter lasers to the drop list
Changes it so scatter lasers start in scatter mode to drive home the point

CODING STANDARDS
2015-12-28 20:47:32 -05:00
KorPhaeron 863c0c410f Adds follow links 2015-12-28 19:37:37 -06:00