Fox McCloud 7f2f766f70 Merge remote-tracking branch 'upstream/master' into attack-hulk ...

# Conflicts:
#	code/game/objects/structures/window.dm

2018-06-03 18:49:44 -04:00

..

decals

Better solution

2018-05-30 21:55:26 -04:00

effect_system

foam conversion

2018-05-19 19:55:29 -04:00

spawners

SS Conversion: Atoms, Machines, n' Mobs

2018-04-28 17:55:15 -07:00

temporary_visuals

added defines for window construction states and full window diagonal dir

2018-06-03 13:11:37 +04:00

alien_acid.dm

separates alien structures and effects into own files

2018-04-04 23:18:12 +04:00

anomalies.dm

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

bump_teleporter.dm

…

effects.dm

Makes Hulk Attacking Less Snowflakey

2018-05-19 02:32:34 -04:00

forcefields.dm

…

gibs.dm

compiles, find and replace particle_effect and effect_system

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

glowshroom.dm

Ports over Timer Subsystem

2018-04-28 20:26:04 -04:00

landmarks.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

manifest.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

mines.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

misc.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI

2016-12-01 22:38:35 -05:00

overlays.dm

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

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

portals.dm

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

spiders.dm

Them

2018-05-25 18:34:28 -07:00

step_triggers.dm

…