Bawhoppen 7f73fd2a7b Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners ...

# Conflicts:
#	_maps/map_files/BoxStation/BoxStation.dmm

2020-03-12 05:06:09 -05:00

..

decals

The Families Gamemode. Home. At least it was 'til I fucked everything up. (#49274)

2020-03-08 18:33:54 -07:00

effect_system

Fix a few small runtimes (#49352)

2020-02-16 00:40:11 -08:00

spawners

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

2020-03-02 19:30:48 -06:00

temporary_visuals

RCD constructing effect unclickable (#49709)

2020-03-05 21:28:54 +08:00

alien_acid.dm

Makes Crossed and Moved should call parent (#49671)

2020-03-05 10:25:24 -05:00

anomalies.dm

Makes Crossed and Moved should call parent (#49671)

2020-03-05 10:25:24 -05:00

blessing.dm

…

bump_teleporter.dm

…

contraband.dm

Fixes some inconsistencies with CentCom & Nanotrasen capitalization, and a couple typos (#49469)

2020-02-22 22:35:53 +13:00

countdown.dm

Completely removes cloning (#48668)

2020-02-04 16:04:06 -05:00

effects.dm

effects vis_flags (#49804)

2020-03-09 19:07:22 -07:00

forcefields.dm

…

glowshroom.dm

…

landmarks.dm

[Ready] Prisoner role (#48819)

2020-02-03 09:54:03 +13:00

mines.dm

Makes Crossed and Moved should call parent (#49671)

2020-03-05 10:25:24 -05:00

misc.dm

…

overlays.dm

icon fixes

2020-03-03 19:50:25 -08:00

portals.dm

Build SpacemanDMM from source (#49712)

2020-03-05 11:54:04 -05:00

proximity.dm

Makes Crossed and Moved should call parent (#49671)

2020-03-05 10:25:24 -05:00

spiders.dm

adds genetic powers (theres a new one since you last looked) (#48665)

2020-01-19 18:29:18 -05:00

step_triggers.dm

Remove ismovableatom macro (#9)

2020-02-17 15:03:16 +01:00

wanted_poster.dm

Removing wanted poster fixup

2020-02-03 10:18:04 +01:00