ZeroMan 93b1ade0bc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into uplinkclothinggetssuckies ...

# Conflicts:
#	code/modules/uplink/uplink_items/uplink_badass.dm

2020-03-21 02:17:13 -04:00

..

effects

fixes beam rifles and some micro optimizations to projectiles and readds the chameleon gun for debugging (#11528)

2020-03-21 02:45:34 +01:00

items

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

2020-03-21 02:17:13 -04:00

structures

Merge pull request #11527 from Ghommie/Ghommie-cit628

2020-03-19 18:56:32 -07:00

buckling.dm

oh boy

2020-02-25 14:06:12 -07:00

empulse.dm

…

items.dm

Hypereutactic blade properly slows you down again, adds set_slowdown() and hooks vv_edit_var for it (#11553)

2020-03-21 02:42:02 +01:00

obj_defense.dm

Ports "Switches out the three billion args of electrocute act for flags"

2020-03-09 04:01:23 +01:00

objs.dm

Fix runtimes some more.

2020-03-10 22:40:06 +01:00

structures.dm

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

2020-02-13 00:39:20 -07:00