cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,766 Commits 5 Branches 0 Tags
897c1135fa9ea226720f8c54166566b54c5eabd1
Commit Graph

1591 Commits

Author SHA1 Message Date
C.L
8e6652e1b0 Merge pull request #13290 from VOREStation/upstream-merge-8660 
[MIRROR] Adds some core behavior code, uses it to fix a small bug (ABLE TO BE MERGED)
 2022-09-25 01:22:31 +00:00
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
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
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
Casey
f2716e95ae Adds more altevian content 2022-09-18 09:39:22 +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
2506e37d3b powder that makes you say yes 2022-08-28 18:54:35 -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
19d875c734 Merge branch 'master' into upstream-merge-13503 2022-08-28 18:06:43 -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
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
93870dd2e2 Mentor QOL changes 2022-08-15 01:15: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
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
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
Nadyr
2256f05ffc Merge branch 'master' into upstream-merge-13255 2022-07-19 20:35:56 -04:00
Nadyr
78ffd7f32a Merge pull request #4448 from CHOMPStation2/upstream-merge-13201 
[MIRROR] Fixes positive and negative traits being unsavable for non-custom species
 2022-07-19 20:32:24 -04:00
Nadyr
e524d30801 Merge pull request #4551 from CHOMPStation2/upstream-merge-13329 
[MIRROR] Pandora Fluff Item
 2022-07-19 20:31:57 -04:00
Nadyr
7f2936e816 Merge branch 'master' into upstream-merge-13193 2022-07-19 20:17:40 -04:00
Nadyr
6a99a3dd7e Merge pull request #4425 from CHOMPStation2/upstream-merge-13178 
[MIRROR] Adds Linguist and Polyglot traits
 2022-07-19 20:16:05 -04:00
Nadyr
5a7ae556cd powder that makes you say yes 2022-07-19 19:53:21 -04:00
Nadyr
03a7fd7c76 powder that makes you say yes 2022-07-19 19:52:07 -04:00
Nadyr
0a68fbc80c powder that makes you say yes 2022-07-19 19:45:36 -04:00
Casey
5e2328eba5 Fixes some runtimes (hopefully) 2022-07-19 23:44:16 +00:00
BlackMajor
9ee3e2688c Merge branch 'master' into upstream-merge-13336 2022-07-19 18:30:09 +12:00
Casey
f19463e5a9 Voice types! 2022-07-16 08:53:22 +00:00
Casey
022cebb0c9 Say Sound! 2022-07-16 01:37:06 +00:00
Casey
68f32bf874 Pandora Fluff Item 2022-07-15 22:32:11 +00:00
Nadyr
6c14103200 Merge pull request #4526 from CHOMPStation2/upstream-merge-13287 
[MIRROR] Nehi fluff items
 2022-07-13 18:49:12 -04:00
Casey
f43c530c46 Merge pull request #13287 from ZodiacShadow/Zodiac 
Nehi fluff items
 2022-07-08 00:36:49 +00:00