Commit Graph

20837 Commits

Author SHA1 Message Date
Nerd Lord
e7e10c1b7c If H and memes... 2015-11-14 23:24:36 -05:00
Nerd Lord
b91e32d0c3 Improves revenant ability sprites further.
Also tweaks icon proc slightly so it's easier to do testing stuff.
2015-11-14 20:56:11 -05:00
Nerd Lord
c04946908f Commit efficiency: low. 2015-11-14 14:46:44 -05:00
Nerd Lord
bffa938df9 continue 2015-11-14 14:44:42 -05:00
Nerd Lord
1ff4f00791 The changelog is the PR, but:
Defile no longer directly affects mobs. Instead, it rips up floors and opens machines and lockers.
Blight added. Blight infects humans with a virus that does a set amount of damage over time and is relatively easily cured. Blight also badly affects nonhuman mobs and other living things.
Tweaked costs and stuntimes again.
Transmit has a new, spookier icon.
2015-11-14 14:13:12 -05:00
as334
d39982e98a Small tweak for Cheridan 2015-11-12 22:09:26 -05:00
as334
a6eaf76d72 Fixes merge conflicts, adds new sprites, hopefully fixes weird helmet sprite bug. 2015-11-12 21:54:08 -05:00
Razharas
4e44086209 Merge pull request #12977 from duncathan/reverttimedinjectors
Properly reverts timed injectors
2015-11-13 01:42:33 +03:00
phil235
5268a2613f Merge pull request #12994 from phil235/ReagentObfuscation2
Reagent obfuscation (copy)
2015-11-12 23:25:55 +01:00
phil235
e9191e3153 Merge pull request #12971 from francinum/patch-7
Brainrot Symptom typo fix
2015-11-12 23:05:34 +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
duncathan salt
f85fdf1bf1 Update dna_console.dm 2015-11-12 15:24:48 -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
cdabc0a73a Update dna_console.dm 2015-11-11 17:01:19 -06: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
phil235
7af0715f7d Fixes Escape Shuttle sound being too loud. 2015-11-11 21:55:21 +01:00
as334
6a2c3b3fb1 Adds sprites for the most part. 2015-11-11 15:44:59 -05:00
francinum
e0df93d2b8 Fixes #12970 2015-11-11 15:43:51 -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
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
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
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