Aronai Sieyes 22fe3bd4e4 Merge pull request #8002 from VOREStation/upstream-merge-7138 ...

[MIRROR] Updates Solgov/Sifguard uniforms

2020-05-21 16:03:58 -04:00

..

antagonism

Antagonist options for new events not saving with slot?

2020-05-21 11:09:28 -04:00

general

Cached version of icon_states() proc

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

global

Add inventory item tooltips

2020-05-14 19:16:40 -04:00

loadout

Merge upstream PR

2020-05-21 15:48:02 -04:00

occupation

Round hours shown on occupations page

2020-05-11 17:56:04 -04:00

skills

…

traits

Deprecate the stream operator

2020-02-12 19:38:43 -05:00

vore

Allow wings with a secondary color

2020-03-31 22:40:48 -04:00

_defines.dm

…

preference_setup_vr.dm

Resolve conflicts, fix compile errors

2019-12-19 17:49:21 +00:00

preference_setup.dm

Moves topic return value defines to where they are usable everywhere.

2020-04-01 20:36:00 -04:00