Commit Graph

6736 Commits

Author SHA1 Message Date
Firecage
754491ce4c Changes relatives paths into absolute paths and makes some if()'s better 2016-01-17 01:36:56 +02:00
duncathan salt
227b3149b2 Merge pull request #14441 from SouDescolado/master
Fixes abandoned crates minigame / Also fixes tuberculosis kit
2016-01-08 07:16:22 -06:00
tkdrg
83b9ed8e18 Merge pull request #14433 from bgobandit/fixuno
Windows now give a message when repaired.
2016-01-07 03:18:48 -03:00
duncathan salt
18b9d67ab5 Merge pull request #14364 from swankcookie/cockroach_guts_fix
Cockroach guts fix
2016-01-06 22:50:15 -06:00
swankcookie
98d4b9076d Moves contraband to a more fitting location
Signed-off-by: swankcookie <__X__>
2016-01-06 22:12:00 -06:00
swankcookie
d4c3048a31 Removes redundant anchor tags
Signed-off-by: swankcookie <__X__>
2016-01-06 22:08:17 -06:00
tkdrg
5d6b18b177 Merge pull request #14446 from KorPhaeron/take_their_boxes_away
Fixes cardboard boxes deleting people
2016-01-06 15:52:14 -03:00
KorPhaeron
cf537737a1 Closets 2016-01-06 12:39:07 -06:00
Cheridan
1e516a68c7 Merge pull request #14347 from Iamgoofball/patch-143
Tesla Nerf (shh dont tell aran)
2016-01-06 12:22:05 -06:00
SouDescolado
783e669c2d Fixes Tuberculosis kit
Name was wrong
2016-01-06 15:52:38 -02:00
bgobandit
b1dbe47bbf Windows give a message when repaired. 2016-01-06 01:30:19 -05:00
SouDescolado
3b257854f0 Merge pull request #1 from tgstation/master
Merge shit
2016-01-05 14:44:37 -02:00
SouDescolado
92b3c84a22 Make the code beautiful
Less lines, same code.

Trying to fix merge conflict.

Gah
2016-01-05 14:36:39 -02:00
tkdrg
de09f8ee0b Merge pull request #14306 from MrStonedOne/patch-114
Makes pda cartridges use proper type safety.
2016-01-05 05:21:51 -03:00
Aranclanos
a9ef05807e Merge pull request #14362 from Bawhoppen/czechbarmanhelp
Gives barman back his new gear
2016-01-05 04:52:21 -03:00
Kyle Spier-Swenson
3c5cdbefe3 forgot to typecast properly 2016-01-04 23:42:45 -08:00
duncathan salt
ede4a3b378 Merge pull request #14335 from KorPhaeron/refunds
Uplink refund refactor/fixes cyborg spawners not appearing in nuke purchase log
2016-01-05 01:11:26 +01:00
Cheridan
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
KorPhaeron
8b08ce8a6b Better loop 2016-01-04 16:48:11 -06:00
Bjorn Neergaard
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
tkdrg
c13a2f97e5 Merge pull request #14342 from neersighted/tgui_followup
More tgui fixes and tweaks
2016-01-04 18:39:52 -03:00
duncathan salt
9a18bf56fc Merge pull request #14341 from phil235/CremationRuntimeFix
Fixes runtime when trying to cremate cockroach
2016-01-04 20:23:49 +01:00
duncathan salt
748e2e3485 Merge pull request #14345 from AnturK/mapjectors
Fixes injectors spawned before mutation table is ready
2016-01-04 20:21:48 +01:00
duncathan salt
777302afa5 Merge pull request #14346 from AnturK/chambutts
Restores default chameleon projector disguise
2016-01-04 20:20:59 +01:00
Bjorn Neergaard
dc69cbaefb Allow UIs to be attached to datums; various fixes 2016-01-04 10:46:31 -06:00
swankcookie
a7508350e5 Gives /cleanable.dm "anchored = 1" 2016-01-03 20:43:48 -06:00
MrStonedOne
6632a4c547 fixes explosions 2016-01-03 17:42:04 -08:00
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
MrStonedOne
5d86ed49f6 Merge conflic fix 2016-01-03 14:51:14 -08:00
Iamgoofball
e1828f363e nerfs machine bounce range 2016-01-03 10:25:10 -08:00
AnturK
bbaca08f74 Restores default chameleon projector disguise 2016-01-03 19:19:17 +01:00
AnturK
ff6d88f4e6 Fixes injectors spawned before mutation table is ready 2016-01-03 18:49:10 +01:00
phil235
78295d8238 Fixes runtime when trying to cremate an animal that deletes itself upon death (mouse, cockroach). 2016-01-03 18:11:18 +01:00
Razharas
10b74eb793 Merge pull request #14174 from Buggy123/Buggy123-IEDBUFF2
Buffs IEDS 2: electric boogaloo
2016-01-03 13:17:42 +03:00
KorPhaeron
8a72f5a55c Fixes cyborg teleport 2016-01-03 04:11:19 -06: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
MrStonedOne
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
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
Kyle Spier-Swenson
64fc9ffc4c Removes some : in cartridge code 2016-01-02 15:14:34 -08: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