Iamgoofball a8ec1c76df Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics ...

Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/game/machinery/computer/computer.dm
	code/game/objects/items/weapons/explosives.dm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/musician.dm
	code/game/objects/structures/tables_racks.dm
	code/game/objects/structures/window.dm

2015-06-23 12:54:26 -07:00

..

decals

Additional Changes

2015-06-22 22:29:51 -06:00

effect_system

JMP replaced with FLW, fixes and adds a bunch of key_name checks in adminlogging

2015-06-14 23:37:35 +10:00

spawners

Moved combat shotguns to shotgun/automatic/combat

2015-06-17 15:25:59 +01:00

aliens.dm

Hitby messages removed, may help with singularity lag from throwing

2015-06-19 15:32:56 +12:00

anomalies.dm

fixed the changelog FOR REAL THIS TIME, also fixed bad coding

2015-06-22 21:30:50 -05:00

bump_teleporter.dm

…

explosion_particles.dm

Removes old/unused code from the tree. Use version control if you need it for some reason.

2014-11-16 16:53:18 -03:00

forcefields.dm

Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.

2015-02-14 14:18:49 +01:00

gibs.dm

Fixes lack of dna in old blood.

2015-03-31 19:48:44 +02:00

glowshroom.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

landmarks.dm

Added department security spawn points and fixed dep sec spawning.

2015-05-16 22:20:31 +01:00

manifest.dm

…

mines.dm

More landmine variabl-HONK

2015-04-21 19:36:38 +01:00

misc.dm

reorganizing stray objs in /defines

2015-05-05 21:18:21 +10:00

overlays.dm

…

portals.dm

Massive MC and subsystem rewrite

2015-04-29 02:00:25 -07:00

spiders.dm

BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH

2015-06-13 13:58:08 -07:00

step_triggers.dm

reorganizing stray objs in /defines

2015-05-05 21:18:21 +10:00