BelsimaandAnewbe 28ab1e51f3 Removes some loadout items that have colorable versions. (#4173) ...

* Removes the 5000 flats options.

* Removes the 5000 hair flower pin options.

2017-11-01 22:19:20 -05:00

..

__defines

Improves electrocute_act, adds ELECTROCUTE damage type

2017-10-30 22:00:25 -05:00

_compatibility/509

…

_helpers

Does work on the event manager role again

2017-10-18 20:00:01 -05:00

_onclick

Merge pull request #3902 from Neerti/9/19/2017_lost_drone

2017-09-22 15:24:05 -05:00

ATMOSPHERICS

Fixes all the other stuff

2017-10-15 20:56:13 -04:00

controllers

Does work on the event manager role again

2017-10-18 20:00:01 -05:00

datums

Merge pull request #4166 from Neerti/10/26/2017_shields

2017-10-27 20:38:27 -05:00

defines

weapon.dm fixes

2017-10-27 11:27:13 -04:00

game

Merge pull request #4190 from mistyLuminescence/plushierework2561

2017-11-01 21:57:56 -05:00

js

…

modules

Removes some loadout items that have colorable versions. (#4173)

2017-11-01 22:19:20 -05:00

unit_tests

…

ZAS

Success!

2017-10-27 13:43:05 -04:00

_macros.dm

More merging updates

2017-09-19 23:58:40 -04:00

_unit_tests.dm

…

global.dm

…

hub.dm

…

names.dm

…

stylesheet.dm

Fuel-Rod Gun, Minor fixes related. (#4103)

2017-10-19 15:07:52 -05:00

world.dm

Revert "Does more prep for the Event Manager role"

2017-10-04 18:33:34 -05:00