Commit Graph

22833 Commits

Author SHA1 Message Date
Aranclanos
6a667d080e Merge pull request #14349 from AnturK/awayareas
Adds away areas to ghost teleport/ admin jump list
2016-01-05 04:54:39 -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
Aranclanos
3108162f1d Merge pull request #14308 from tgstation/duncathan-patch-1
Cancelling while adding a custom objective no longer adds a free objective
2016-01-05 04:39:09 -03:00
Cheridan
4e81912656 Merge pull request #14356 from phil235/AlienEvolveFix
Fixes some bug about alien evolving
2016-01-04 23:15:27 -06:00
duncathan salt
3dfa1b4e55 Merge pull request #14368 from PKPenguin321/patch-8
experimentor typo fix
2016-01-05 05:51:13 +01:00
duncathan salt
f9f12f6447 Merge pull request #14261 from KorPhaeron/SMES
SMES logging fix
2016-01-05 03:13:30 +01:00
KorPhaeron
3d74978881 Uses get_turf 2016-01-04 19:40:01 -06:00
phil235
2ed4643e74 forgot to remove that line. 2016-01-05 01:49:07 +01:00
duncathan salt
c3aff8dffe Merge pull request #14355 from ChangelingRain/justwatchthem
Adds follow links to overmind, revenant, and abductor chat
2016-01-05 01:15:10 +01: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
Nerd Lord
41eeedfc46 Fixes doubled shadowling messages 2016-01-04 18:23:29 -05: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
Bjorn Neergaard
174c25f53f Initialize non-inlined UIs through a topic call 2016-01-04 16:58:40 -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
Bjorn Neergaard
31281dabf7 Add IE detection
Now we beg the user to upgrade, or to switch to No Frills mode

Also fix some minor IE bugs
2016-01-04 15:17:26 -06:00
duncathan salt
04fcc515aa Merge pull request #14309 from tkdrg/hahaha_fuck
Fixes issues with destroying the narsie shell
2016-01-04 20:32:11 +01:00
duncathan salt
421ecbeb9f Merge pull request #14323 from Shadowlight213/Mindattacklog
Fixes VV attack logs being lost on cloning and body destruction and made gibbed antags show in check antags.
2016-01-04 20:31:37 +01:00
duncathan salt
e84668a8d9 Merge pull request #14328 from Shadowlight213/Greenslimesynths
Reworks Green slime core blacklist to use a species flag.
2016-01-04 20:30:06 +01:00
duncathan salt
5edf9f87e1 Merge pull request #14329 from KazeEspada/Mobfix1pointO
Fixes a runtime involving mobs that get deleted upon death.
2016-01-04 20:28:52 +01:00
duncathan salt
e79f214d58 Merge pull request #14330 from KorPhaeron/leap_icon
Makes leap_icon a hunter var instead of mob var
2016-01-04 20:27:47 +01:00
duncathan salt
fe16c5b50f Merge pull request #14333 from KorPhaeron/venus_human_trap
Fixes venus human traps killing eachother
2016-01-04 20:26:10 +01:00
duncathan salt
e0cb0e258e Merge pull request #14334 from KorPhaeron/statue_buffs
Fixes drones freezing living statues
2016-01-04 20:25:35 +01:00
duncathan salt
b922a105dc Merge pull request #14336 from AnturK/flax
Fixes changeling form swap
2016-01-04 20:24:32 +01: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
c510fb69c2 Merge pull request #14337 from AnturK/miningbot
Fixes mining bot being hard to repair.
2016-01-04 20:23:23 +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
duncathan salt
94b003f7a7 Merge pull request #14339 from AnturK/cleaning
Removes some unused code
2016-01-04 20:20:18 +01:00
Bjorn Neergaard
8994f95308 Clean some old comments 2016-01-04 12:22:22 -06:00
Bjorn Neergaard
57cd223eb0 Fix contains proc to use a loop 2016-01-04 12:17:09 -06:00
Bjorn Neergaard
dc69cbaefb Allow UIs to be attached to datums; various fixes 2016-01-04 10:46:31 -06:00
Remie Richards
dc1e7c11fa Merge pull request #14273 from MrStonedOne/patch-110
Fixes lava turfs processing forever as well as some burn logic
2016-01-04 07:41:30 +00:00
Kyle Spier-Swenson
f6d13b93a4 blame RR
[23:27:53] \<%Remie\> you know how it makes inflammable things burn
[23:28:02] \<%Remie\> (and that's buggy as fug but w/e)
[23:28:10] \<%Remie\> what about resetting it after the fire_act() call?
[23:28:21] \<%Remie\> that way inflammable things become inflammable again if they escape the lava
2016-01-03 23:31:33 -08:00
Kyle Spier-Swenson
1451db4cc4 does the remie 2016-01-03 23:22:33 -08:00
Jordie
ddc4b16c64 Merge pull request #14322 from MrStonedOne/spawnremovals
removes a bunch of unneeded timer less spawns
2016-01-04 18:21:36 +11:00
Bjorn Neergaard
453f149be5 Fix tgui states
This led to a few in-game exploits it seems
2016-01-04 00:02:28 -06:00
Bjorn Neergaard
1b5438851a Treat assets as binary; fix sizes once and for all 2016-01-03 23:09:14 -06:00
PKPenguin321
beaa3efd18 experimentor typo fix
fixes a small typo
2016-01-03 21:07:53 -08:00
Bjorn Neergaard
1955b8c2df Fix a couple typos with the Air Alarm UI 2016-01-03 21:45:57 -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
Bjorn Neergaard
1319bd722d Clean comments; adata on the serverside; update postcss; APC size 2016-01-03 19:18:55 -06:00
bawhoppen
3543175c51 Revert "fixes attempt two" 2016-01-03 19:05:52 -06:00
Bjorn Neergaard
9c1e05f57e Increase tgui security by inlining for admins only; reduce cruft 2016-01-03 18:59:01 -06:00
tkdrg
e0a16b4467 Merge pull request #14304 from MMMiracles/snowbuck
Snowdin Edits
2016-01-03 21:11:13 -03:00
tkdrg
e3caa991b0 Merge pull request #14311 from MrStonedOne/patch-115
Makes sdql2 DELETE use qdel and not del
2016-01-03 21:04:45 -03: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