Commit Graph

24890 Commits

Author SHA1 Message Date
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
AnturK 686366fe98 Revert "Makes mechs use some of pilot huds (job,wanted,loyalty,antag)" 2015-11-11 17:39:42 +01: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
GunHog a7bc20cba7 Reduces Loyalty Pin tech requirement
- Loyalty pins now require Combat 5 instead of 6.
- Loyalty pins can now be replaced by other pins.
2015-11-11 09:43:19 -06:00
MMMiracles b44715cff8 2 instead of 1
water is still dumb
2015-11-11 10:33:36 -05: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
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
Tkdrg 540b1cc076 Fixes adjust_fire_stack to work with macro Clamp()
Fixes #12952
2015-11-11 01:54:14 -03:00
MMMiracles 7493326f61 More edits, woop. 2015-11-10 22:08:51 -05:00
CosmicScientist 1369b84782 That may find a place in this world. 2015-11-11 01:02:39 +00:00
Cheridan 44cca62727 Merge pull request #12805 from KorPhaeron/xray
Xray range tweak
2015-11-10 18:14:47 -06:00
CosmicScientist d0e5bf65a7 And hope that something stronger grows there. 2015-11-11 00:02:40 +00:00
CosmicScientist c8391680a6 So I must bury it. 2015-11-10 23:46:17 +00:00
CosmicScientist af74475cad Because I cannot bear it. 2015-11-10 23:41:59 +00:00
MMMiracles 359bdf7e5e Adding a new away mission, WIP. 2015-11-10 18:18:07 -05: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
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 102ee66c69 Updating one comment 2015-11-10 22:42:17 +01: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
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