Commit Graph

7241 Commits

Author SHA1 Message Date
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
tkdrg
d8e6a1a931 Readds the built-in floor tiles for a singulo purpose. 2014-10-30 19:28:20 -03:00
Swag McYolosteinen
844441571e Merge pull request #5533 from GunHog/Botcall_Fix
Botcall Runtime fixes
2014-10-30 06:37:24 -07:00
Cheridan
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
Aranclanos
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
GunHog
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
Incoming
9ce7bf2871 Fixes #5517
Fixes #5515
2014-10-29 01:23:47 -04: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
43cb94643a Merge pull request #5414 from Perakp/portaFix
Fixes porta turrets from infinitely stunning you.
2014-10-28 22:17:41 +00: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
b2b0bec539 Merge pull request #5433 from phil235/WrapperFixes1
Wrapping papers fixes
2014-10-27 10:18:31 -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
0e668cb0f3 Merge pull request #5451 from tkdrg/yayfabricatorbugs
Fixes fabricator stack removal
2014-10-27 10:12:26 -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
phil235
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
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
Cheridan
a30b3bddf5 Merge pull request #5434 from tkdrg/microfix
Fixes #4311 Radioactive Microlaser Interface
2014-10-26 13:56:48 -05:00
Cheridan
ce4f07bf23 Merge pull request #5429 from Menshin/alarm_runtimes_fix
Fixes alarms runtimes
2014-10-26 13:45:23 -05:00
Aranclanos
0e34f72d8e Merge pull request #5452 from phil235/NukeDiskLogFix
Fixes the nuke disk coordinates in the admin log message
2014-10-26 05:40:07 -03: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
Cheridan
bd5e5ade40 Merge pull request #5411 from scoopscoop/crewconsoletweak
Crew monitoring console department grouping
2014-10-25 22:34:58 -05: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
ce73323823 Fixes #4311 2014-10-25 23:01:27 -03:00
tkdrg
b37b2651d3 Point is now a mob verb to reduce lag 2014-10-25 22:54:17 -03:00
tkdrg
6eb4d6200f Fixes #5161 2014-10-25 22:49:53 -03:00
paprka
51a4bd7be6 drill sergeant hat for HoS instead of police 2014-10-25 13:51:36 -07: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
phil235
86a2c8bf47 Fixes the nuke disk coordinates in the admin log message 2014-10-24 17:34:33 +02:00
GunHog
7479e40746 Add the Kinetic Accelerator to safe list
- Fixes #5442
2014-10-24 08:41:17 -05:00
paprka
9cc31a3b85 adds HoS black police hat, and other changes 2014-10-24 04:19:11 -07:00
paprka
e9faed8b5a adds a delay to removing flashes from flashers 2014-10-23 17:16:46 -07:00
xxalpha
19c9c7625d Cleaning 2014-10-24 00:58:56 +01: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
242621b87c Merge pull request #5422 from xxalpha/flashfix
Finish repathing flashes
2014-10-23 11:22:54 -07:00
hornygranny
524011f70a Merge pull request #5419 from Perakp/lesserFix
Fixes changelings deleting themselves with lesser/human form.
2014-10-23 11:09:46 -07:00
phil235
b971a09bcd Wrapping something with package wrapper now gives a message.
Adding a check so clicking an already giftwrapped item doesn't show the wrapping message.
Adding nobludgeon flag to wrapping paper to remove attack messages
Removing w_class line from package wrapper because already in its parent.
Remove the unnecessary message (box is full/packagewrapper doesn't fit in the box) when wrapping box.
Fixes not being able to wrap box with just one single package wrapper left.
Fixing attack_log (fix issue4180) and only adds log when the wrapping succeeds.
Now using wrapping paper actually uses its amount.
when all used, they will drop cardboard tube like intended.
Fixes issue4207
Fixes not being able to re-add wrapping paper and package wrapper to themselves like proper stacks.
New sprite for both paperwrap and cardboard tube. (from Nienhaus)
2014-10-23 19:30:09 +02:00
Menshin
46a7d7ab30 Alarms change_power now check if there's a still a loc before calling spawned update_icon (fixes #5415) 2014-10-23 12:14:56 +02:00
hornygranny
83632ade2d Merge pull request #5179 from paprka/cultstuff
Changes cult runes to allow constructs to help with most runes
2014-10-22 16:45:07 -07:00
hornygranny
3a98979572 Merge pull request #5393 from paprka/cooljackets
Adds bomber and leather jackets + toolbelt improvements
2014-10-22 16:43:42 -07:00
hornygranny
31dcfcf19b Merge pull request #5278 from xxalpha/aieyefix
Fixes the AI Eye being killed by shuttles and pods
2014-10-22 15:52:50 -07:00
GunHog
63b2fc2555 Merge remote-tracking branch 'remotes/upstream/master' into Botcall_TG_Edition
Conflicts:
	code/game/machinery/bots/ed209bot.dm
2014-10-22 17:49:52 -05:00
hornygranny
39d69a8a2b Merge pull request #5384 from Incoming5643/gamemodecodeashit
Fixes Revolution
2014-10-22 14:38:41 -07:00
Hornygranny
72a8a82c7e Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity
Conflicts:
	code/modules/mob/living/living.dm
2014-10-22 13:26:35 -07:00