Commit Graph

5846 Commits

Author SHA1 Message Date
Aranclanos 871540e885 Merge pull request #14278 from MrStonedOne/patch-111
Patch for byond bug id:1905199
2016-01-03 02:48:08 -03:00
Aranclanos 9549090570 Merge pull request #14277 from KorPhaeron/goliath
Goliath fixes
2016-01-03 02:24:44 -03:00
Aranclanos e6d9711892 Merge pull request #14272 from KorPhaeron/AI_fix
Fixes borgs not getting 0 law, ion laws, etc
2016-01-03 02:19:22 -03:00
tkdrg 47d704cb91 Merge pull request #14293 from phil235/HivebotLootFix
Fixes typo in hivebot loot causing a runtime.
2016-01-02 23:57:36 -03:00
KorPhaeron 9ce8c0d629 Goliath 2016-01-02 19:29:13 -06:00
tkdrg cf1a0c131f Merge pull request #14254 from milocv/fixes
Adds NOBREATH check for smoke
2016-01-02 21:04:16 -03:00
Cheridan d67e0075fc Merge pull request #14253 from tkdrg/posimsg
Fixes posibrain feedback message
2016-01-02 16:48:37 -06:00
phil235 ba62f2b76e Fixes typo in hivebot loot causing a runtime. 2016-01-02 13:53:18 +01:00
Cheridan 424e2a913b Merge pull request #14289 from KorPhaeron/stando_power
Removes floating from guardians
2016-01-02 02:34:42 -06:00
KorPhaeron baabd48184 Removes floating 2016-01-02 02:26:41 -06:00
tkdrg e581358a9d Merge pull request #14188 from KorPhaeron/stando_power
Guardian/Parasite Naming
2016-01-02 04:15:14 -03:00
KorPhaeron 57b6dddbe1 Floating 2016-01-02 01:06:53 -06:00
tkdrg f410137129 Merge pull request #13930 from MMMiracles/geneticsishard
New Away Mission: Research Facility
2016-01-02 03:27:45 -03:00
MMMiracles 1171d9d3fc spellingishard 2016-01-02 00:59:53 -05:00
Cheridan bfa77e61b4 Merge pull request #14191 from KorPhaeron/icon
Removes the little icon when examining humans
2016-01-01 23:21:30 -06:00
KorPhaeron b5bce2b844 Removes more old code 2016-01-01 23:03:40 -06:00
KorPhaeron 144212bdd1 New icons 2016-01-01 22:49:21 -06:00
Kyle Spier-Swenson 77eb4cf09d Patch for byond bug id:1905199
Simple patch for http://www.byond.com/forum/?post=1905199
2016-01-01 18:46:17 -08:00
tkdrg 0949e89a5a Merge pull request #14031 from KorPhaeron/AI
New malf power (lipreading) + points rebalancing
2016-01-01 23:19:26 -03:00
KorPhaeron fc0ab5d7b0 Turfs 2016-01-01 20:02:03 -06:00
KorPhaeron 50284e9683 Fixes goliath icon 2016-01-01 19:55:25 -06:00
KorPhaeron 6adc22a350 Removes copypaste 2016-01-01 19:34:04 -06:00
KorPhaeron e395d5e8f1 Makes if check prettier 2016-01-01 18:00:32 -06:00
Bjorn Neergaard a2bb279164 NanoUI is now 'tgui' 2016-01-01 17:47:44 -06:00
KorPhaeron d25c62fd53 Fixes AI lawsync 2016-01-01 17:28:52 -06:00
MMMiracles c2bba8d2ff probably fine 2016-01-01 15:24:02 -05:00
MMMiracles 2be090aee1 Merge branch 'master' of https://github.com/tgstation/-tg-station into geneticsishard 2016-01-01 15:03:45 -05:00
tkdrg 471f39aeb2 Merge pull request #14200 from Anonus/spacecarp
Spacecarp are now immune to atmos pushing
2016-01-01 16:32:13 -03:00
Miloc df1787daf3 nobreath good 2016-01-01 18:48:45 +01:00
Tkdrg 868e32acb5 Fixes posibrain feedback message
Fixes #14245
2016-01-01 12:50:59 -03:00
tkdrg 048480decc Merge pull request #14096 from KorPhaeron/lancer
Fixes successive generations of grey tide clones not despawning
2016-01-01 00:50:42 -03:00
tkdrg 8b4ce26d12 Merge pull request #14182 from Incoming5643/Men_in_tights
Removes gender restrictions from socks
2015-12-31 22:09:35 -03:00
Cheridan cb27e966eb Merge pull request #14144 from TheRealGLH/electric_chair
Containment fields and electric chairs now use electrocute_act
2015-12-31 19:01:52 -06:00
KorPhaeron 2b129fb2ea Multiply chance down 2015-12-31 18:55:31 -06:00
tkdrg b8ce135a34 Merge pull request #14178 from bgobandit/bucklingmessages
Fixes extra messages while grabbing someone who is buckled.
2015-12-31 21:28:51 -03:00
tkdrg 82c53c4474 Merge pull request #14171 from AnturK/bang
Simple mob fixes
2015-12-31 18:40:42 -03:00
tkdrg 12fe71606f Merge pull request #14155 from optimumtact/patch-4
Add cockroach guts to cleanbot target list
2015-12-31 17:42:23 -03:00
Nerd Lord 8996b7c71e Strong independent carp that don't get pushed around. 2015-12-31 12:31:28 -05:00
KorPhaeron 52248a6875 Icon 2015-12-31 01:55:40 -06:00
KorPhaeron bb8af2785e Guardian Naming 2015-12-30 22:23:33 -06:00
Incoming 84fc69d825 Removes gender restrictions from socks. 2015-12-30 20:53:40 -05:00
bgobandit 470fcbc58f Fixes messages for grabbing someone who is buckled in. 2015-12-30 19:17:51 -05:00
AnturK b875ab18cf Makes simple mob drift properly 2015-12-30 22:31:51 +01:00
AnturK 06946ca53c Adds timeout to player hivelord brood spawning. 2015-12-30 21:46:54 +01:00
Razharas fd0738aff8 Merge pull request #14125 from KorPhaeron/gold_grub
Gold grub fix
2015-12-30 00:38:06 +03:00
oranges 06338ecd3d Add cockroach guts to cleanbot target list
whitelists are such a meme
2015-12-30 08:58:27 +13:00
tkdrg 5930ee0d66 Merge pull request #13588 from Lo6a4evskiy/quick-equip-refactor
Refactor quick-equip verb
2015-12-29 14:26:48 -03:00
Lo6a4evskiy ab6fb1ab36 Refactor using slot_equipment_priority 2015-12-29 17:59:56 +04:00
TheRealGLH d7097594ff removes the burn_skin proc
removes the burn_skin proc
2015-12-29 13:48:38 +01:00
Remie Richards ae2ef83fc6 Merge pull request #14062 from tkdrg/jesusFUCK
[s]Fixes secbot construction dupe
2015-12-29 07:06:19 +00:00