Commit Graph

14295 Commits

Author SHA1 Message Date
oranges d103d6c648 Change spider ghost alert to an in chat one
This could actually benefit from a nice subystem to handle it (calling humanize_from_ghost) on the appropriate atom when the user clicks the link
2016-01-29 15:42:05 +13:00
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
Akke 117f957787 removes fungal tb from traitor 2016-01-29 00:59:22 +00: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
tkdrg a5c3e3a746 Merge pull request #14888 from KorPhaeron/RED_UNZ_GO_FASTA
Red xenobio paint now works on vehicles
2016-01-28 20:38:15 -03:00
KorPhaeron 7e0fb61c1e Adds spaces to return ..() 2016-01-28 16:38:37 -06:00
xxalpha 767c751f74 Fixed bloodcrawl move setting loc to null.
forcemobe
2016-01-28 22:34:34 +00:00
tkdrg 9ac73a85f8 Merge pull request #14702 from tgstation/RemieRichards-callproc-improvement
callproc now outputs the contents of returned lists instead of /list
2016-01-28 18:57:13 -03:00
tkdrg e49a0877b5 Merge pull request #14964 from Jordie0608/firsticonsideredfancysqlthendecidedonasimplermethodwhichidiscoveredalreadyexisted
Fixes date change failing log ftp
2016-01-28 18:52:42 -03: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
Boredone f83bb4ca3c Removed the extra Var definition of reaction chance on the reactive/teleport armor, and changed the description on the base one. 2016-01-28 14:31:13 -07:00
tkdrg 884091ca54 Merge pull request #14922 from PKPenguin321/patch-9
makes paper bins use incapacitated() instead of a massive if()
2016-01-28 18:29:23 -03:00
Razharas 8c0694463e Merge pull request #14853 from RemieRichards/MechaPilots
Mecha pilots!
2016-01-29 00:28:14 +03:00
tkdrg 767132b1c9 Merge pull request #14924 from PKPenguin321/patch-10
fixes up some helmets
2016-01-28 18:27:46 -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
Razharas 90fc9a8aad Merge pull request #15005 from neersighted/tgui
Allow tgui input() to be 0, fix SMES components
2016-01-28 22:35:57 +03: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
Bjorn Neergaard f93822c195 Allow tgui input() to be 0, fix SMES components
Fixes #14965
2016-01-28 07:10:37 -06:00
KorPhaeron e3021745a1 Buffs cakehat 2016-01-28 00:51:10 -06:00
KorPhaeron 00f84f74ea AI upgrade software 2016-01-28 00:44:45 -06:00
KorPhaeron 77330ccd1f Shuttle Launch 2016-01-27 23:17:55 -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
Boredone 91e4b8f93b Forgot the H. on the Rad_Act, so it didn't actually do anything. Fixed. 2016-01-27 20:44:59 -07:00
KorPhaeron c8bccbd0a5 Laserguns 2016-01-27 21:14:08 -06: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 7b2dc3fe73 Shuffles check order 2016-01-27 19:13:21 -06:00
Razharas 28e1e1d3b3 Merge pull request #14948 from neersighted/uplink_fix
Uplink fix
2016-01-28 03:09:09 +03:00
Boredone c66ea73868 This removes the teleportation from the base reactive armor, while making the amount of radiation, and how far it can possibly teleport, based on some vars. 2016-01-27 16:46:36 -07:00
KorPhaeron b617ba1458 Fixes cleanbot doubled messages 2016-01-27 13:58:30 -06:00
Razharas b1f9881c3b Merge pull request #14932 from KorPhaeron/ctf
Fixes CTF Area
2016-01-27 22:24:20 +03:00
PKPenguin321 952e475808 addresses some feedback, hoopefully makes it compile
only part i'm not 100% sure about is the iscarbon, but whatever
2016-01-27 10:01:49 -08:00
Firecage d82f970234 Merge conflict fix 2016-01-27 17:38:42 +02:00
duncathan salt fd6482f8cb Merge pull request #14905 from Razharas/Assembly
Some assembly requaired
2016-01-27 08:03:00 -06:00
Firecage d034a3f8ab Compile fix 2016-01-27 13:30:46 +02:00
Firecage 7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
Jordie0608 30c5ab037b removes unnecessary file() 2016-01-27 22:18:38 +11:00
Jordie0608 579ff0428e fixes date change failing log ftp 2016-01-27 21:48:41 +11: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
Boredone 4eb671093d Messed up a bit on the first commit, doing this removed some compile errors. 2016-01-27 02:09:03 -07:00
Boredone c5266a014c Ah, first commit. This makes a new child or Reactive Armor, reactive/teleport.
It is the same as normal reactive teleport armor, but radiates the one wearing it I'm pretty sure.
2016-01-27 01:44:36 -07:00