Anonymous 837052740a Merge branch 'master' into assu ...

# Conflicts Resolved:
#	icons/mob/head.dmi
#	icons/obj/clothing/hats.dmi

2019-11-13 11:59:53 +03:00

..

loadout

Merge branch 'master' into assu

2019-11-13 11:59:53 +03:00

verbs

Update who.dm

2018-12-21 19:08:53 -08:00

client_defines.dm

Cryopods from Oracle Station

2018-02-14 14:06:33 -06:00

client_procs.dm

maybe actually have mentors that aren't broke as shit (#5954)

2018-03-15 20:49:32 -05:00

preferences_savefile.dm

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156

2019-08-29 21:01:23 +02:00

preferences_toggles.dm

Adds a non-vore variant for the medihound sleeper, replaces "Allow medihound sleeper" pref with "Voracious medihound sleepers" pref (#7659)

2018-11-02 12:53:11 -07:00

preferences.dm

Quick in case.

2019-07-02 22:42:07 +01:00