Nadyr 6b5aad478a Merge pull request #2776 from CHOMPStationBot/upstream-merge-11387 ...

[MIRROR] Fixes infinite material duplication in R&D

2021-08-11 20:47:50 -04:00

..

antagonist

Optimize a couple things

2021-07-20 21:30:20 +00:00

area

…

dna

Reworks Shadekin eyecolors (again)

2021-08-01 14:48:52 +00:00

gamemodes

Optimize a couple things

2021-07-20 21:30:20 +00:00

jobs

Deletes all of the annoucement code to fix this stupid issue i am so upset >:(

2021-08-08 17:27:19 +02:00

machinery

Merge pull request #11342 from VOREStation/Arokha/connectedfancycomps

2021-08-06 21:47:09 +00:00

magic

…

mecha

Merge branch 'master' into upstream-merge-11324

2021-08-01 17:49:14 -04:00

objects

Merge pull request #2776 from CHOMPStationBot/upstream-merge-11387

2021-08-11 20:47:50 -04:00

turfs

Fancy exploration shuttle

2021-08-08 18:48:28 +00:00

vehicles

Convert some bools to TRUE/FALSE instead of 1/0.

2021-07-16 17:44:40 +00:00

atoms_movable_vr.dm

…

atoms_movable.dm

Merge pull request #2733 from CHOMPStationBot/upstream-merge-11348

2021-08-06 23:11:49 -07:00

atoms.dm

Remove atom/Uncross override

2021-07-28 20:43:23 +00:00

base_turf.dm

…

json.dm

…

periodic_news.dm

Optimize a couple things

2021-07-20 21:30:20 +00:00

response_team_vr.dm

…

response_team.dm

…

shuttle_engines.dm

Convert some bools to TRUE/FALSE instead of 1/0.

2021-07-16 17:44:40 +00:00

skincmd.dm

…

socket_talk.dm

…

sound.dm

Fancy sprited shuttles

2021-08-06 22:15:49 +00:00

trader_visit_vr.dm

…

trader_visit.dm

…

world.dm

…