deathride58 21d5e8999c Merge branch 'master' into upstream-merge-32624

2017-12-04 17:12:53 -05:00

..

effects

Clean up some loc assignments (#33157)

2017-12-02 09:44:20 -06:00

items

Merge branch 'master' into upstream-merge-32624

2017-12-04 17:12:53 -05:00

structures

Merge pull request #4201 from Citadel-Station-13/upstream-merge-33224

2017-12-03 23:30:01 +00:00

buckling.dm

Deny buckling when the user is inside lockers, mechs, etc. (#33015)

2017-11-24 22:29:40 -06:00

empulse.dm

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

items.dm

[READY]Refactors uplinks to a component!

2017-11-22 15:17:03 -06:00

obj_defense.dm

Merge pull request #31761 from tgstation/Cyberboss-patch-3

2017-10-17 03:44:31 -05:00

objs.dm

Fixes bartender suit having an adjust state

2017-11-22 12:40:32 -06:00

radiation.dm

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

structures.dm

Fix many instances of "the the"

2017-10-13 09:41:54 -05:00

weapons.dm

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00