Commit Graph

20798 Commits

Author SHA1 Message Date
duncathan salt d5fd4440ea Merge pull request #12067 from AnturK/resequencing
Changes to DNA Injectors
2015-11-11 10:50:30 -06:00
duncathan salt 605710d0ec Merge pull request #12948 from Ikarrus/ainame
Announcements made by AIs have their name attached
2015-11-11 10:47:58 -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 8bb0043ec7 Merge pull request #12939 from KorPhaeron/really_bad_ideas
Adds a series of ridiculous weapons to the wizard spellbook
2015-11-11 10:47:04 -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
duncathan salt 914786b0f6 Merge pull request #12921 from lordpidey/lordpidey_salgluBlood
Saline-Glucose IV drip blood replacement.
2015-11-11 10:46:21 -06:00
duncathan salt 4962fefc02 Merge pull request #12882 from tgstation/RemieRichards-AutolatheThingy
Items can now react to being constructed by autolathes
2015-11-11 10:43:28 -06:00
duncathan salt 497464c3d2 Merge pull request #12831 from MMMiracles/idedplsnerf
nerfs water
2015-11-11 10:40:49 -06:00
duncathan salt d0f5ecd55c Merge pull request #12795 from KorPhaeron/jobbans
Attempting to convert a jobbaned player offers control of their mob to ghosts
2015-11-11 10:36:35 -06:00
phil235 3fc3d93744 Merge pull request #12940 from Shadowlight213/emotebanfix
Makes emote bans actually work
2015-11-11 17:35:19 +01:00
duncathan salt 9339662a28 Merge pull request #12768 from xxalpha/windows10
Made it possible to paint windows to make them opaque.
2015-11-11 10:32:18 -06:00
phil235 5e43d2b570 Merge pull request #12924 from Firecage/Optable
Changes the operating table to be an actual table.
2015-11-11 17:31:38 +01: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
duncathan salt 15c7d1f356 Merge pull request #12743 from Xhuis/maybe_theyll_find_out_where_the_other_sound_came_from_too
Causes the emergency shuttle to play sounds upon launch and dock
2015-11-11 10:25:37 -06:00
MMMiracles b44715cff8 2 instead of 1
water is still dumb
2015-11-11 10:33:36 -05:00
duncathan salt b0c2e3e9c8 Merge pull request #12793 from PKPenguin321/patch-2
Adds surgery to remove surgically attached chainsaws
2015-11-10 23:25:51 -06:00
duncathan salt e5f8c3f941 Merge pull request #12900 from KorPhaeron/laserbox
Immovable reflectors for admins/mappers
2015-11-10 23:21:20 -06:00
duncathan salt 6de0264007 Merge pull request #12892 from tkdrg/fokkenhuds
Ghost HUD tweaks
2015-11-10 23:12:42 -06:00
duncathan salt 0761e69856 Merge pull request #12946 from tkdrg/red_deity
Red deity fix
2015-11-10 23:07:07 -06:00
Cheridan 44cca62727 Merge pull request #12805 from KorPhaeron/xray
Xray range tweak
2015-11-10 18:14:47 -06:00
Cheridan a28404eeff Merge pull request #12769 from PKPenguin321/patch-1
Makes lubed floors have the wet overlay, take two
2015-11-10 16:53:19 -06:00
Remie Richards 498cc918d5 Merge pull request #12944 from MrStonedOne/smartfridgerealfix
Fixes smartfridges once and for all.
2015-11-10 19:49:38 +00:00
Firecage 9ce5334890 merge conflict fix 2015-11-10 18:44:10 +02:00
Ikarrus d1d693b4bb Announcements made by AIs have their name attached
For example, it will use LIES Announces: of the generic "Attention" header.
2015-11-10 09:24:15 -07:00
Firecage 618e54087d Makes abductor Optables not deconstructable. 2015-11-10 17:21:12 +02:00
Cheridan 5f2ed41bc6 Merge pull request #12873 from KorPhaeron/zipties
Captain and HoP lockers now contain zipties
2015-11-10 08:03:53 -06:00
Cheridan 08f652375e Merge pull request #12931 from Anonus/lichray
Makes the lich revive beam light green
2015-11-10 07:29:31 -06:00
Razharas b4a9281a94 Merge pull request #12933 from Anonus/spookyscary
Revenant bugfixing
2015-11-10 07:52:58 +03:00
Tkdrg a63a1f1dea Red deity fix
No longer shows red deity on check antags even when not HoG.
2015-11-10 00:00:24 -03: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
Torger597 c76a9526d5 Adds a Syringe to the Uplink Poison/Chemical kit
Useful for:
1: Poisoning food.
2: Injecting Chemicals directly rather than being forced to feed someone
from a bottle.
2015-11-09 19:57:28 -06:00
Cheridan 948ab822d2 Merge pull request #12930 from tkdrg/hoog
HoG fixes
2015-11-09 18:25:57 -06:00
Tkdrg c4fc8defec HoG fixes
Fixes check antag when gods are dead.
Borging antags no longer announces removal of antag status.
Removes stun from Smite.
Fixes #12929
Fixes #12927
Fixes #12936
2015-11-09 19:54:07 -03:00
MrStonedOne 88eef20b69 Fixes smartfridges once and for all. 2015-11-09 14:35:16 -08:00
AnturK 6e32dd4197 Fixes mind swap kicking out the victim client 2015-11-09 22:03:47 +01:00
Razharas 348e93cb62 Merge pull request #12919 from MrStonedOne/patch-61
Fixes asay and dsay not being ran thru log_admin
2015-11-09 23:19:16 +03:00
Cheridan 30550a5d1f Merge pull request #12918 from duncathan/alwaysreturnparentplease
Makes cows, goats, and udders return ..() in Destroy()
2015-11-09 13:34:56 -06:00
Cheridan 43583d37b8 Merge pull request #12912 from Niknakflak/FigureToys
Ports action figures
2015-11-09 13:11:16 -06:00
Shadowlight213 3290a998fa Makes emote bans actually work 2015-11-09 10:47:44 -08:00
Cheridan 7451acd893 Merge pull request #12925 from phil235/FridgeUnloadFix
Remove some debug message in smartfridge code.
2015-11-09 12:14:26 -06:00
KorPhaeron 780dfe8db1 Ridiculous weapons 2015-11-09 07:17:10 -06:00
KorPhaeron 130ab1f4cb Merge remote-tracking branch 'refs/remotes/tgstation/master' into jobbans
Conflicts:
	code/game/gamemodes/game_mode.dm
