Commit Graph

11747 Commits

Author SHA1 Message Date
YotaXP 4ece522dff Removed snowflake. 2015-11-15 02:34:17 -05:00
YotaXP 47c358e8e2 Adds slot_drone_storage macro. 2015-11-12 20:32:00 -05:00
phil235 5268a2613f Merge pull request #12994 from phil235/ReagentObfuscation2
Reagent obfuscation (copy)
2015-11-12 23:25:55 +01:00
Xhuis e02831d5b1 Reagents can no longer be determined by examining a reagent container without the proper apparatus. Silicons and ghosts can always see reagents.
Science goggles now allow reagents to be seen on examine. In addition, chemists now start wearing them. The bartender has a pair that looks and functions like sunglasses.
2015-11-12 23:01:33 +01:00
duncathan salt df6ac90baa Revert "Revert "Merge pull request #12067 from AnturK/resequencing"" 2015-11-12 15:25:31 -06:00
phil235 9e3b7610ff Merge pull request #12959 from tkdrg/abranch
Fixes adjust_fire_stack to work with macro Clamp()
2015-11-12 20:15:06 +01:00
Razharas 3992858ed1 Revert "Merge pull request #12067 from AnturK/resequencing"
This reverts commit d5fd4440ea, reversing
changes made to 605710d0ec.

Reverting this bullshit
2015-11-12 21:11:50 +03:00
duncathan salt 4fcdc7d748 Merge pull request #12950 from phil235/AIMechStunFix
Fixes flashbanged mmis in mechs losing access to most mech functions
2015-11-11 16:34:24 -06:00
duncathan salt b1d1ecb81f Merge pull request #12904 from Incoming5643/action_action_action_action_action
Adds action buttons for slimes
2015-11-11 15:21:05 -06:00
Incoming5643 5c5c24380e ayy 2015-11-11 16:04:05 -05:00
Incoming d8a0dc6b54 jumps through hoops to save two lines
adds slime growth as a define
2015-11-11 16:00:38 -05:00
Cheridan 3a62235415 Merge pull request #12791 from KorPhaeron/removelizardremovelizard
Human only ERT and Deathsquad
2015-11-11 13:20:49 -06:00
duncathan salt 20c37465eb Merge pull request #12765 from GunHog/Removes-Android-Split-Personality
Posibrain possession fix
2015-11-11 11:02:49 -06: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 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 914786b0f6 Merge pull request #12921 from lordpidey/lordpidey_salgluBlood
Saline-Glucose IV drip blood replacement.
2015-11-11 10:46:21 -06:00
phil235 3fc3d93744 Merge pull request #12940 from Shadowlight213/emotebanfix
Makes emote bans actually work
2015-11-11 17:35:19 +01: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 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 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
Tkdrg 540b1cc076 Fixes adjust_fire_stack to work with macro Clamp()
Fixes #12952
2015-11-11 01:54:14 -03:00
Cheridan 44cca62727 Merge pull request #12805 from KorPhaeron/xray
Xray range tweak
2015-11-10 18:14:47 -06:00
Incoming 3da00354b4 Merge branch 'master' of https://github.com/tgstation/-tg-station into action_action_action_action_action
Conflicts:
	icons/mob/actions.dmi
2015-11-10 17:03:05 -05:00
phil235 db67825974 Fixes being able to stun AI and MMI forever with flashbang, preventing them from using their mech. Brain mobs can no longer get flashed or flashbanged. Silicons are no longer affected by the sound bang of the flashbang (since they have no ears).
Fixes a runtime with two blob reagents.
Fixes a reference not being removed when hydro tray is destroyed.
Laser pointer can no longer weaken AIs (no eyes).
2015-11-10 22:06:54 +01: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
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
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
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
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
Aranclanos 3a8dc31e06 Merge pull request #12889 from tkdrg/andlettherebeSPEED
Improves speed of redraw_lighting()
2015-11-09 03:18:13 -03: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
phil235 e388b968a4 Merge pull request #12897 from KorPhaeron/harvester
Harvesters spawned by nar-sie are no longer culted
2015-11-08 21:45:02 +01:00
phil235 6c99bf6e71 Remove some debug message in smartfridge code. 2015-11-08 21:40:41 +01:00
Cheridan 8cd8d259ee Merge pull request #11803 from RemieRichards/HandOfGod-Resurgence
Hand of God: Resurgence
2015-11-08 14:09:42 -06:00
Firecage b2937bf315 Changes the operating table to be an actual table. 2015-11-08 22:09:35 +02:00
Mike Long 47e7046fe4 Adds the ability to use Saline-Glucose Solution as an IV drip to restore blood. It is more effective when blood is lower. 2015-11-08 11:53:07 -05:00
duncathan salt 0b75cd7bbd makes milk-producers return properly in Destroy() 2015-11-08 00:35:51 -06:00
Tkdrg 20fe2e4bb5 Removes PDA chatrooms
Nobody used them, and they were cluttering PDA Topic() needlessly.
Rest in peace, my child. You were too good for this world.
2015-11-07 23:51:48 -03:00