CitadelStationBot 5181326d54 [MIRROR] Adds some custom force strings and fixes a bug (#1700) ...

* Adds some custom force strings and fixes a bug

* Delete clown_items.dm.rej

2017-06-30 21:17:26 -07:00

..

effects

Merge pull request #1714 from Citadel-Station-13/upstream-merge-28588

2017-06-27 22:59:32 -05:00

items

[MIRROR] Adds some custom force strings and fixes a bug (#1700)

2017-06-30 21:17:26 -07:00

structures

use_power var now uses a define to reflect it not being a bool (#1842)

2017-06-30 20:41:59 -07:00

buckling.dm

Fixes things getting unbuckled in nullspace (#1606)

2017-06-20 08:04:01 -07:00

empulse.dm

Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual

2017-05-18 16:38:09 -05:00

items.dm

[MIRROR] Adds some custom force strings and fixes a bug (#1700)

2017-06-30 21:17:26 -07:00

obj_defense.dm

upstream-merge-27971

2017-06-11 08:21:14 -05:00

objs.dm

upstream-merge-28109

2017-06-13 01:10:21 -05:00

radiation.dm

Fixes swarmers dying to radiation

2017-06-22 10:59:03 -05:00

structures.dm

/tg/ 4/14 (#367)

2017-04-14 23:28:04 -05:00

weapons.dm

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00