Fox McCloud 5c24e7720d Merge remote-tracking branch 'upstream/master' into disco-inferno ...

# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm

2018-01-29 20:56:44 -05:00

..

effects

Merge remote-tracking branch 'upstream/master' into disco-inferno

2018-01-29 20:56:44 -05:00

items

Merge remote-tracking branch 'upstream/master' into disco-inferno

2018-01-29 20:56:44 -05:00

random

…

structures

Merge pull request #8565 from uraniummeltdown/repathvisual

2018-01-20 11:25:08 -08:00

buckling.dm

Integrates offset better

2017-06-20 17:30:42 -05:00

empulse.dm

repaths /obj/effect/overlay/temp to /obj/effect/temp_visual

2018-01-18 13:03:49 +05:00

explosion.dm

compiles, find and replace particle_effect and effect_system

2017-11-04 20:16:01 +04:00

items.dm

renames receive_damage() for animations to receiving_damage()

2017-12-28 00:32:54 +05:00

obj_defense.dm

moves var/can_deconstruct to obj level

2017-12-26 18:16:42 +05:00

objs.dm

removes useless alter_health() unused proc

2018-01-02 20:49:28 +05:00

structures.dm

renames receive_damage() for animations to receiving_damage()

2017-12-28 00:32:54 +05:00

weapons.dm

…