Ikarrus d2ef043690 Resolved Conflicts: ...

code/modules/mob/living/living.dm

2015-06-11 23:46:59 -06:00

..

ammunition

Edited pAIcard displayed message, donksoft dart description and some tips of the round.

2015-05-24 20:49:06 +01:00

guns

- Renamed tommy guns and made them w_class 5. They're powerful as hell, so they're going to have to be non-concealable. (+3 squashed commit)

2015-06-11 23:42:08 -06:00

projectile

Merge pull request #9715 from Firecage/datumspaths

2015-06-02 23:04:51 -05:00

ammunition.dm

Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark.

2015-04-24 20:50:50 +03:00

firing.dm

Fix reagent garbage collection hopefully

2015-03-14 16:52:49 -07:00

gun.dm

Adds feedback gathering for a hell of a lot more things.

2015-06-09 21:52:46 -07:00

pins.dm

Merge pull request #9639 from SconesC/pins-typo

2015-05-26 02:32:21 -05:00

projectile.dm

Fixed emitter beam esword reflection runtime error.

2015-05-13 21:16:52 +01:00