Commit Graph

6701 Commits

Author SHA1 Message Date
Lularian
cb50a25772 gives barman his cool stuff again 2016-01-03 19:35:49 -06:00
bawhoppen
3543175c51 Revert "fixes attempt two" 2016-01-03 19:05:52 -06:00
tkdrg
473eb8291e Merge pull request #14216 from Bawhoppen/czechfixes2
fixes attempt two
2016-01-03 21:02:20 -03:00
Lularian
f5bc4b6b4f woops 2016-01-03 17:50:20 -06:00
Razharas
10b74eb793 Merge pull request #14174 from Buggy123/Buggy123-IEDBUFF2
Buffs IEDS 2: electric boogaloo
2016-01-03 13:17:42 +03:00
Lularian
5931214cf7 did i duck it up 2016-01-03 00:20:18 -06: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
Aranclanos
ca5f29b56c Merge pull request #14223 from KorPhaeron/tank
Fixes tank default release
2016-01-03 01:22:19 -03:00
Razharas
fd390009c7 Merge pull request #14252 from tkdrg/cablefix
Fixes cable_coil children not merging each other
2016-01-03 04:38:52 +03:00
Cheridan
cfbe48fc61 Merge pull request #14264 from AnturK/chamfix
Fixes chameleon projector ignoring closets
2016-01-02 16:37:40 -06:00
Cheridan
32f1dc2c9d Merge pull request #14258 from arty23/patch-5
M90gl dufflebag grammar fixed
2016-01-02 16:23:50 -06:00
tkdrg
2e25b27041 Merge pull request #14250 from AnturK/burningtables
Fixes extinguishing burning structures
2016-01-02 13:53:30 -03:00
tkdrg
7717aa27d1 Merge pull request #14244 from AnturK/tubefix
Fixes diagonal transit tube flipping
2016-01-02 13:50:32 -03:00
Bjorn Neergaard
777ba0486d Rename the tgui pref and adjust all UI sizes for the rewrite 2016-01-01 17:47:45 -06:00
Bjorn Neergaard
a2bb279164 NanoUI is now 'tgui' 2016-01-01 17:47:44 -06:00
Bjorn Neergaard
dc9db90064 Add interfaces
* Add tanks interface
* Add canister interface
* Add chem heater interface; wrap long template lines
* Add chem dispenser interface
* Add section header buttons
2016-01-01 17:45:58 -06:00
KorPhaeron
d25c62fd53 Fixes AI lawsync 2016-01-01 17:28:52 -06:00
AnturK
45912423df Makes champrojector use appearance 2016-01-01 21:35:14 +01:00
AnturK
99f56abe38 Fixes chameleon projector ignoring closets 2016-01-01 21:23:04 +01:00
tkdrg
e28576b1ce Merge pull request #14207 from KorPhaeron/spike
Meat spiking someone removes the grab from your hand
2016-01-01 16:32:56 -03:00
arty23
0e23fdee89 M90gl dufflebag grammar fixed
Issue reported by LanCartwright.
2016-01-01 12:46:23 -06: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
AnturK
1cdafe8a1d Fixes transit tube flipping 2016-01-01 13:39:43 +01: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
Tkdrg
0b40fe620f Merge remote-tracking branch 'LanCartwright/FIXESBOX' into HEAD
Closes #14225
2015-12-31 21:37:12 -03:00
Akke
6f47f9b5ee fixes items spawning in nullspace 2016-01-01 00:34:57 +00:00
KorPhaeron
18ef72b3c5 Fixes tank default release 2015-12-31 17:55:51 -06:00
bawhoppen
3f5101d84d oops? 2015-12-31 16:39:28 -06:00
Lularian
8e8526fd14 did I do it mum 2015-12-31 16:37:22 -06:00
tkdrg
153304ddc8 Merge pull request #14165 from SouDescolado/SouDescolado-patch-1
Stacks the papers inside a folder inside briefcase
2015-12-31 16:07:24 -03:00
KorPhaeron
7fd33d23a5 Meat spike 2015-12-31 12:50:05 -06:00
Buggy123
44879bceb1 Added small explosion as suggested 2015-12-30 23:05:26 -05:00
tkdrg
da97c0fb58 Merge pull request #14107 from LanCartwright/newvirogrenades
Viro-terror grenade renovation
2015-12-31 00:04:38 -03:00
tkdrg
b381ff2b31 Merge pull request #14132 from KorPhaeron/pda_spaces
Fixes PDA formatting
2015-12-30 23:27:28 -03:00
LanCartwright
02dc51db6f Update uplink_kits.dm 2015-12-31 02:17:30 +00:00
LanCartwright
fa2276fca6 fixes random tab
actually I hit tab instead of space
2015-12-31 02:13:36 +00:00
KorPhaeron
4b78a51361 Wrong place 2015-12-30 19:44:22 -06:00
KorPhaeron
1fee3c83a6 Span classes 2015-12-30 19:12:56 -06:00
Buggy123
9bb5283e65 Buffed IED - no explosion, but very large fireball 2015-12-30 17:31:36 -05:00
Buggy123
942ce3baef Update ghettobomb.dm 2015-12-30 17:21:45 -05:00
Buggy123
df2fd583a5 reverted changes to avoid issues with guard PR 2015-12-30 17:20:46 -05: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
032c8a4222 Adds nodrop to pickup chainsaw 2015-12-30 22:39:15 +01:00
SouDescolado
b9f7390786 Update briefcase.dm
Fixed bogus
Cookies to travis
2015-12-30 17:50:00 -02:00
SouDescolado
3aa209f2b8 Update briefcase.dm
Complete code overhaul
2015-12-30 17:43:28 -02:00
SouDescolado
66cfbb7316 Fixes folder color. Defined a new briefcase type
Cookies for travis
Need to fix lawyers spawned briefcase. Will try to fix it.
2015-12-30 16:50:56 -02:00
SouDescolado
4f0fc81b44 Changing folder to generic yellow color
Cookies to Travis.
2015-12-30 16:10:58 -02:00
SouDescolado
4d92cb1506 Update briefcase.dm
Removed Law Stamp from briefcases (Not all briefcases spawn at the law office)
Tried to bribe travis with cookies.
2015-12-30 14:12:59 -02:00