Commit Graph

667 Commits

Author SHA1 Message Date
Razharas
b9b73531a6 Merge pull request #6104 from tkdrg/bouncy
Stops the field from bouncing the sing around
2014-12-01 18:14:12 +03:00
tkdrg
65fb61be69 Stops the field from bouncing the sing around 2014-11-27 10:33:24 -03:00
Razharas
c5209f2399 Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour 2014-11-27 15:30:37 +03:00
Razharas
41a43b0040 Quickfix 2014-11-27 15:30:24 +03:00
Razharas
4998b19ddf Merge pull request #5679 from Aranclanos/projectilesBump
Projectiles bump fix, spawn() removal
2014-11-27 03:38:05 +03:00
Razharas
84e69cff6b Conflict resolve
Damn cables
2014-11-24 12:27:53 +03:00
Razharas
eabea41f4d Merge pull request #5989 from Menshin/cables_cutting_fix
Fixes cutting cables always spawning a single red cable
2014-11-23 23:35:21 +03:00
Remie Richards
3011261e7f Merge pull request #5980 from Menshin/collectors_anchoring_fix
Radiations collectors anchoring fix
2014-11-23 15:02:28 +00:00
Menshin
56bd52e95b Fixed cutting cables always spawning a single red cable 2014-11-22 15:59:18 +01:00
Menshin
c2cfa31d87 Make collectors actually connect to the powernet when wrenched down. 2014-11-22 00:32:52 +01:00
Razharas
ff456ebaf4 Unwinded most of shit
Meh
2014-11-19 21:36:45 +03:00
Razharas
b7d08c591e Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour 2014-11-18 16:23:04 +03:00
Razharas
b071a0167e Made explosions work in a slightly different way
Yep
2014-11-18 16:22:41 +03:00
Razharas
87fe5489a7 Merge pull request #5701 from tkdrg/outoftheleftfield
Containment fiels bounce structure, machinery & mechs, take two
2014-11-18 04:39:48 +03:00
Razharas
59aa177af7 Merge pull request #5681 from Menshin/singulo_beacon_fix
Singularity beacon fix and clean-up
2014-11-18 04:19:00 +03:00
hornygranny
d0d6947dad Merge pull request #5719 from MrPerson/pls_dont_make_fun_of_the_singulo_shes_not_fat_just_big_boned
Singularity tweaks
2014-11-08 15:08:40 -08:00
phil235
bc5754b378 adding diagonal attack animation. 2014-11-07 15:42:07 +01:00
MrPerson
deb5884a19 Singularity tweaks
Fix an off-by-one error that caused the singulo to get stuck along contaiment fields. For a 5x5 singulo, it would check 6 squares ahead (correct for a step forward) and then 6 squares to the sides (incorrect). Now it tests 6 squares ahead, 5 to the sides. This is technically wrong for the growth checks but they check every direction anyways, so it's ok.
Made the singularity drift in all cases and not stop next to lattices.
In process(), moved the growth checks after the movement attempt so it will take a step and then grow rather than take a step, drift into the walls, and then attempt and fail to grow as part of the next process().
2014-11-06 16:41:21 -08:00
tkdrg
a9480dabb4 Fix for infinite loop 2014-11-05 20:28:56 -03:00
tkdrg
747d172ab9 Merge remote-tracking branch 'upstream/master' into outoftheleftfield 2014-11-04 22:53:14 -03:00
Aranclanos
364f4e1f24 Changes the call from process() to fire() in all places where a projectile is created. 2014-11-04 16:38:58 -03:00
phil235
74f8a08522 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackAnimation
Conflicts:
	code/modules/mob/living/living.dm
2014-11-04 18:55:07 +01:00
hornygranny
377f8bd1fa Revert "Contaiment fields will now bounce off structures, machinery and mechs" 2014-11-04 00:51:58 -08:00
Cheridan
df13b0d840 Merge pull request #5591 from hornygranny/OOPgularity3
improved deconstruction, singularity stuff
2014-11-03 20:20:55 -06:00
hornygranny
b32e9cff12 Merge pull request #5621 from tkdrg/damnoldcoders
Moves around some vars
2014-11-03 17:15:54 -08:00
hornygranny
c794bdf797 Merge pull request #5432 from tkdrg/outoftheleftfield
Contaiment fields will now bounce off structures, machinery and mechs
2014-11-03 17:07:34 -08:00
tkdrg
d3727e6e3e Removes unused code instead of commenting it out 2014-11-03 18:25:05 -03:00
phil235
1506383b2c Adding some missing do_attack_animation()
Moving do_attack_animation() proc to mob/living
Fixing the pixel offset issue from beds especially rollerbed.
Fixing the nograv bouncing stopping because of another animation being used.(lying down, jittering, attack animation)
2014-11-03 15:11:39 +01:00
phil235
8b49caa5ee Fixes typos and show messages. Fixes attack animation code. 2014-11-03 01:06:02 +01:00
phil235
3f30912c51 WIP - Adding attack animation to most attacks.
Fixing a couple "for(......) show_message()".
2014-11-02 22:50:58 +01:00
Menshin
9f8639397f Cleaned Singularity Beacon to use the new power machines code.
Fixed the beacon deactivating on powernets splitting.
2014-11-02 19:18:20 +01:00
Cheridan
51eae4c5a2 Merge pull request #5601 from phil235/ObjVerbCheckFix
Adding checks for stun, restrained to many object verbs.
2014-11-02 11:34:48 -06:00
tkdrg
a97c4de972 Moves m_amt, g_amt, reliability and origin_tech to /obj/item (previously in /obj)
Removes force from pipes
Removes unused turf var icon_old
Moves pass_flags to /atom/movable
2014-11-02 14:10:03 -03:00
phil235
128c9222e5 Adding checks for stun, restrained to many object verbs.
Fixing paper and supply manifest description upon examination.
Fixing being able to adjust jumpsuit while restrained.
Fixing one typo.
2014-11-01 19:18:01 +01:00
Hornygranny
955847de74 defines 2014-10-31 19:00:50 -07:00
Hornygranny
c29526ee2f destruction proc, cable deconstruction 2014-10-31 17:01:28 -07:00
Hornygranny
9c95842adf Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity2
Conflicts:
	code/game/turfs/simulated/floor.dm
2014-10-30 17:26:25 -07: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
Hornygranny
cc21fd1e70 Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity2
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
2014-10-28 15:27:46 -07:00
Hornygranny
0eecb1fc29 lol forgot to save 2014-10-27 16:47:49 -07:00
Hornygranny
264c25b892 makes the singularity's pulling OOP with the magic of atom proc 2014-10-27 16:43:35 -07: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
tkdrg
184937e413 Fixes #4388 2014-10-25 22:42:50 -03:00
tkdrg
7e2b9984be Merge branch 'outoftheleftfield' of https://github.com/tkdrg/-tg-station into outoftheleftfield 2014-10-24 12:45:55 -03:00
tkdrg
04703a7a18 Fields bounce mechs too as that is a good idea 2014-10-23 16:22:46 -03:00
tkdrg
cc9b4e79d1 Fixes #4388 2014-10-23 14:14:46 -03: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