ShadowLarkens c2618c0e66 Merge remote-tracking branch 'upstream/master' into tgui_wires ...

# Conflicts:
#	code/__defines/misc.dm

2020-07-24 17:06:18 -07:00

..

antagonist

Fixes runtime in antagonist_helpers.dm, line 15: Cannot read null.mob_type (#7195)

2020-05-19 21:53:10 -04:00

area

Persistent Trash/Dirt/Graffiti/Notices

2020-07-24 05:24:56 -04:00

dna

…

gamemodes

Earlyports melee exploit fix

2020-07-24 18:26:19 +03:00

jobs

Service block patch.

2020-07-21 20:35:10 -07:00

machinery

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

2020-07-24 17:06:18 -07:00

magic

…

mecha

Allow you to only select mech weapons when cycling. (#7343)

2020-07-22 06:03:22 -04:00

objects

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

2020-07-24 17:06:18 -07:00

turfs

Persistent Trash/Dirt/Graffiti/Notices

2020-07-24 05:24:56 -04:00

vehicles

…

verbs

Merge upstream PR

2020-05-21 15:43:40 -04:00

atoms_movable_vr.dm

…

atoms_movable.dm

Merge pull request #7335 from Cerebulon/blurSprites

2020-07-15 14:36:02 -04:00

atoms.dm

Obsolete the PROXMOVE flag and uses

2020-05-18 13:31:54 -04:00

base_turf.dm

…

json.dm

…

periodic_news.dm

…

response_team_vr.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

TGUI Camera Console Part 2; Moved to tgui_module, pending modular computer port

2020-07-16 16:18:43 -07:00

supplyshuttle.dm

…

trader_visit_vr.dm

…

trader_visit.dm

…

world.dm

Why is this still here

2020-07-24 09:08:18 -04:00