Ikarrus db7cb79509 Resolved Conflicts: ...

_maps/map_files/TgStation/tgstation.2.1.3.dmm

2015-07-09 08:51:39 -06:00

..

decals

Datum-Based Gangs

2015-07-02 15:12:55 -06:00

effect_system

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

2015-06-24 21:15:09 +02:00

spawners

Adds a Hugbox

2015-07-08 10:30:21 -06:00

aliens.dm

All walls, fakewalls, windows, carpet.

2015-07-07 19:50:31 +01:00

anomalies.dm

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

2015-06-24 21:15:09 +02:00

bump_teleporter.dm

…

explosion_particles.dm

Lots of work on acids, smoke, foam, reagents reaction() proc.

2015-06-22 00:35:24 +02: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

Lots of work on acids, smoke, foam, reagents reaction() proc.

2015-06-22 00:35:24 +02:00