cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,820 Commits 5 Branches 0 Tags
84f57b8bccf228b749a374c8ca69d9572b30124f
Commit Graph

2581 Commits

Author SHA1 Message Date
Razgriz
6bbcda4901 [Manual MIRROR] Adds a ton more altevian stuff 
Ports https://github.com/VOREStation/VOREStation/pull/13774 instead of the auto mirror because github was crying over conflicts with a .dmi file
 2022-09-22 21:32:28 -07:00
Razgriz
7115a266a8 Merge pull request #4980 from CHOMPStation2/upstream-merge-13696 
[MIRROR] Adds personal shield generators. [READY FOR MERGE]
 2022-09-22 21:14:20 -07:00
Razgriz
1e0b390b53 powder that makes you say yes 2022-09-22 20:37:15 -07:00
VirgoBot
8157b3a7ab [MIRROR] Skips traits that aren't implemented yet. (ABLE TO BE MERGED) (#13165) 
* Merge pull request #8655 from MistakeNot4892/traitfix

Skips traits that aren't implemented yet.

* Skips traits that aren't implemented yet.

Co-authored-by: Atermonera <atermonera@gmail.com>
 2022-09-23 01:03:44 +00:00
Casey
524cd2e671 Adds personal shield generators. [READY FOR MERGE] 2022-09-23 00:53:41 +00:00
TheGreatKitsune
2f4c829afa Merge branch 'master' of https://github.com/CHOMPStation2/CHOMPStation2 into non-crew-role 2022-09-21 13:42:13 -05:00
TheGreatKitsune
d6645adb36 Fix a few bugs with non-crew 2022-09-21 13:41:56 -05:00
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
TheGreatKitsune
9e4d474b93 Fix vore spawns as noncrew. 2022-09-10 12:29:02 -05:00
TheGreatKitsune
4efab2d969 Merge master into non-crew-role and fix a map 2022-09-06 10:09:32 -05: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
TheGreatKitsune
a4ecc0b74d Switch to using modular chomp folder 2022-08-21 10:23:30 -05:00
TheGreatKitsune
d41e1e902c Merge branch 'master' of https://github.com/CHOMPStation2/CHOMPStation2 into non-crew-role 2022-08-21 09:12:31 -05: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