Commit Graph

6411 Commits

Author SHA1 Message Date
hornygranny
73b83ddef6 Merge pull request #5357 from tkdrg/attackoftheturfs
Floor refactor
2014-10-30 17:23:20 -07:00
tkdrg
0bb462e857 Fixes botcall conflicts, removes even more cruft and unused code 2014-10-30 20:36:30 -03:00
tkdrg
9526b8804b Merge remote-tracking branch 'upstream/master' into attackoftheturfs 2014-10-30 19:35:03 -03:00
Swag McYolosteinen
4e7cb0eb01 Merge pull request #5530 from MrStonedOne/fukkinreallyerro
[MSO] Minor sql improvements.
2014-10-30 21:00:42 +01:00
Cheridan
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
tkdrg
e2c4eebe9d You can now only become a harvester when you can see Nar-sie 2014-10-30 13:24:43 -03:00
MrPerson
3452f63f51 Fixes the singulo drifting through the shield gens and such, woops 2014-10-29 19:18:36 -07:00
MrStonedOne
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
MrStonedOne
6f0666138a Ensures spawned proc is never called if the client goes away 2014-10-29 18:02:21 -07:00
MrStonedOne
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
MrStonedOne
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
MrStonedOne
8a064ee545 Removes extra sql sanitize procs in favor of sanitizeSQL() 2014-10-29 04:12:07 -07:00
MrPerson
44095b8fa7 Merge pull request #5498 from phil235/PhotocopierFix1
No more larva ass photocopy...
2014-10-29 01:25:34 -07:00
Cheridan
1aef19c835 Merge pull request #4974 from GunHog/Botcall_TG_Edition
Botcall, TG edition!
2014-10-28 22:17:35 -05:00
Remie Richards
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
MrPerson
e9f6e5d17d Added a changelog entry
Also fixed the chair-diagonal drifting bug somehow
2014-10-28 07:37:31 -07:00
hornygranny
082e860bbb Merge pull request #5484 from tkdrg/permissionabuse
Improves Permissions Panel security
2014-10-27 13:05:41 -07:00
phil235
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
hornygranny
b2b0bec539 Merge pull request #5433 from phil235/WrapperFixes1
Wrapping papers fixes
2014-10-27 10:18:31 -07:00
hornygranny
c7a12290f4 Merge pull request #5466 from paprka/removejensen
Removes unused jensen glasses
2014-10-27 10:15:19 -07:00
hornygranny
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
hornygranny
2f9236bdb8 Merge pull request #5443 from paprka/flipriothelmet
Adds riot visor flipping
2014-10-27 10:09:41 -07:00
hornygranny
7eec063785 Merge pull request #5479 from Cheridan/rip_scratch
Adds Doc Scratch costume in reverse.
2014-10-27 10:08:47 -07:00
Cheridan
211bb20e53 Merge pull request #5445 from tkdrg/pointandlaugh
Makes point into a mob verb.
2014-10-26 20:33:53 -05:00
hornygranny
5bca7ee057 Merge pull request #5079 from Miauw62/thespookisreal
SPOOK STATION 13
2014-10-26 15:12:24 -07:00
MrPerson
785b6ada07 Fixes and a change 2014-10-26 14:25:07 -07:00
paprka
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
tkdrg
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
paprka
64fb1c4578 reverts dmi changes 2014-10-26 01:56:29 -07:00
Cheridan
4525ab93cf Adds Doc Scratch costume in reverse.
Since everyone's already mad anyway.
2014-10-26 03:37:56 -05:00
MrPerson
2c8adffac3 Merge branch 'master' of https://github.com/tgstation/-tg-station into space_movement_jam
Conflicts:
	code/modules/mob/living/living.dm
