Commit Graph

505 Commits

Author SHA1 Message Date
xxalpha a9c181bbcc Repath all non jetpack tank types to tank/internals
Repath all portable tanks to tank/internals, except jetpacks

Update ministation
2015-02-01 18:25:39 +00:00
Iamgoofball 38bc14c8f8 Tweaks and changes 2015-01-11 20:35:17 -08:00
Iamgoofball fbfe5e5840 Fixes Chameleon letting you attack and stay invisible. 2015-01-11 09:24:22 -08:00
tkdrg c551bbf213 Merge pull request #6626 from psykzz/patch-1
File restructure
2015-01-06 01:54:47 -03:00
tkdrg be85bb6d17 Merge pull request #6707 from phil235/HostileAttackingTargetFix
Fixes player controlled hostile simple animal not calling AttackingTarget() for their melee attack.
2015-01-01 12:47:27 -03:00
tkdrg cdb5066502 Merge pull request #6324 from Razharas/GenShit
Added datum mutations
2014-12-31 17:24:15 -03:00
phil235 27d8c489ee Fixes carp, mimic and tree nog being able to knockdown their target.
Fixes player controlled hostile simple animal not calling AttackingTarget() for their melee attack.
Fixes player controlled hostile simple animal's ranged attack targeting the target from their previous melee attack instead of the target clicked.
2014-12-31 15:01:23 +01:00
tkdrg 3752254766 Revert "Adds mouse pointers for different ui styles" 2014-12-31 02:17:50 -03:00
Razharas d1f347f584 Fixes conflicts
There werent even any conflicts really, but git for some reason thought
there are
2014-12-30 15:12:09 +03:00
Razharas 418e3a0613 General cleanup
Fixed the magic text failing in monkey injectors
Removed lots of comments
Didnt fix mysterious list bounds runtime in tourettes
2014-12-29 11:36:01 +03:00
paprka 56d54d1294 Added changelog and fixes compile errors with preferences 2014-12-28 18:24:53 -08:00
paprka 2e8907ed4c adds a preference for custom pointers 2014-12-28 18:13:48 -08:00
Razharas 208b59c30e Fixed stuff tkdrg pointed out
Added comment to dualsaber and hulk checks to explain whats going on
Added defines that converts to mutation names
Fixed grammer again
2014-12-28 10:49:04 +03:00
Matt Smith 15f01d3dfc File restructure
No functional changes. Just moving the declarations of functions around.
I may be wrong in this, IE I don't know if declaration order matters in this, if it does, just reject my PR. Otherwise accepting it, would be good to help newbie coders to understand code flow a little easier.
2014-12-27 22:08:25 +00:00
paprka 5b9a831a90 adds mouse pointers for different ui styles 2014-12-27 03:06:55 -08:00
Razharas 9a27fe7c8d Conflict fix
Yeah makes it all work
2014-12-21 06:12:33 +03:00
Razharas f0c8f2eeac Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

