73b83ddef6
Merge pull request #5357 from tkdrg/attackoftheturfs
...
Floor refactor
2014-10-30 17:23:20 -07:00
0bb462e857
Fixes botcall conflicts, removes even more cruft and unused code
2014-10-30 20:36:30 -03:00
a1a4793076
Merge pull request #5444 from paprka/newUI
...
Porting UI updates from hippie station
2014-10-30 16:25:58 -07:00
9526b8804b
Merge remote-tracking branch 'upstream/master' into attackoftheturfs
2014-10-30 19:35:03 -03:00
d8e6a1a931
Readds the built-in floor tiles for a singulo purpose.
2014-10-30 19:28:20 -03:00
4e7cb0eb01
Merge pull request #5530 from MrStonedOne/fukkinreallyerro
...
[MSO] Minor sql improvements.
2014-10-30 21:00:42 +01:00
985eb09333
Merge pull request #5508 from tkdrg/harvestallthethings
...
You can now only become a harvester when you can see Nar-sie
2014-10-30 12:13:35 -05:00
e2c4eebe9d
You can now only become a harvester when you can see Nar-sie
2014-10-30 13:24:43 -03:00
844441571e
Merge pull request #5533 from GunHog/Botcall_Fix
...
Botcall Runtime fixes
2014-10-30 06:37:24 -07:00
9a4637f9b4
Merge pull request #5526 from Incoming5643/whydidItouchgamemodecode
...
I must have been really tired when I wrote #4846
2014-10-30 08:34:05 -05:00
7cc804eef3
Merge pull request #5491 from phil235/HulkSlipFix
...
Fixes the hulk slip bug creating huge amounts of lag
2014-10-30 03:35:49 -03:00
99e16098a5
Merge pull request #5542 from MrPerson/singulo_INSIDE_A_STEEL_CAGE_BAH_GAWD
...
Fixes the singulo drifting through the shield gens and such
2014-10-29 19:22:40 -07:00
3452f63f51
Fixes the singulo drifting through the shield gens and such, woops
2014-10-29 19:18:36 -07:00
afbeb03d9f
Fixes admin only vv related sql injection exploit in feedback reporting.
...
Noticed this while looking over my PR, by storing (and trusting) the escaped version, an admin could edit this in vv and do unspeakable things to the database
2014-10-29 18:19:47 -07:00
6f0666138a
Ensures spawned proc is never called if the client goes away
2014-10-29 18:02:21 -07:00
55f456bc73
Botcall Runtime fixes
...
It was possible for the "path" list to be null, resulting in runtimes
when checking its lengths.
The cleanbot's "target" var could be null when attempting to compare the
target's location with its own.
Added some missing checks to prevent runtimes.
2014-10-29 11:30:23 -05:00
40d884dbfa
Feedback reporting now uses 1 insert query with mutiple rows
...
Rather then making a new query for each feedback item.
Each query can take between 25ms and 100ms, and this is a static per-query overhead, so removing the 60 or so needless querys will speed things up.
2014-10-29 04:22:35 -07:00
138567b7cf
Removes some sql related lag caused by too many clients connecting at once after a restart
...
(and other minor fixes to client sql logic)
Clients will now spread out their sql database connection logging and related ckey by ip/cid searching at world start so it doesn't all happen at once.
Fixes a minor bug with related ckey searching where only one would be returned.
Fixes a minor bug where related ckey searching would return the client's own ckey.
2014-10-29 04:15:46 -07:00
8a064ee545
Removes extra sql sanitize procs in favor of sanitizeSQL()
2014-10-29 04:12:07 -07:00
44095b8fa7
Merge pull request #5498 from phil235/PhotocopierFix1
...
No more larva ass photocopy...
2014-10-29 01:25:34 -07:00
9ce7bf2871
Fixes #5517
...
Fixes #5515
2014-10-29 01:23:47 -04:00
1aef19c835
Merge pull request #4974 from GunHog/Botcall_TG_Edition
...
Botcall, TG edition!
2014-10-28 22:17:35 -05:00
43cb94643a
Merge pull request #5414 from Perakp/portaFix
...
Fixes porta turrets from infinitely stunning you.
2014-10-28 22:17:41 +00:00
07ff02b7c4
Merge pull request #5477 from MrPerson/space_movement_jam
...
Space movement rewrite to allow everything to drift
2014-10-28 22:15:05 +00:00
c546c20690
Merge pull request #5481 from Donkie/atmosmapfixup
...
Fixes #5467
2014-10-28 22:14:47 +00:00
639f1e5f4e
Merge pull request #5518 from RemieRichards/FixPythonBot
...
Fixes the IRCBot not loading due to a bad removal of a code block.
2014-10-28 14:28:31 -07:00
5507dd48c1
Fixes the IRCBot not loading due to a bad removal of a code block.
...
Made NanoTrasenBot.py indent with 4 spaces not 3, as this is the convention for python
2014-10-28 21:24:32 +00:00
e9f6e5d17d
Added a changelog entry
...
Also fixed the chair-diagonal drifting bug somehow
2014-10-28 07:37:31 -07:00
22bd1f8907
updates internals icons
2014-10-27 17:40:15 -07:00
928f6c96ca
readability tweaking
2014-10-27 17:08:58 -07:00
8f9d22b7a8
Merge pull request #5499 from JJRcop/changelog_v2014.10.27_2
...
Changelog compilation (v2014.10.27 | 082e860
2014-10-27 23:33:21 +00:00
36ae984c69
Compiled changelog (v2014.10.27 | 082e860)
2014-10-27 16:24:34 -04:00
cd14a9567e
Fixes YAML syntax errors for the changelog (v2014.10.27 | 082e860)
2014-10-27 16:23:46 -04:00
082e860bbb
Merge pull request #5484 from tkdrg/permissionabuse
...
Improves Permissions Panel security
2014-10-27 13:05:41 -07:00
9779600e81
Error message due to being clothed during ass photocopy only appears once now. You can no longer photocopy the ass of alien larvas, they have no ass. Weapon/paper now has a layer of 3 and won't appear in front of mobs.
2014-10-27 20:27:03 +01:00
198c86aff5
Merge pull request #5436 from tkdrg/stylishlibrarian
...
New book bag sprite by Nienhaus
2014-10-27 13:38:44 -05:00
b2b0bec539
Merge pull request #5433 from phil235/WrapperFixes1
...
Wrapping papers fixes
2014-10-27 10:18:31 -07:00
c7a12290f4
Merge pull request #5466 from paprka/removejensen
...
Removes unused jensen glasses
2014-10-27 10:15:19 -07:00
d85999f7ee
Merge pull request #5438 from xxalpha/clownshoes
...
Moves shoe actions to human movement because the clown exists
2014-10-27 10:14:45 -07:00
0e668cb0f3
Merge pull request #5451 from tkdrg/yayfabricatorbugs
...
Fixes fabricator stack removal
2014-10-27 10:12:26 -07:00
2f9236bdb8
Merge pull request #5443 from paprka/flipriothelmet
...
Adds riot visor flipping
2014-10-27 10:09:41 -07:00
7eec063785
Merge pull request #5479 from Cheridan/rip_scratch
...
Adds Doc Scratch costume in reverse.
2014-10-27 10:08:47 -07:00
f279e2aec0
Fixes the hulk slip bug creating huge amounts of lag by making hulk unable to slide or slip on space lub. Same bug happened to alien humanoids and all carbons that cannot be weakened and thus could move during the slide. So now, only carbons with CANWEAKEN can slip and slide on lube.
2014-10-27 15:32:26 +01:00
211bb20e53
Merge pull request #5445 from tkdrg/pointandlaugh
...
Makes point into a mob verb.
2014-10-26 20:33:53 -05:00
5c6cd8c1be
Merge pull request #5464 from MrStonedOne/stfubots
...
Removes an annoying and stupid message in the irc bot
2014-10-26 20:22:28 -05:00
8bd90e2a5a
Merge pull request #5440 from paprka/anotherwindoorfix
...
fixes sec checkpoint windoor bug
2014-10-26 15:39:30 -07:00
5bca7ee057
Merge pull request #5079 from Miauw62/thespookisreal
...
SPOOK STATION 13
2014-10-26 15:12:24 -07:00
785b6ada07
Fixes and a change
2014-10-26 14:25:07 -07:00
090d61adf4
Merge branch 'master' of https://github.com/tgstation/-tg-station into flipriothelmet
...
Conflicts:
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
2014-10-26 14:07:51 -07:00
57c723692a
The permissions panel now checks if the holder has superior rights before allowing a permission change.
2014-10-26 17:24:57 -03:00
hornygranny
tkdrg
MrPerson
Swag McYolosteinen
Cheridan
Aranclanos
MrStonedOne
GunHog
Incoming
Remie Richards
paprka
JJRcop
phil235