2014-10-25 23:25:27 -07:00
MrPerson
ef6204656f Space movement rewrite to allow everything to drift
Removes a version of atom/movable/Move() that was in mob_movement.dm.
New proc called newtonian_move() that's called as a result of things like shooting a gun or spraying a fire extinguisher and as part of atom/movable/Move().
It pushes src if it's not under gravity and gives the object a chance to stop itself.
As a result, inertial_drift() is kill.
Moved Process_Spacemove() out to atom/movable. It does the same thing, it's called whenever a drift is attempted and stops the drift if it returns 1. Default check is to look for nearby lattices to make dragging shit around the station less annoying. Mobs still call it in Client/Move()
The mob version of Process_Spacemove() will shove non-anchored nearby objects out of the way if you try to move like that. For example if you're free-floating in space next to a closet and try to move right, the closet will drift off to the left.
Mechs call their occupant's version of Process_Spacemove() so mining with a mech isn't retarded. The pussy wagon does the same thing and thus no longer works like a jetpack. Will it be making a comeback?!?! (no)
Any move will attempt to keep dragging your pulled object, not just ones initiated by the client. Should make space wind a little less annoying. Was needed to make drifting not break your drags.
Mechs drift correctly without any special snowflake crap.
Spaceslipping is gone because fuck that shit
Space movement is now slow instead of fast. Having a jetpack helps go faster but even that's slower than current. Hopefully means nuke ops can see each other as they move to the station instead of losing sight of each other instantly. Having your hands full makes spacemovement even slower.
You can drift in office chairs and drag mobs in beds or the bed itself. Currently drifting diagonally while in an office chair is bugged and I need help to solve it. It winds up in cardinal movement instead of a diagonal one.
Changes up the jetpacking effects system to cause fewer errant ion trails but it's still awful code. In hindsight I shouldn't have bothered but here we go.
2014-10-25 23:19:46 -07:00
paprka
9f929d698a extra jensen cosplay cleaning 2014-10-25 20:00:03 -07:00
Cheridan
bc71885a17 Merge pull request #5448 from paprka/hossystuff
Adds HoS drill hat, and violently guts jensen cosplay from HoS
2014-10-25 21:44:40 -05:00
tkdrg
c83bf83108 Fixes #2098 2014-10-25 22:54:25 -03:00
tkdrg
b37b2651d3 Point is now a mob verb to reduce lag 2014-10-25 22:54:17 -03:00
hornygranny
6a918f98c5 Merge pull request #5454 from MrStonedOne/t-t-t-tadaydb
Adds admin verb to reestablish connection to the database
2014-10-25 18:41:24 -07:00
Cheridan
5bf303da00 Merge pull request #5430 from scoopscoop/csscargoconsoles
Cargo console CSS visual tweaks
2014-10-25 16:31:26 -05:00
paprka
51a4bd7be6 drill sergeant hat for HoS instead of police 2014-10-25 13:51:36 -07:00
Miauw62
9a378933d2 Makes spookoween compile 2014-10-25 11:40:53 +00:00
Miauw62
a0d3a09ef8 Merge branch 'master' of https://github.com/tgstation/-tg-station into thespookisreal
Conflicts:
	code/modules/events/carp_migration.dm
2014-10-25 11:29:07 +00:00
Miauw62
64ee84889d Merge branch 'thespookisreal' of https://github.com/Menshin/-tg-station into thespookisreal
Conflicts:
	code/modules/holiday/halloween.dm
2014-10-25 11:23:32 +00:00
MrStonedOne
de06436320 Makes re-establish db connection verb logic better 2014-10-24 12:34:07 -07:00
MrStonedOne
3ebd53b7c7 Adds new admin verb to reconnect to the database when the connection dies. 2014-10-24 11:21:15 -07:00
paprka
9cc31a3b85 adds HoS black police hat, and other changes 2014-10-24 04:19:11 -07:00
paprka
bea7f8989d adds riot visor flipping 2014-10-23 20:31:48 -07:00
xxalpha
936d7bcdab Moved shoe actions to human movement 2014-10-24 00:56:53 +01:00
xxalpha
107e5b5824 Rewrites simulated/Entered logic so its a tiny more efficient 2014-10-23 23:19:11 +01:00
hornygranny
0cc07336d8 Merge pull request #5423 from phil235/PandemicMsgFix1
Adding a message to the pandemic computer
2014-10-23 13:17:20 -07:00
hornygranny
242621b87c Merge pull request #5422 from xxalpha/flashfix
Finish repathing flashes
2014-10-23 11:22:54 -07:00