Commit Graph
15270 Commits
Author SHA1 Message Date
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
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
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
coiaxandRemie Richards 5d7db5637c Added animal overlay to drone filters (#17009)
* Added animal overlay to drone filters
2016-04-24 16:51:16 +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
KorPhaeron e1c4f14b65 Merge pull request #17064 from Core0verload/log_ruins
Names of loaded ruins maps are saved in world log
2016-04-23 23:30:04 -05:00
Joan Lung 9894342f50 Merge pull request #17017 from Shadowlight213/Admingib
Removes brains dropping from admin caused gibs and c4 suicide
2016-04-23 22:14:36 -04:00
KorPhaeron 18ce641950 Merge remote-tracking branch 'refs/remotes/tgstation/master' into USA 2016-04-23 15:14:09 -05:00
KorPhaeron fa82df9982 Merge pull request #17035 from LanCartwright/synapviro
Reworks sensory.dm
2016-04-23 15:05:14 -05:00
Akke ef3b790229 typos 2016-04-23 20:55:44 +01:00
KorPhaeron 25875cda18 Removes commented out recipes 2016-04-23 14:09:45 -05:00
KorPhaeron ad4782ac41 Tesla Revolver 2016-04-23 13:55:03 -05:00
KorPhaeron c771988284 Gatling Autoclick 2016-04-23 13:47:05 -05:00
Jack Edge 97b5e3918c Removed comments 2016-04-23 17:39:05 +01:00
Remie Richards f098ddd60b Merge pull request #17055 from coiax/stolen-red-wizard-hats
Red Wizard Hat enabled on Corgis
2016-04-23 16:26:25 +01:00
Jack Edge fe17fd395b Changed stabilizer name to stabilizing serum 2016-04-23 12:53:16 +01:00
Jack Edge a304ec0e45 Regular jaunters now save you from chasms 2016-04-23 12:51:14 +01:00
Remie Richards aad72305b4 Merge pull request #16925 from lzimann/patch-6
Fix admin midis not being able to be queued
2016-04-23 12:11:15 +01:00
Cheridan 1d08999456 Merge pull request #17019 from KorPhaeron/lava_engine
Allows atmos techs to harness lava power
2016-04-23 01:07:15 -05:00
Cheridan 07f3fcf01a Merge pull request #17049 from Shadowlight213/robinject
Fixes syringe gun and bee injection reactions
2016-04-23 00:55:14 -05:00
Cheridan 759b694258 Merge pull request #17023 from KorPhaeron/walker
Ash Walker Fixes
2016-04-23 00:20:24 -05:00
c0 6a2820b12d Names of loaded ruins maps are saved in world log 2016-04-23 06:56:58 +03:00
Joan Lung b7efe0ad4f Merge pull request #17033 from coiax/B-E-E-D-R-O-N-E
Removes ishuman() check for beekeeping
2016-04-22 23:06:21 -04:00
Razharas 4999dee630 Merge pull request #17040 from ChangelingRain/tinyfan
Adds a tiny fan to the survival pod!!!
2016-04-23 02:29:01 +03:00
KorPhaeron 0099ea2d93 Merge pull request #17036 from TechnoAlchemisto/goliathbones
Adds Bones and sinew to butchering results. Adds bone armor(craftable)
2016-04-22 18:08:51 -05:00
Akke ba0463de25 fixes . = 1 2016-04-22 22:50:31 +01:00
Leo 893013ecb7 No longer a datum for each player 2016-04-22 15:13:10 -03:00
KorPhaeron 3e3001acb2 Merge remote-tracking branch 'refs/remotes/tgstation/master' into USA 2016-04-22 12:21:14 -05:00
KorPhaeron 6ec28fc001 Runtime and MC crash fixes 2016-04-22 11:17:42 -05:00
Frank AandJack Edge 400d8473fa Red Wizard Hat enabled on Corgis
Allow all corgis to wear red wizard hats
2016-04-22 14:15:22 +01:00
Jack Edge 880fb89ab4 Wormhole lifebuoy (chasm protection)
🆑 coiax
rscadd: As a sign of friendship between the Free Golems and Centcom,
they have developed the wormhole lifebuoy, a modified jaunter to be worn
around a user's waist, which will save them from falling to their death
in a chasm.
experiment: The lifebuoy's limited warranty does not cover exposure to
powerful electromagnetic fields.
tweak: Renamed hivelord stabilizer to legion's heart stabilizer.
/🆑
2016-04-22 11:37:14 +01:00
Jordie 03067837fa Merge pull request #16976 from nullbear/grenade-tweaks
tiny fixes to my stuff. (Sorry! >~<)
2016-04-22 20:29:53 +10:00
nullbear a7c9c80977 tiny fixes to little things
allows deconstruction of xenobio computer again.

renames chem grenades to chem grenades.

makes advanced grenades scale up their unit thing.

makes chemical payload scale up with matter bin used in construction,
and more accessible in general
2016-04-22 03:20:47 -07:00
KorPhaeron a39e3f3f1f Ausops Sprites 2016-04-22 02:16:26 -05:00
KorPhaeron 5009d5eb5d Faster firing 2016-04-21 23:32:56 -05:00
KorPhaeron 84e0fe2b79 Hell lets do 10 damage its an endgame weapon that takes all your inventory 2016-04-21 21:37:58 -05:00
KorPhaeron a78ce8712e Gatling Gun icon fixes 2016-04-21 20:59:07 -05:00
Shadowlight213 5f393e5143 Fixes bee injecting while we're at it 2016-04-21 18:51:53 -07:00
Shadowlight213 ba3e64ab51 Fixes syringe gun chem reactions 2016-04-21 18:49:22 -07:00
KorPhaeron 00c5b0bed3 Nuclear Gun cost revert 2016-04-21 20:29:00 -05:00
KorPhaeron b646b12480 Bit weaker gatling gun 2016-04-21 20:26:58 -05:00
KorPhaeron 5a813a96a5 Gatling Laser 2016-04-21 20:26:13 -05:00
TechnoAlchemist fe7582a10c no more krav maga probably 2016-04-21 18:17:40 -07:00
TechnoAlchemist 72c74194df Adds Bone Necklace talisman. 2016-04-21 16:50:21 -07:00
PKPenguin321 edcc60255b glove madness round 2 2016-04-21 16:38:59 -07:00