Commit Graph

13310 Commits

Author SHA1 Message Date
KorPhaeron
7b2dc3fe73 Shuffles check order 2016-01-27 19:13:21 -06:00
KorPhaeron
78a0df6b42 Mispelled a var name 2016-01-27 03:42:20 -06:00
KorPhaeron
578295cc6d Fixes spawn protection 2016-01-27 03:34:50 -06:00
KorPhaeron
74db42953b Fixes victory 2016-01-26 19:28:12 -06:00
KorPhaeron
c4f912d5cc Fixes team protection/scoring etc 2016-01-26 18:38:38 -06:00
duncathan salt
7c76c0ddbb Merge pull request #14887 from neersighted/Byond509
Byond509
2016-01-26 01:57:42 -06:00
duncathan salt
8fd2393dd7 Merge pull request #14890 from KorPhaeron/capture_the_flag_revival
Adds capture the flag to Z2
2016-01-26 00:34:17 -06:00
KorPhaeron
92f2c149cd Adds blue beacon sprite 2016-01-26 00:13:41 -06:00
Razharas
01831fc8eb Merge pull request #14862 from KazeEspada/LizardHunting
Lizard hunting
2016-01-26 08:01:11 +03:00
duncathan salt
68888362a2 Merge pull request #14867 from KorPhaeron/remove_grab
Ninja teleport kidnap works based on pulling people instead of based on grabs
2016-01-25 20:14:40 -06:00
duncathan salt
f9f6fa2f4d Merge pull request #14802 from Incoming5643/heremembers
Local Bird Transcends Round Based Universe
2016-01-25 19:32:04 -06:00
duncathan salt
ee1a17044d Merge pull request #14868 from KorPhaeron/remove_grab2
Removes Grab from photocopier
2016-01-25 19:26:47 -06:00
duncathan salt
00aab08714 Merge pull request #14869 from KorPhaeron/remove_grab3.0
Removes grab from disposal units
2016-01-25 19:25:54 -06:00
tkdrg
6a3745c46d Merge pull request #14852 from ChangelingRain/blobbernotagain
Nerfs blobbernaut creation, tweaks blob reagents
2016-01-25 22:00:48 -03:00
Remie Richards
87f60ad691 Merge pull request #14843 from neersighted/tgui
mo' tguis: electric boogaloo
2016-01-25 22:22:29 +00:00
tkdrg
21ddc03148 Merge pull request #14850 from ChangelingRain/forceholo
Guardians use forcemove where possible
2016-01-25 18:49:55 -03:00
Bjorn Neergaard
e750a06cde Remove old helper, fix tank dispenser icons. 2016-01-25 12:03:15 -06:00
Bjorn Neergaard
961eeea661 Rewrite SSUs, tweak newly added UIs 2016-01-25 12:03:07 -06:00
Bjorn Neergaard
87642fa588 tgui tank dispensers 2016-01-25 12:03:06 -06:00
Bjorn Neergaard
36005a6461 AIs are not physical beings 2016-01-25 12:03:05 -06:00
Bjorn Neergaard
c78e1ec2ac Fix a lot of wire interactions 2016-01-25 12:03:03 -06:00
Bjorn Neergaard
014e83fec6 Fix tgui machine interactions status checks 2016-01-25 12:03:02 -06:00
Bjorn Neergaard
2f46b224ae Fix air alarm hacking, raise SStimer display 2016-01-25 12:03:00 -06:00
Bjorn Neergaard
dbc64b7d28 tgui fire alarms 2016-01-25 12:02:59 -06:00
Bjorn Neergaard
f3697fc7d6 Repath air alarms 2016-01-25 12:02:58 -06:00
KorPhaeron
ef2321db74 CTF Disabled by default 2016-01-25 00:59:34 -06:00
KorPhaeron
b445eee80d CTF Revival 2016-01-25 00:52:25 -06:00
Bjorn Neergaard
f1c08e607d Exclude speech bubbles from rotation
Fixes #14664
2016-01-24 23:40:50 -06:00
Remie Richards
94f1b51893 Renames appearance flag defines. 2016-01-24 23:26:14 -06:00
Remie Richards
f4bb5fcf0e Min compiler version is now 509, Weapon hit indicators and Progress bars no longer colour/rotate/match the alpha of the atoms they are attached to. 2016-01-24 23:22:12 -06:00
duncathan salt
fc7b38d483 Merge pull request #14880 from tkdrg/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
Fixes disposal holders not moving
2016-01-24 22:27:16 -06:00
KazeEspada
f4dc133be1 Merge branch 'master' of https://github.com/tgstation/-tg-station into LizardHunting 2016-01-24 20:52:04 -07:00
KazeEspada
004f081cb9 Lizards now hunt from a list. 2016-01-24 20:51:46 -07:00
Cheridan
b3240416b4 Merge pull request #14798 from MrPerson/come_on_guys
Fixes some awful defines to not be hacks
2016-01-24 21:15:14 -06:00
tkdrg
391d3ee7dd Merge pull request #14830 from KorPhaeron/welding_tank
Fixes KAs not detonating welding tanks
2016-01-25 00:13:07 -03:00
Nerd Lord
3d9c7eb1a9 synch mesh does more when surrounding, ripping tendrils does less stamina, more brute 2016-01-24 21:58:46 -05:00
Tkdrg
cea08f4a81 Fixes disposal holders not moving
Fixes #14866
2016-01-24 23:36:14 -03:00
KorPhaeron
621c59ad3d Remove grab 2016-01-24 19:14:40 -06:00
KorPhaeron
b80f5c095f Removes Grab from photocopier 2016-01-24 19:11:09 -06:00
KorPhaeron
056a621b05 Ninja 2016-01-24 19:09:11 -06:00
Iamgoofball
b92e2109b5 N E V E R 2016-01-24 14:39:08 -08:00
Iamgoofball
946ad1bdde NEVER SPEEDMERGE A GOOFBALL
N E V E R
2016-01-24 14:36:45 -08:00
KazeEspada
17fe36ebda Merge branch 'master' of https://github.com/tgstation/-tg-station into LizardHunting 2016-01-24 15:14:00 -07:00
KazeEspada
b774041648 Lizards now hunt and kill insects, they swallow them whole.
"We vorestation now." -Iamgoofball.
2016-01-24 15:13:46 -07:00
Nerd Lord
fe006e5c7f Blob tweaks(forever):
blobbernaut creation costs 30 points, does more damage to the factory
factories regenerate at half rate
reagents tweaked;
lexorin jelly does less brute
energized fibers does slightly more burn
sporing pods does slightly more toxin
replicating foam will try to replicate on all hits
hallucinogenic nectar does slightly more toxin and causes more hallucinations
cryogenic liquid does more burn
synchronous mesh does slightly less damage with one blob but massive damage with more blobs
pressurized slime has a lower chance to emit water when killed and when attacking
2016-01-24 16:05:17 -05:00
Nerd Lord
3981022c2b Fixes two issues(KOOOOOOOOR) 2016-01-24 15:35:47 -05:00
Iamgoofball
d18710442c cryostal/pyro no longer reacts in NOREACT beakers
final freeze
2016-01-24 12:23:04 -08:00
duncathan salt
812aa0555a Merge pull request #14824 from tkdrg/teh_gooey
Adds Keycard Authentication tgui
2016-01-24 13:58:51 -06:00
duncathan salt
f56eec60fb Merge pull request #14809 from tkdrg/hurr_bugexploitingisfun
[s]Fixes RPD/disposals exploits
2016-01-24 13:43:41 -06:00
Tkdrg
cc4bd69228 Adds Keycard Authentication tgui
Also rewrites keycard authentication because they were awful.
2016-01-24 16:29:36 -03:00