2417 Commits

Author	SHA1	Message	Date
Nadyr	8e50c6cfd9	Merge pull request #4960 from CHOMPStation2/upstream-merge-13750 ... [MIRROR] Adds more altevian content	2022-09-18 21:13:27 -04:00
Nadyr	39fd54bae7	Merge pull request #4950 from CHOMPStation2/upstream-merge-13726 ... [MIRROR] Fixes runtime with loading bad-saved langaugaes	2022-09-18 20:53:46 -04:00
Nadyr	5c82dcec87	Merge pull request #4964 from CHOMPStation2/upstream-merge-13757 ... [MIRROR] Attempts to fix simplemob pref loading	2022-09-18 20:53:22 -04:00
Nadyr	2a7c74b4ed	Merge pull request #4959 from CHOMPStation2/upstream-merge-13751 ... [MIRROR] Fixes runtime with capture crystal pref	2022-09-18 20:50:02 -04:00
Casey	7168f8ef99	Merge pull request #13757 from Heroman3003/pref-loading-client ... Attempts to fix simplemob pref loading	2022-09-18 14:05:55 +00:00
Casey	f2716e95ae	Adds more altevian content	2022-09-18 09:39:22 +00:00
Casey	f9633cb139	Merge pull request #13751 from Heroman3003/capture-runtime ... Fixes runtime with capture crystal pref	2022-09-18 09:39:18 +00:00
Casey	5e3d6d8202	Merge pull request #13726 from Heroman3003/langslot-runtime ... Fixes runtime with loading bad-saved langaugaes	2022-09-18 09:34:28 +00:00
Novacat	22e1a26d4e	Merge pull request #13737 from Heroman3003/admin-toggles ... Some staff-specific pref staff	2022-09-15 13:52:38 +00:00
Nadyr	684c4467fd	Merge branch 'master' into upstream-merge-13710	2022-09-10 22:11:06 -04:00
Nadyr	3c6b93eb1f	Merge pull request #4903 from CHOMPStation2/upstream-merge-13706 ... [MIRROR] Adds Taur Skirts	2022-09-10 22:04:02 -04:00
Casey	61ddc608f1	Fixes Taur Skirt	2022-09-10 21:24:57 +00:00
Casey	b0b6a5b138	Merge pull request #13706 from Novacat/nova-basicfixes ... Adds Taur Skirts	2022-09-10 20:47:13 +00:00
Casey	b4dfdbd16c	Merge pull request #13700 from Heroman3003/dragor-hat ... Adds colorable magic hat to loadout	2022-09-10 20:41:46 +00:00
Nadyr	3469c509cc	Merge pull request #4774 from CHOMPStation2/upstream-merge-13560 ... [MIRROR] adds a custom item for coolcrow420	2022-08-28 19:15:26 -04:00
Nadyr	073fdefa50	Merge pull request #4752 from CHOMPStation2/upstream-merge-13541 ... [MIRROR] Adds customizable language keys to language menu and character setup	2022-08-28 19:10:50 -04:00
Nadyr	d786280282	Merge pull request #4717 from CHOMPStation2/upstream-merge-13512 ... [MIRROR] Adds ticket escalation	2022-08-28 18:57:43 -04:00
Nadyr	2506e37d3b	powder that makes you say yes	2022-08-28 18:54:35 -04:00
Nadyr	323a57e271	Merge pull request #4747 from CHOMPStation2/upstream-merge-13536 ... [MIRROR] More casino updates	2022-08-28 18:51:48 -04:00
Nadyr	00f8de0124	Merge branch 'master' into upstream-merge-13512	2022-08-28 18:42:56 -04:00
Nadyr	d8b6de1db0	powder that makes you say yes	2022-08-28 18:33:36 -04:00
Nadyr	4d0f889ae7	Merge pull request #4744 from CHOMPStation2/upstream-merge-13533 ... [MIRROR] Allows altevian department outfits to be selected freely	2022-08-28 18:29:20 -04:00
Nadyr	ac73ed4b38	powder that makes you say yes	2022-08-28 18:07:28 -04:00
Nadyr	19d875c734	Merge branch 'master' into upstream-merge-13503	2022-08-28 18:06:43 -04:00
Nadyr	85c1d90a99	Merge pull request #4701 from CHOMPStation2/upstream-merge-13488 ... [MIRROR] Adds mentors	2022-08-28 17:59:26 -04:00
Casey	604ff7c816	Merge pull request #13560 from faaaay/m41l-item ... adds a custom item for coolcrow420	2022-08-25 22:55:29 +00:00
Casey	144fd1b219	Adds customizable language keys to language menu and character setup	2022-08-21 19:41:08 +00:00
Casey	da9722545b	More casino updates	2022-08-21 19:38:41 +00:00
Casey	abb483abc2	Merge pull request #13533 from Heroman3003/altevian-selection ... Allows altevian department outfits to be selected freely	2022-08-21 19:36:25 +00:00
Novacat	e0865a6a33	Merge pull request #13537 from Heroman3003/tesh-cap-fix ... Fixes teshari Site Manager cloak being for nonexistant job of Facility Director	2022-08-20 12:03:03 +00:00
Casey	a3ff8fc3b5	Adds Altevian fashion	2022-08-17 20:10:23 +00:00
Casey	296d2e902c	Adds ticket escalation	2022-08-16 01:12:00 +00:00
Casey	93870dd2e2	Mentor QOL changes	2022-08-15 01:15:14 +00:00
Casey	529616b1aa	Adds mentors	2022-08-14 19:10:14 +00:00
Casey	490e0a4d67	Merge pull request #13472 from Runa-Dacino/command-jacket-open ... Enables unbuttoning the Command Dress Jacket	2022-08-14 05:40:16 +00:00
Casey	c5d1d96bc9	shalax fluff wrassle secbelt reskin	2022-08-07 20:14:07 +00:00
Nadyr	7b005b01f5	Merge pull request #4580 from BlackMajor/voice-sound-fixes ... Say voice sound changes	2022-07-20 21:53:58 -04:00
BlackMajor	3daf934af0	forgot some comments	2022-07-21 13:17:41 +12:00
Nadyr	c327ec64bb	Merge pull request #4579 from CHOMPStation2/upstream-merge-13368 ... [MIRROR] Fixes some runtimes (hopefully)	2022-07-20 21:05:13 -04:00
Nadyr	4e5546810e	Merge pull request #4590 from TheGreatKitsune/flavor-clear-fix ... Earlyports Fix clearing flavor text when cancelling	2022-07-20 21:02:26 -04:00
BlackMajor	39fdb5aae1	Merge branch 'master' into voice-sound-fixes	2022-07-21 12:52:42 +12:00
Nadyr	7c6139b62f	Merge branch 'master' into upstream-merge-13368	2022-07-20 20:41:14 -04:00
TheGreatKitsune	ded4b2f0cc	Fix clearing flavor text when cancelling	2022-07-20 19:26:15 -05:00
Nadyr	094984f9be	Merge branch 'master' into upstream-merge-13352	2022-07-20 20:16:05 -04:00
Nadyr	16d0830751	Merge pull request #4563 from CHOMPStation2/upstream-merge-13340 ... [MIRROR] Adds Fullscreen Toggle & Cross Origin Fix	2022-07-20 20:13:29 -04:00
Nadyr	1b48ea0173	Merge pull request #4561 from CHOMPStation2/upstream-merge-13344 ... [MIRROR] Fixes load slot button sometimes not working when re-logging	2022-07-20 20:12:13 -04:00
BlackMajor	1affb3a089	Some preferred changes	2022-07-20 22:34:04 +12:00
Nadyr	259d1fd47d	Merge pull request #4549 from CHOMPStation2/upstream-merge-13319 ... [MIRROR] Adds roulette balls	2022-07-19 20:55:00 -04:00
Nadyr	38f0f6355e	powder that makes you say yes	2022-07-19 20:41:45 -04:00
Nadyr	d149c74a6f	powder that makes you say yes	2022-07-19 20:36:28 -04:00