conflicts resolution
2014-12-16 02:52:08 +03:00
phil235 e354802d74 Fixes being able to remove clothing and inventory stuff while straightjacketed or handcuffed by clicking the inventory slot, not the worn item itself. 2014-12-14 18:03:49 +01:00
tkdrg 79e8ad4142 The singularity/narsie are no longer machines 2014-12-12 19:42:37 -03:00
Razharas 8d110ee496 Tiny clean up, still lots of work to do
Only compiletested, these changes were never tested in the game yet
2014-12-12 23:57:11 +03:00
Razharas 11f6c7c401 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit 2014-12-12 04:51:16 +03:00
Razharas 0921aa201f Added datum mutations
Also removed some mob vars like sdisabilities and merged the usability
with disabilities
Removed need for mutations var, they are not handled in dna
Removed blinded var, now its handled by eye_blind being bigger than zero
Ands lots, lots of other shit in files that used mutations
2014-12-12 04:48:11 +03:00
Cheridan 05f5a1223d Merge pull request #6131 from paprka/injurydoll
Health doll, UI improvements
2014-12-11 12:42:06 -06:00
Cheridan f909d59d1a Merge pull request #6130 from phil235/AttackMsgStandardizedFormat
Standardizing attack messages to always show the attacker first
2014-12-04 12:45:31 -06:00
Razharas c2046105af Ok reverting this shit
Disregard this you know what i do
2014-12-01 00:12:58 +03:00
paprka 2b0af7e288 UI improvements, health doll final
Merge branch 'master' of https://github.com/tgstation/-tg-station into injurydoll
2014-11-28 13:06:22 -08:00
Razharas 4998b19ddf Merge pull request #5679 from Aranclanos/projectilesBump
Projectiles bump fix, spawn() removal
2014-11-27 03:38:05 +03:00
phil235 86405fa8c0 Standardizes attack messages to always show the attacker first (when there is an attacker).
Replacing some fo mob in viewers() show_message() with visible message().
Simplifying some message code in a couple places, fixing typos and span classes.
2014-11-24 01:49:34 +01:00
Razharas ebfb3b012d Fixes runtimes of the mechs
Fix #5777
2014-11-22 18:34:41 +03:00
tkdrg 4ef217cfb3 Fixes AI shortcuts skipping turret sanity checks 2014-11-18 16:25:10 -03:00
tkdrg 608dec814e Removes old/unused code from the tree. Use version control if you need it for some reason. 2014-11-16 16:53:18 -03:00
Razharas 2ec1658be0 Merge pull request #5735 from phil235/StingMiddleClickRuntimeFIx
Moving carbon/middleclickon() form carbon.dm to click.dm
2014-11-15 02:51:24 +03:00
Remie Richards 17607d0aa2 Merge pull request #5776 from MrPerson/throwing_changes
Throwing bugfixes
2014-11-14 18:04:00 +00:00
phil235 fce8781994 Merge branch 'master' of https://github.com/tgstation/-tg-station into StingMiddleClickRuntimeFIx
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
2014-11-13 17:44:09 +01:00
MrPerson c159878ace Throwing bugfixes
Removed an unused client verb, changed a usr to src where they're the same mob, and changed a type == check to istype().

Allow turning on throw mode when clicking the UI button (hotkeys already allow you to do this).
Disallow throwing when not on a turf.
Fixes #4823

Make storage items close out the onscreen stuff when they get thrown.
Fixes #5296
2014-11-09 00:29:20 -08:00
Remie Richards 2054cbda08 Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/human_attackpaw.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
2014-11-08 01:07:29 +00:00
Remie Richards 0914b1a7cd Merge pull request #5642 from phil235/AttackAnimation
Adding an attack animation to most attacks
2014-11-07 18:39:27 +00:00
phil235 4bdafd02b6 Moving carbon/middleclickon() form carbon.dm to click.dm and centralising it (there was two carbon/middleclickon() proc.
Moving carbon/altclickon() to click.dm as well.
2014-11-07 19:23:30 +01:00
phil235 bc5754b378 adding diagonal attack animation. 2014-11-07 15:42:07 +01:00
Remie Richards 09e6825b5d Merge pull request #5692 from Aranclanos/TKihateyou
Computers and telekinesis fix
2014-11-06 21:56:31 +00:00
Aranclanos f7ad6d9ab0 Fixes issue #1442
canUseTopic() will now check for telekinesis on humans, using the be_close flag.
The pop-up window will update if TK users are using the machine.
2014-11-05 13:55:31 -03:00
JJRcop 3675d40161 Fixes #5656
I forgot to make the cyborg pull button use /obj/screen/pull
2014-11-04 19:38:15 -05: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 bd0b4a39af Merge pull request #5558 from JJRcop/whoa_obj-screen-click_is_really_bad
Turns /obj/screen/Click() into subtypes
2014-11-03 17:20:45 -08:00
JJRcop 3318f50cd2 Fixes path typo 2014-11-03 12:21:57 -05: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 3f30912c51 WIP - Adding attack animation to most attacks.
Fixing a couple "for(......) show_message()".
2014-11-02 22:50:58 +01:00
paprka 4ea78aa077 fixes some things with the HUD 2014-11-01 22:19:14 -07:00
paprka 651accb441 updates to health doll 2014-11-01 18:01:31 -07:00