Razharas
e0a14d899d
Merge pull request #13267 from tkdrg/give_me_a_banjob_baby
...
Jobban cleanup & performance improvements
2015-11-29 12:00:01 +03:00
Razharas
2f0a221c8c
Merge pull request #13276 from MrStonedOne/patch-74
...
Removes spawn(rand(10,150)) from client database syncing
2015-11-29 11:57:05 +03:00
duncathan salt
a5dfafd0d4
Merge pull request #13197 from MrStonedOne/revert-12977-reverttimedinjectors
...
Revert "Properly reverts timed injectors"
2015-11-28 22:46:36 -06:00
Cheridan
4a408a5cff
Merge pull request #13237 from bgobandit/facehuggersfuck
...
Fixes facehugger-related bugs.
2015-11-28 21:08:37 -06:00
Cheridan
2abaa2b0f1
Merge pull request #13045 from KorPhaeron/laserbox
...
Fixes reflector structure being on a low layer
2015-11-28 20:42:21 -06:00
KorPhaeron
4245481019
Lower layer but still higher than it was
2015-11-28 18:48:42 -06:00
PKPenguin321
8e09b00f2c
Merged upstream
2015-11-28 15:49:41 -08:00
Cheridan
2fc49bbcad
Merge pull request #13265 from PKPenguin321/kor-you-lazy-fuck
...
Mounted Chainsaw Inhands 2.0
2015-11-28 17:01:35 -06:00
PKPenguin321
36d92b8c2d
fixes everything
...
i broke everything by giving teleprods a unique attack_self but forgetting to include the original functions of attack_self, making them unable to turn on/off. this fixes that.
2015-11-28 14:57:36 -08:00
duncathan salt
123994bf8d
Merge pull request #13290 from neersighted/nanoui_update
...
Fix up NanoUI states; add snowflake for Drones
2015-11-28 16:42:19 -06:00
Bjorn Neergaard
5601eaf56e
Fix Mixer NanoUI size
2015-11-28 17:16:20 -05:00
Bjorn Neergaard
959b96b16d
Fix up NanoUI states; add snowflake for Drones
...
Drones are simple_animals?! Why?!
This should let drones use all the things. They have to be nearby,
though.
2015-11-28 12:27:42 -05:00
Tkdrg
598fea785e
Jobban cleanup & performance improvements
...
Clients now cache their jobbans to save on DB queries.
Legacy jobbans and "new" (savefile) jobbans have been removed.
These are old cruft that has been unused for years, and since we require
a DB for notes anyway we might as well just get rid of the legacy stuff.
I considered removing legacy bans as well, but I was unsure if that
would go way beyond the scope of this PR (my main goal here is making
jobban_isbanned not awful).
Also note that this was basically untested, as I do not have a test
database. Any help testing this would be much appreciated.
2015-11-28 12:35:54 -03:00
Razharas
e715e1cc57
Merge pull request #13195 from neersighted/nanoui_update
...
[WIP|DNM] Update NanoUI
2015-11-28 14:17:49 +03:00
Kyle Spier-Swenson
89cf8fd112
Removes spawn(rand(10,150)) from client database syncing
...
This was a shitty way to do this, and the overhead from spawn() makes it not worth it now that the database is local to the server.
2015-11-28 00:08:28 -08:00
Bjorn Neergaard
6005d54d40
Update NanoUI to use the asset_cache system
...
Also move a bunch of folders around.
2015-11-28 00:56:30 -05:00
Bjorn Neergaard
404642b25b
Update the rest of the Atmos stuff
2015-11-27 23:17:15 -05:00
Bjorn Neergaard
2feedfa009
Update Cryo, NanoUI states, add new contains() helper
2015-11-27 21:21:52 -05:00
PKPenguin321
5382db940d
adds mounted chainsaw inhands, repaths mounted chainsaws to actually use them, makes the lines for mounted chainsaws use tabs instead of filthy spaces
2015-11-27 14:56:23 -08:00
Dorsisdwarf
592553354f
Merge pull request #12899 from TechnoAlchemisto/master
...
Makes cloaks into Exosuits as god(I) intended.v2
2015-11-27 22:22:47 +00:00
Remie Richards
53c7f8920b
Merge pull request #13260 from KorPhaeron/godwillsit
...
Updated Templar Armour
2015-11-27 21:00:58 +00:00
Remie Richards
b6209e4508
Merge pull request #13139 from AnturK/XXXFREEINSULATEDSWITHEVERYPURCHASEXXX
...
Adds Send To All to Lawyer/Captain cartridges
2015-11-27 20:58:03 +00:00
Remie Richards
cce47616c0
Merge pull request #13217 from AnturK/shuttlelight
...
Makes shuttle turf copy use proper helper.
2015-11-27 20:56:55 +00:00
Remie Richards
f55246e5c0
Merge pull request #12987 from AnturK/turrets
...
Removes gun_turret type and makes turret controls buildable
2015-11-27 20:52:59 +00:00
Remie Richards
62d301bfe5
Merge pull request #12998 from YotaXP/drone-fixes
...
Allows drones to use 'pick up' and watertanks
2015-11-27 20:38:23 +00:00
AnturK
18feac742a
Stuff
2015-11-27 21:31:47 +01:00
Bjorn Neergaard
5f108eef4e
Merge remote-tracking branch 'tgstation/master' into nanoui_update
2015-11-27 15:31:35 -05:00
Bjorn Neergaard
b897fb6d72
Fix NanoUIs flashing, update Tanks, Solars, and Canisters
2015-11-27 15:30:18 -05:00
KorPhaeron
49ad07b58c
Aligns helmet properly
2015-11-27 14:28:44 -06:00
YotaXP
68dbc7cf27
Code formatting!
...
Dat online PR editor.
2015-11-27 15:18:16 -05:00
Remie Richards
efd06ba92f
Merge pull request #13165 from Menshin/login_runtimes_fix
...
Fixes login runtimes for round start observers
2015-11-27 20:14:49 +00:00
Remie Richards
fa8237f270
Merge pull request #13215 from tkdrg/fuckthenuke
...
Nukes will no longer nuke the MC sometimes
2015-11-27 20:12:33 +00:00
Remie Richards
fdede51a09
Merge pull request #12954 from MMMiracles/spookycaves
...
New Away Mission: Caves
2015-11-27 20:11:26 +00:00
Remie Richards
a5f582a2ea
Merge pull request #13172 from neersighted/wood_barricade_bullets
...
Fix Wooden Barricades not taking bullet damage
2015-11-27 20:03:19 +00:00
Remie Richards
08aee6ce4f
Merge pull request #12965 from Shadowlight213/conversionbanfixes
...
Makes the conversion jobban replacement use the new antag flags
2015-11-27 20:02:45 +00:00
KorPhaeron
86e98947c3
Updated Templar Armour
2015-11-27 14:01:25 -06:00
Remie Richards
4079e1bb7f
Merge pull request #13158 from KorPhaeron/Nya
...
Removes references to "valid" from purrbation
2015-11-27 20:01:17 +00:00
duncathan salt
383e77db8a
Merge pull request #13220 from KorPhaeron/godwillsit
...
Adds knight armour
2015-11-27 13:58:08 -06:00
KorPhaeron
79550bf8ac
Updated sprites
2015-11-27 13:34:23 -06:00
phil235
c88a975c0e
Merge pull request #13242 from Anonus/colorsfix
...
Fixes revenant blight not resetting mutantrace colors properly
2015-11-27 18:05:47 +01:00
phil235
da0ba3659f
Merge pull request #13239 from AnturK/animalbots
...
Simple Animal Bots - Beepsky strikes back.
2015-11-27 17:37:59 +01:00
AnturK
2ae759486c
Fixes
2015-11-27 17:15:55 +01:00
Bjorn Neergaard
83a2d64b25
Update NanoUI Javascript libraries, SMES UI
2015-11-27 01:13:30 -05:00
MMMiracles
5f5d8bca95
did you know this is the final change? no.
2015-11-27 01:01:43 -05:00
Tkdrg
bec0d04e98
Nukes will no longer lock the MC sometimes
...
Fixes #3956
Also updates CONTRIBUTING.md on the newline policy.
2015-11-27 00:25:08 -03:00
duncathan salt
b415e5b3b1
Merge pull request #13202 from KorPhaeron/pod_launch
...
Fixes pod early launch
2015-11-26 21:19:13 -06:00
Bjorn Neergaard
6a6262d6b2
Finish refactor/retooling of NanoUI core
...
Also:
* Fix NanoUI on IE11+
* Add missing files (oops!)
2015-11-26 22:17:53 -05:00
PKPenguin321
cf29721672
fixes conflicts, adds the ability to remove the crystal from the prod via using it when no cell is attached
2015-11-26 18:28:12 -08:00
PKPenguin321
7e640d3463
Merge branch 'master' of https://github.com/tgstation/-tg-station into teleprods
2015-11-26 17:42:59 -08:00
KorPhaeron
047c5625ae
Removes sanity check
2015-11-26 18:54:59 -06:00
