Commit Graph

14295 Commits

Author SHA1 Message Date
Tkdrg 868e32acb5 Fixes posibrain feedback message
Fixes #14245
2016-01-01 12:50:59 -03:00
Tkdrg 94752caf4a Fixes cable_coil children not merging each other
Fixes #14240
2016-01-01 12:44:04 -03:00
AnturK 1ee0c1cbba Buffs Dihydrogen monoxide 2016-01-01 15:17:29 +01:00
AnturK 907083e071 Fixes extinguishing burning structures 2016-01-01 14:55:34 +01:00
KorPhaeron dde4690cb4 Fixes floor is lava and advanced darkness 2016-01-01 05:43:17 -06:00
TrustyGun b31024be36 Updates tooltip colors 2016-01-01 05:25:22 -05:00
Cheridan 9eef40c33f Merge pull request #14190 from tkdrg/lmao
Fixes create revolutionares bugs
2016-01-01 00:46:02 -06:00
arty23 d5cbc036cf Matter bin description grammar fix
made matter bin descriptions more grammatically correct, applies to all research levels
2015-12-31 22:52:03 -06:00
Cheridan 92ba9dd695 Merge pull request #14147 from tkdrg/steelth
Stealthmin Improvements
2015-12-31 22:24:03 -06:00
tkdrg e5941a59a2 Merge pull request #14124 from KorPhaeron/darkness
Advanced Darkness (wizard event)
2016-01-01 00:51:55 -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
Buggy123 e95883ed89 Update drinks.dm 2015-12-31 20:41:44 -05:00
KorPhaeron b9bf6ef547 Advanced Darkness 2015-12-31 19:32:02 -06: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
Buggy123 2b3c6822b3 added 20u transfer amount 2015-12-31 19:48:47 -05:00
Buggy123 05b584aab4 Update reagent_containers.dm 2015-12-31 19:47:15 -05: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
KorPhaeron a38a9d55c7 Autorifle magazine 2015-12-31 17:40:40 -06:00
KorPhaeron 72da5f23e4 Bottle 2015-12-31 17:23:16 -06:00
tkdrg 82c53c4474 Merge pull request #14171 from AnturK/bang
Simple mob fixes
2015-12-31 18:40:42 -03:00
KorPhaeron f18eda7df2 Names 2015-12-31 15:04:05 -06: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
KorPhaeron efc4df456e Poor indent 2015-12-31 11:37:51 -06:00
Nerd Lord 8996b7c71e Strong independent carp that don't get pushed around. 2015-12-31 12:31:28 -05:00
KorPhaeron 9c8a0cb0a5 Implant 2015-12-31 10:47:33 -06:00
KorPhaeron 52248a6875 Icon 2015-12-31 01:55:40 -06:00
Tkdrg 3b1553cb8c Fixes create revolutionares bugs
Fixes create revolutionares feedback message
Fixes creating revs on z levels other than 1

Fixes #14189
Fixes #14161
2015-12-31 04:19:32 -03:00
tkdrg 52a45b6292 Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework
OBJECTIVES REWORK: Better Objectives Generation
2015-12-31 03:11:41 -03:00
KorPhaeron bb8af2785e Guardian Naming 2015-12-30 22:23:33 -06:00
tkdrg da97c0fb58 Merge pull request #14107 from LanCartwright/newvirogrenades
Viro-terror grenade renovation
2015-12-31 00:04:38 -03:00
tkdrg 4485cc3dfb Merge pull request #14146 from KorPhaeron/guns
Lesser Summon Guns
2015-12-30 23:32:13 -03:00
tkdrg 50f6b7b8c0 Merge pull request #14154 from KorPhaeron/telsa
Removes excess tesla balls from orbit list
2015-12-30 23:27:58 -03:00
KorPhaeron ff5767d785 Nevermind 2015-12-30 20:12:40 -06:00
KorPhaeron 504926883f Cleans up code 2015-12-30 20:10:15 -06:00
Incoming 84fc69d825 Removes gender restrictions from socks. 2015-12-30 20:53:40 -05:00
KorPhaeron 9499d35c6b Diety name 2015-12-30 19:39:35 -06:00
tkdrg 51a28ab055 Merge pull request #14159 from somnium13/fix-in-prec
Fixes 'in' operator precedence issues.
2015-12-30 22:38:13 -03:00
tkdrg 213cebe1d6 Merge pull request #14153 from KorPhaeron/capsule
Fixes bluespace shelters destroying shuttles
2015-12-30 22:36:48 -03:00
KorPhaeron 79e5f3d37e Check that actually works 2015-12-30 19:10:49 -06:00
bgobandit 470fcbc58f Fixes messages for grabbing someone who is buckled in. 2015-12-30 19:17:51 -05:00
WJohn 7e2daf6c23 Merge pull request #14156 from Anonus/newbooks
Replaces every single book sprite with better sprites
2015-12-30 18:31:31 -05:00
duncathan salt f09025abf9 Merge pull request #13983 from PKPenguin321/arm-mods
Adds Arm-Mods (Mounted Taser & Mounted Laser)
2015-12-30 23:37:01 +01:00
tkdrg f58c4bf635 Merge pull request #14127 from AnturK/pickups
Adds a few special mines/pickups
2015-12-30 18:52:42 -03:00
AnturK b875ab18cf Makes simple mob drift properly 2015-12-30 22:31:51 +01:00
tkdrg 44a0a1b079 Merge pull request #14152 from KorPhaeron/lizards
Fixes lizard hats being uncraftable
2015-12-30 18:12:24 -03:00
tkdrg e681243c44 Merge pull request #14151 from SouDescolado/patch-1
Add telescopic baton item to detective trenchcoat
2015-12-30 18:12:09 -03:00
tkdrg f04936251a Merge pull request #14149 from SouDescolado/patch-2
Add telescopic baton item to detective armor
2015-12-30 18:10:20 -03:00
AnturK 06946ca53c Adds timeout to player hivelord brood spawning. 2015-12-30 21:46:54 +01:00