tigercat2000 b14faa19c3 Merge remote-tracking branch 'upstream/master' into SMC ...

# Conflicts:
#	code/__DEFINES/flags.dm

2018-03-22 15:35:12 -07:00

..

effects

rename __DEFINES/mob.dm to __DEFINES/mobs.dm

2018-03-04 13:52:55 +05:00

items

Merge remote-tracking branch 'upstream/master' into SMC

2018-03-22 15:35:12 -07:00

random

…

structures

Merge pull request #8674 from uraniummeltdown/attacks

2018-03-22 11:55:53 -07:00

buckling.dm

…

empulse.dm

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

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

explosion.dm

makes door code more OOP: reduced copypasta in shutter and poddoor code, they have their own icon files, changed name of icon_states in the maps

2018-03-04 13:52:55 +05:00

items.dm

moves var/list/armor to /obj level

2018-03-04 13:52:54 +05:00

obj_defense.dm

spacing, src/loc consistency in playsound, reverted the weapon hitsound change, removed silicon/damage_procs.dm as it's unrelated and wasn't even included in the .dme, fixed some typos

2018-03-05 02:07:31 +05:00

objs.dm

rename __DEFINES/mob.dm to __DEFINES/mobs.dm

2018-03-04 13:52:55 +05:00

structures.dm

rename __DEFINES/mob.dm to __DEFINES/mobs.dm

2018-03-04 13:52:55 +05:00

weapons.dm

spacing, src/loc consistency in playsound, reverted the weapon hitsound change, removed silicon/damage_procs.dm as it's unrelated and wasn't even included in the .dme, fixed some typos

2018-03-05 02:07:31 +05:00