3b257854f0
Merge pull request #1 from tgstation/master
...
Merge shit
2016-01-05 14:44:37 -02:00
92b3c84a22
Make the code beautiful
...
Less lines, same code.
Trying to fix merge conflict.
Gah
2016-01-05 14:36:39 -02:00
a9ef05807e
Merge pull request #14362 from Bawhoppen/czechbarmanhelp
...
Gives barman back his new gear
2016-01-05 04:52:21 -03:00
797bfe01ef
Merge pull request #14391 from neersighted/tgui_followup
...
Fix tgui proc signatures and thus AI APC reboot
2016-01-04 17:06:52 -06:00
aec6bc103c
Fix tgui proc signatures and thus AI APC reboot
...
This allows state overloading
Make AI reboot code use ui_interact instead of attack_ai
Fixes #13762
2016-01-04 16:25:20 -06:00
748e2e3485
Merge pull request #14345 from AnturK/mapjectors
...
Fixes injectors spawned before mutation table is ready
2016-01-04 20:21:48 +01:00
cb50a25772
gives barman his cool stuff again
2016-01-03 19:35:49 -06:00
3543175c51
Revert "fixes attempt two"
2016-01-03 19:05:52 -06:00
473eb8291e
Merge pull request #14216 from Bawhoppen/czechfixes2
...
fixes attempt two
2016-01-03 21:02:20 -03:00
f5bc4b6b4f
woops
2016-01-03 17:50:20 -06:00
5d86ed49f6
Merge conflic fix
2016-01-03 14:51:14 -08:00
ff6d88f4e6
Fixes injectors spawned before mutation table is ready
2016-01-03 18:49:10 +01:00
10b74eb793
Merge pull request #14174 from Buggy123/Buggy123-IEDBUFF2
...
Buffs IEDS 2: electric boogaloo
2016-01-03 13:17:42 +03:00
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
ca5f29b56c
Merge pull request #14223 from KorPhaeron/tank
...
Fixes tank default release
2016-01-03 01:22:19 -03:00
b50e8d2a63
removes a bunch of unneeded spawns
...
spawns have a high overhead.
I only went for easy targets, almost every spawn could be removed with a few subsystems in place to handle delays or cooldowns
2016-01-02 18:23:02 -08:00
32f1dc2c9d
Merge pull request #14258 from arty23/patch-5
...
M90gl dufflebag grammar fixed
2016-01-02 16:23:50 -06:00
2e25b27041
Merge pull request #14250 from AnturK/burningtables
...
Fixes extinguishing burning structures
2016-01-02 13:53:30 -03:00
777ba0486d
Rename the tgui pref and adjust all UI sizes for the rewrite
2016-01-01 17:47:45 -06:00
a2bb279164
NanoUI is now 'tgui'
2016-01-01 17:47:44 -06:00
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
d25c62fd53
Fixes AI lawsync
2016-01-01 17:28:52 -06:00
0e23fdee89
M90gl dufflebag grammar fixed
...
Issue reported by LanCartwright.
2016-01-01 12:46:23 -06:00
1ee0c1cbba
Buffs Dihydrogen monoxide
2016-01-01 15:17:29 +01:00
907083e071
Fixes extinguishing burning structures
2016-01-01 14:55:34 +01:00
0b40fe620f
Merge remote-tracking branch 'LanCartwright/FIXESBOX' into HEAD
...
Closes #14225
2015-12-31 21:37:12 -03:00
6f47f9b5ee
fixes items spawning in nullspace
2016-01-01 00:34:57 +00:00
18ef72b3c5
Fixes tank default release
2015-12-31 17:55:51 -06:00
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
44879bceb1
Added small explosion as suggested
2015-12-30 23:05:26 -05:00
da97c0fb58
Merge pull request #14107 from LanCartwright/newvirogrenades
...
Viro-terror grenade renovation
2015-12-31 00:04:38 -03:00
02dc51db6f
Update uplink_kits.dm
2015-12-31 02:17:30 +00:00
fa2276fca6
fixes random tab
...
actually I hit tab instead of space
2015-12-31 02:13:36 +00:00
9bb5283e65
Buffed IED - no explosion, but very large fireball
2015-12-30 17:31:36 -05:00
942ce3baef
Update ghettobomb.dm
2015-12-30 17:21:45 -05:00
df2fd583a5
reverted changes to avoid issues with guard PR
2015-12-30 17:20:46 -05:00
b9f7390786
Update briefcase.dm
...
Fixed bogus
Cookies to travis
2015-12-30 17:50:00 -02:00
3aa209f2b8
Update briefcase.dm
...
Complete code overhaul
2015-12-30 17:43:28 -02:00
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
4f0fc81b44
Changing folder to generic yellow color
...
Cookies to Travis.
2015-12-30 16:10:58 -02:00
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
379cdde284
Update briefcase.dm
...
gah
2015-12-30 14:05:51 -02:00
4a31ab7b3e
Update briefcase.dm
...
Fixed travis(?), added law stamp to briefcase
2015-12-30 14:00:55 -02:00
37d8bf27be
Update briefcase.dm
2015-12-30 13:48:21 -02:00
3841d8b8ea
Update briefcase.dm
2015-12-30 13:35:00 -02:00
43bf151814
Stacks the papers inside a folder inside briefcase
...
Briefcases now spawn with a pen and a blue folder, filled with papers, instead of spawning filled with papers.
2015-12-30 13:26:24 -02:00
9a021cff3d
Stacks the papers inside a folder inside briefcase
...
Makes all paper be neatly stacked inside a folder in the briefcase.
2015-12-30 13:11:04 -02:00
356ec745c1
Merge pull request #13787 from Chnkr/revert-13643-Robocop
...
Revert "changes robocop law priority"
2015-12-30 00:44:36 +03:00
42d10a22d3
Merge pull request #13926 from Bawhoppen/czechmilitary
...
Tactical Gear + small changes
2015-12-29 20:43:14 +01:00
b39dfd5418
Merge pull request #14064 from tkdrg/litlog
...
Adds a message_admins() when a flamethrower is lit
2015-12-29 07:05:11 +00:00
SouDescolado
Aranclanos
Cheridan
Bjorn Neergaard
duncathan salt
Lularian
bawhoppen
tkdrg
MrStonedOne
AnturK
Razharas
KorPhaeron
arty23
Akke
Buggy123
Remie Richards