Commit Graph

6438 Commits

Author SHA1 Message Date
xxalpha ad06f18769 pls 2016-01-29 01:50:02 +00:00
xxalpha 4701d31b46 Merge remote-tracking branch 'upstream/master' into aistatus 2016-01-29 01:49:21 +00:00
oranges 0b02eba1e8 Mulebot buckle check improved
It makes sure you are buckled in before actually setting you as the loaded item/passenger
2016-01-29 01:37:33 +00:00
Fox-McCloud 401f2b84ff Refactors Human Explosion Damage 2016-01-28 20:22:10 -05:00
MMMiracles 5f5e664478 quickly adds uk and commie before anyone notices 2016-01-28 20:21:30 -05:00
MMMiracles 06500d02a8 adds female variant of patriotic underwear. 2016-01-28 19:50:06 -05:00
Razharas 0826128459 Merge pull request #14698 from Firecage/absolutepathsandifs
Absolute paths and changes one liner if's/else's/else if's.
2016-01-29 03:15:12 +03:00
xxalpha 767c751f74 Fixed bloodcrawl move setting loc to null.
forcemobe
2016-01-28 22:34:34 +00:00
xxalpha d31789fde4 A whole commit for one blank line. 2016-01-28 21:34:05 +00:00
tkdrg 614ab6cd1c Merge pull request #14975 from KorPhaeron/cleanbot
Fixes cleanbot doubled messages
2016-01-28 18:33:25 -03:00
Razharas 8c0694463e Merge pull request #14853 from RemieRichards/MechaPilots
Mecha pilots!
2016-01-29 00:28:14 +03:00
xxalpha 52ea0ae691 Merge remote-tracking branch 'upstream/master' into aistatus 2016-01-28 21:19:57 +00:00
xxalpha cc8387caa6 Moved emp Stuns to /robot.
undo life.dm
2016-01-28 21:18:15 +00:00
Nerd Lord 2cce7c6c86 i'm awful at math 2016-01-28 13:16:41 -05:00
Bjorn Neergaard b57d3bd4f2 Rip out serverside winsets
Note: need to re-add a few winsets for borg/human mode
2016-01-28 12:14:43 -06:00
Nerd Lord d492db3e58 useful commit message here 2016-01-28 12:50:38 -05:00
KorPhaeron 00f84f74ea AI upgrade software 2016-01-28 00:44:45 -06:00
Razharas cabb43bcd1 Merge pull request #14955 from Incoming5643/heremembers
Local Psuedosentient Bird: 'I am growing stronger'
2016-01-28 07:57:34 +03:00
Nerd Lord cdcf4dbc26 Holoparasites have a health hud display for the summoner's health, as a percentage.
Adds glows when holoparasites force-recall to their summoner
2016-01-27 21:32:22 -05:00
KorPhaeron b617ba1458 Fixes cleanbot doubled messages 2016-01-27 13:58:30 -06:00
Firecage 7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
hornygranny 5238365dbe MUH STANDARDS 2016-01-26 21:06:10 -08:00
hornygranny 610a3eef03 gotta go fast 2016-01-26 20:59:12 -08:00
Razharas 41a9a90947 Merge pull request #14921 from MrPerson/hud_garbage_collection
Make /datum/hud garbage collect correctly
2016-01-27 07:19:42 +03:00
Incoming 7eaca93499 Poly is now more impressionable from things he hears in person (in parrot) and will mimic the line 50% of the time (up from 20%)
Poly is now less impressionable from things he hears over the radio (the parrot) and will mimic the line 5% of the time (down from 20%)

Expands Poly's memory from 20 lines to 500 lines.
2016-01-26 22:36:15 -05:00
duncathan salt 2a0b89c951 Update cleanbot.dm 2016-01-26 20:33:33 -06:00
Razharas 95bdba5ef9 Merge pull request #14912 from ChangelingRain/comment
Blobs now have an animation when attacking a target
2016-01-27 05:16:53 +03:00
Razharas e67012ef41 Merge pull request #14773 from ChangelingRain/punchy
Nerfs golem punch stun chances
2016-01-27 04:09:14 +03:00
KorPhaeron b2f4b04fdf Lusty Xenomorph Maid 2016-01-26 17:08:44 -06:00
francinum 783f9d6fb9 Thin-high Restrictions 2016-01-26 16:58:39 -05:00
francinum 2c52d55e83 Gives Socks their gender restrictions back.
What I get for working with out of date files.
2016-01-26 16:53:07 -05:00
francinum 0824ddbbb6 Adds Neko Underwear
White and Black.
Sprites by Weedscopes/Chocobro
2016-01-26 16:37:56 -05:00
duncathan salt 7c76c0ddbb Merge pull request #14887 from neersighted/Byond509
Byond509
2016-01-26 01:57:42 -06:00
Razharas 01831fc8eb Merge pull request #14862 from KazeEspada/LizardHunting
Lizard hunting
2016-01-26 08:01:11 +03:00
MrPerson 5c0992f8a6 Make /datum/hud garbage collect correctly
For Dec. 21st:
The following path has failed to GC 739 time(s).
Path : /datum/hud
2016-01-25 20:32:04 -08:00
Nerd Lord c3699fa909 Blobs now have an animation when attacking a turf
updates a comment for accuracy
incidentally fixes bots to use the overlay instead of setting all the vars then deleting a thing
2016-01-25 21:17:56 -05: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
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 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
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
Remie Richards 7cab0ddda1 Fixes Mecha pilots trying to steal their enemy's mecha while they're still in it, rofl. 2016-01-24 23:46:23 +00:00
Remie Richards 674765a27b Fixes Mecha Pilots not attacking enemy Pilots 2016-01-24 22:43:53 +00: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