Putnam 5af513593c fixed conflict, included helpful flavor

2019-12-30 13:34:53 -08:00

..

effects

Merge pull request #10245 from r4d6/substationV2

2019-12-23 18:58:26 +01:00

items

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

2019-12-30 13:31:15 -08:00

structures

fixed conflict, included helpful flavor

2019-12-30 13:34:53 -08:00

buckling.dm

…

empulse.dm

…

items.dm

update butchering

2019-12-01 14:35:11 -06:00

obj_defense.dm

…

objs.dm

Ports some hud and update_icon code updates.

2019-12-16 23:29:20 +01:00

structures.dm

Ports "examine-code refactor"... part 1...

2019-11-19 03:28:06 +01:00