2015-11-09 00:29:41 -06:00
Aranclanos 3a8dc31e06 Merge pull request #12889 from tkdrg/andlettherebeSPEED
Improves speed of redraw_lighting()
2015-11-09 03:18:13 -03:00
Aranclanos 424d33b365 Merge pull request #12890 from Xhuis/balance_patch
Miscellaneous balance changes
2015-11-09 03:16:38 -03:00
NikNakFlak 998bcb3aed Makes fixes Jordie totally didn't do himself 2015-11-08 23:15:38 -07:00
Aranclanos d454eae1b1 Merge pull request #12916 from tkdrg/ripinpiss
Removes PDA chatrooms
2015-11-09 02:56:41 -03:00
Jordie eadbfc9b1c Merge pull request #12915 from Shadowlight213/emoteban
Adds emote bans
2015-11-09 15:47:35 +11:00
Jordie 07464d1f10 Merge pull request #12911 from Shadowlight213/DbJobunban
Allows database based jobban lifting via the jobban panel
2015-11-09 15:47:10 +11:00
Nerd Lord d311183782 Fixes #12932
Also makes revenants use an update icon proc to update the icon based on what it's currently doing.
Also fixes a bug where using an ability could potentially lower your stun and reveal times.
2015-11-08 22:44:36 -05:00
Tkdrg 88f64c607e Ghost HUD tweaks
Removes links in tooltips. Makes alerts work as clicks when applicable.

Fixes #12843
Fixes #12844
2015-11-08 22:53:41 -03:00