kevinz000 d376b99af6 Merge pull request #11315 from Citadel-Station-13/Ghommie-patch-3-2 ...

Fixing a little issue with the Holodeck's Kobayashi Maru phaser

2020-03-06 00:19:51 -07:00

..

ballistic

Merge remote-tracking branch 'citadel/master' into mobility_flags

2020-02-27 20:11:36 -07:00

energy

Merge remote-tracking branch 'citadel/master' into mobility_flags

2020-02-21 23:29:25 -07:00

magic

Last few fixes. Adds arcane wand to dead wizard roid.

2020-03-04 19:12:56 +13:00

misc

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229

2020-02-22 00:55:32 +01:00

ballistic.dm

Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable

2020-02-02 03:39:49 +01:00

energy.dm

Update energy.dm

2020-03-03 15:06:42 +01:00

magic.dm

Standardises all files from CRLF to LF

2020-01-12 14:28:01 +00:00