Commit Graph

15342 Commits

Author SHA1 Message Date
KorPhaeron 12d5a910b5 Merge pull request #17119 from TechnoAlchemisto/Mining_Harness
Adds explorer belt to mining vendor.
2016-04-26 20:06:48 -05:00
phil235 dc730e9b5b Fixes typo making the destructive analyzer always be busy. 2016-04-27 01:00:39 +02:00
phil235 6eb4ffa825 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-26 21:49:51 +02:00
phil235 b7da04e8c8 You can now use your PDA on the emergency shuttle console. 2016-04-26 21:43:11 +02:00
KorPhaeron 2bc85f6e9e Merge pull request #17134 from Zuvassin/fortheskullthrone
Adds champion armour to necro chests
2016-04-26 12:51:05 -05:00
KorPhaeron b8c6e93b29 Merge pull request #16732 from Iamgoofball/patch-22
Fluorosulfuric SACid
2016-04-26 05:13:09 -05:00
Zuvassin dadae277cb Adds champion armour to necro chests 2016-04-26 18:55:31 +10:00
KorPhaeron 08eca42e00 Merge pull request #17061 from TechnoAlchemisto/Bracers
Adds craftable bracers, adds watchers dropping bones.
2016-04-26 01:39:50 -05:00
KorPhaeron c1987f699a Merge pull request #17093 from RandomMarine/cockroach
Drones stop squishing cockroaches.
2016-04-26 01:17:40 -05:00
Cheridan 07f17f8d61 Merge pull request #17111 from tgstation/ruinfix
Should fix the maploader bugs
2016-04-26 01:10:42 -05:00
TechnoAlchemist 930f49589d nerfs bracers :( 2016-04-25 21:01:31 -07:00
KorPhaeron 5b6d1386fd Merge pull request #17101 from TechnoAlchemisto/goliathplateREFACTOR
Makes goliath plates stackable.
2016-04-25 22:35:43 -05:00
TechnoAlchemist 98030c8480 """"""""Design Lead""""""""""" 2016-04-25 16:51:09 -07:00
TechnoAlchemist 04eac2cbe6 adds explorer belt. 2016-04-25 15:59:02 -07:00
Joan Lung 66a1520ad4 Merge pull request #17054 from coiax/processor-overload
New Processor Overload event
2016-04-25 18:40:22 -04:00
phil235 bb1f60e769 Fixes typos and errors I made.
Fixes unscrewing a broken computer only dropping one glass shard instead of two.
Fixes AI holopad, recharger, keycard authentication device, reagent_dispensers reagentgrinder, and APC  not being attackable.
Fixes APC cover knockdown being random, it now uses the take_damage() proc, which also allows animals and xenos to knock down the cover of a broken apc.
2016-04-25 22:29:17 +02:00
duncathan salt 4686f80b39 fixes horrible runtimes 2016-04-25 10:20:27 -06:00
Joan Lung ad9eec737f Merge pull request #17083 from coiax/ian-looks-very-fashionable-today
Refactors dog clothing
2016-04-25 11:46:44 -04:00
duncathan salt 27bc533def fixes air bugs with the maploader changeturf, hopefully 2016-04-25 09:43:10 -06:00
duncathan salt 61ddd6797d Merge pull request #16969 from YotaXP/tgm-maploader
[DNM] Updates the map loader to support TGM style map files
2016-04-25 09:28:26 -06:00
Razharas 7e17d5a361 Merge pull request #17077 from KorPhaeron/gatling
Undoes Gatling Nerf
2016-04-25 17:08:11 +03:00
Jack Edge 8901ee0610 Actually compiles 2016-04-25 09:22:32 +01:00
Jack Edge 1a6ad107af Refactoring and tweaks 2016-04-25 09:01:52 +01:00
TechnoAlchemist 497e1ae3a9 fixes plate consumption in upgrades. 2016-04-24 23:50:01 -07:00
Jack Edge bb4f035fd6 Merge branch 'master' into slaughter-fixes 2016-04-25 07:32:40 +01:00
TechnoAlchemist d1359a3e09 What's it gonna be, loyalty to me? Or loyalty to your country?
(export datum tweak)
2016-04-24 23:24:42 -07:00
Jack Edge 508522c320 Minor explosion damage around exploded machine 2016-04-25 07:15:32 +01:00
KorPhaeron efc2165f7e Merge pull request #17065 from Robustin/COMMONSENSE
Shielded Hardsuits now have an internal jetpack
2016-04-25 00:53:24 -05:00
KorPhaeron df6c20d178 Merge pull request #17080 from Core0verload/gluvz
Removes fake insulated gloves completely
2016-04-25 00:46:18 -05:00
TechnoAlchemist 556f611278 makes the path /animalhide 2016-04-24 22:07:51 -07:00
TechnoAlchemist 581a13975b makes goliath plates stackable. 2016-04-24 21:27:48 -07:00
RandomMarine f3f2962d26 buffs cockroach survivability 2016-04-24 18:26:23 -07:00
phil235 fcf544283d Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-24 21:22:37 +02:00
phil235 43e98079f1 Removing some comments I had left in. 2016-04-24 21:12:04 +02:00
Razharas ecd60dead3 Merge pull request #17053 from coiax/chasm-lifering
Jaunters can now be belt-worn to offer chasm protection
2016-04-24 22:09:26 +03:00
RandomMarine 950d8e4dfa drones can't squish cockroaches (by accident) 2016-04-24 12:06:18 -07:00
phil235 0480790b0a Same things but with structures now. 2016-04-24 20:38:33 +02:00
phil235 b146131a34 Second commits.
This contains the changes to item_attack.dm
Obj/attackby() now follows a similar structure as mob/living/attackby. It calls attack_obj() (like attack() but for obj) which calls attacked_by (just like attack() does)
The use of the NOBLUDGEON flag changes a bit, it is now used to signify the item cannot be used as a melee weapon at all. No attack animation, no attack message. I've given this bitflag to many items that have an afterattack() so as to not both attack and do the special action (among those items: the rcd)

There's also the code changes to attacking machines: attacking any machine now give a proper message and a sound. And with this, I made more machines breakable (using a health var and the very little used BROKEN stat). Most notably, tables can now be attacked when on harm intent and be destroyed.

The newly destroyable machines have a take_damage() proc used by all sorts of attack (weapon, xeno, animal, hulk, mech melee, gun projectile, thrown items).

There's some more stuff in there, see the PR's description and comments.
2016-04-24 20:37:00 +02:00
phil235 0caa59b21a First commit of this big PR
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
2016-04-24 20:26:24 +02:00
coiax 5d7db5637c Added animal overlay to drone filters (#17009)
* Added animal overlay to drone filters
2016-04-24 16:51:16 +01:00
Jack Edge e2888a285b player_list -> ai_list 2016-04-24 16:45:35 +01:00
Jack Edge 8534e3dbb9 Code review 2016-04-24 16:29:17 +01:00
Jack Edge c29f8478d7 Compiles now 2016-04-24 16:08:36 +01:00
Jack Edge 1f2c405763 Changes messages, based on feedback 2016-04-24 15:59:57 +01:00
Jack Edge de76cecc47 DM initial() doesn't work on lists 2016-04-24 15:23:38 +01:00
Jack Edge 4c0a553c1d Bug fix 2016-04-24 15:06:39 +01:00
Jack Edge 2c48313d4f Istype/ispath memes, and tidying 2016-04-24 14:56:56 +01:00
Jack Edge 2bf9caa07b I'M BRINGING FASHION BACK 2016-04-24 14:44:55 +01:00
Jack Edge 1927fc73e6 Dog fashion on the back 2016-04-24 14:40:08 +01:00
Jack Edge 2f26b8eabc Compilation! 2016-04-24 13:54:37 +01:00