cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-25 17:42:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,078 Commits 9 Branches 0 Tags
b2912331b51f4d0b05fabe7944d7be2ace29dbba
Commit Graph

1172 Commits

Author SHA1 Message Date
Nadyr
0093bbac01 Merge pull request #5555 from lbnesquik/kot-muffle-item 
Add a mode to muffle items.
 2023-02-02 20:35:44 -05:00
lbnesquik
141519b826 Add a mode to muffle items. 2023-01-18 03:27:00 +01:00
Casey
04f41aadb7 Adds fireworks and their launchers 2022-12-26 02:05:31 +00:00
Heroman3003
70923e0c22 Adds admin tokens 2022-12-11 19:41:31 +00:00
Nadyr
e7375c180c Merge pull request #5330 from CHOMPStation2/upstream-merge-14056 
[MIRROR] promethean fixes and QoLs
 2022-12-04 18:18:56 -05:00
Heroman3003
1ba39fee84 Merge pull request #14056 from Seris02/prometheanchanges 
promethean fixes and QoLs
 2022-11-28 21:51:35 +00:00
Casey
d8f8f116bf Merge pull request #14141 from Heroman3003/smite-adjust 
Adjusts smite list
 2022-11-26 22:40:26 +00:00
Darlantan
91fc31c6b4 Renames "non-crew" to "outsider," provides external ID 
-Renames "non-crew" to "outsider."
-Provides an external ID to outsiders, allowing PDA use.
-Improves grammar in outsider job description
-Reformats outsider to use a define for the job name, replaces hard-coded uses of "non-crew" with said define.
 2022-11-25 19:56:59 -05:00
Darlantan
65bfa8d415 Adds bottles, pills, patches, and fixes emergency stop 2022-11-02 22:24:30 -04:00
Nadyr
d77e4f84cb Merge pull request #3877 from TheGreatKitsune/non-crew-role 
Non crew role added
 2022-10-29 19:08:16 -04:00
Verkister
cccd8d45a9 Makes slow body digestion a belly mode addon 
This way there was no need to add another extra button to clutter the tgui
The extra brutal version will stay as a varedit thing for now. Doesn't have enough relevancy to get an actual button tbh.
 2022-10-25 17:21:20 +03:00
Nadyr
319b20c2ee Merge pull request #5119 from CHOMPStation2/upstream-merge-13881 
[MIRROR] [MIRROR] Ports Diagonal Movement [READY FOR MERGE]
 2022-10-11 20:40:10 -04:00
Casey
24a6d07198 Merge pull request #13881 from VOREStation/upstream-merge-8199 
[MIRROR] Ports Diagonal Movement [READY FOR MERGE]
 2022-10-10 03:08:39 +00:00
Casey
86ee514421 Merge pull request #13855 from Cameron653/overlay_madness 
Upgrades OverlaySS. Fixes #3627
 2022-10-10 03:02:27 +00:00
Razgriz
cd0e5fd00a Merge pull request #5068 from CHOMPStation2/upstream-merge-13828 
[MIRROR] Blueprint Revamp.
 2022-10-02 22:47:55 -07:00
Casey
7fdb5e1f65 Merge pull request #13831 from VOREStation/upstream-merge-8709 
[MIRROR] moved sdmm defines to as early as possible in env [ABLE TO BE MERGED]
 2022-10-02 18:19:36 +00:00
Casey
892960d661 Blueprint Revamp. 2022-10-02 17:59:49 +00:00
Razgriz
8b2a71586a WIP New Smites 
Pie and spice
 2022-09-26 17:16:36 -07:00
Razgriz
fa6ecc5cee Merge pull request #5004 from CHOMPStation2/upstream-merge-13467 
[MIRROR] [MIRROR] conk rete (ABLE TO BE MERGED)
 2022-09-22 22:10:59 -07:00
Razgriz
acf63f3b62 Merge pull request #4962 from CHOMPStation2/upstream-merge-13748 
[MIRROR] Fixes runtime with cryopods
 2022-09-22 20:31:57 -07:00
VirgoBot
4acf5e2e67 [MIRROR] conk rete (ABLE TO BE MERGED) 2022-09-23 01:03:49 +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
Casey
6b01537fa3 Fixes runtime with cryopods 2022-09-18 09:39:31 +00:00
Novacat
06014fb014 Removes last references to simple_animal 2022-09-10 20:54:36 +00:00
TheGreatKitsune
4efab2d969 Merge master into non-crew-role and fix a map 2022-09-06 10:09:32 -05:00
Nadyr
85b9e3c8e7 Merge pull request #4831 from CHOMPStation2/upstream-merge-13638 
[MIRROR] Fixes runtime with chirping birds
 2022-09-04 17:03:20 -04:00
Casey
9f0965e166 Merge pull request #13638 from Heroman3003/language-runtime-fix 
Fixes runtime with chirping birds
 2022-09-03 16:50:54 +00:00
Casey
0516ac6a7b Merge pull request #13614 from Cameron653/LIGHT_ASH_STORM 
Adds a 'safe' ash storm variant.
 2022-08-31 07:37:14 +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
Razgriz
efc83a4860 Re-add slavic language (#4729) 
* Re-add slavic language

Don'tn't.

* Slavic

* Slavic

* Slavic

* Slavic
 2022-08-17 22:50:13 -07:00
Nadyr
c7fc0804c8 Merge pull request #4699 from CHOMPStation2/upstream-merge-13485 
[MIRROR] Condenses all the animal languages and deletes unused/unwanted languages
 2022-08-17 17:35:28 -04:00
Casey
b4dae2dca6 Condenses all the animal languages and deletes unused/unwanted languages 2022-08-14 05:44:51 +00:00
Casey
56b51e8ef2 [READY] Adds Altevian species 2022-08-12 18:05:36 +00:00
TheGreatKitsune
5f0ed62225 Merge master into vore-sprites 2022-08-07 19:38:53 -05:00
Nadyr
e44f59b8bc Merge branch 'master' into upstream-merge-13406 2022-08-01 21:29:15 -04:00
Casey
323aaa68a5 Merge pull request #13398 from Screemonster/chooseyourfate 
adds "selective" bellymode for mobs
 2022-08-01 20:47:21 -04:00
Casey
ff22619e80 Selective bellymode now selectable and pref-adjustible 2022-07-31 09:23:53 +00:00
TheGreatKitsune
30fa381175 Merge master into vore-sprites branch 2022-07-07 09:34:54 -05:00
Razgriz
3ab2127b75 Merge pull request #4482 from CHOMPStation2/upstream-merge-13246 
[MIRROR] Makes Talon Captain restricted behind 60 hours of Talon playtime
 2022-07-03 17:14:12 -07:00
Casey
047d3e2831 Merge pull request #13246 from Heroman3003/restricted-talon 
Makes Talon Captain restricted behind 60 hours of Talon playtime
 2022-07-03 09:07:04 +00:00
Casey
e1edec79c8 Ports some modular computer stuff from baystation 2022-07-01 03:58:58 +00:00
Nadyr
6cac94aca6 fixing dreamchecker 2022-06-26 04:02:49 -04:00
Casey
b326ad5267 Merge pull request #13139 from ItsSelis/fallback-behavior 
Changed TGUI fallback behavior
 2022-06-23 02:33:18 +00:00
Nadyr
4eb4f124c4 Merge pull request #4378 from CHOMPStation2/upstream-merge-13099 
[MIRROR] Fixes ambigous genders being too ambigous
 2022-06-22 20:45:31 -04:00
Casey
a3dd6b8ffa TGUI Input Framework 2022-06-22 19:19:55 -04:00
Casey
727fd44c86 Merge pull request #13099 from Heroman3003/ambiguity 
Fixes ambigous genders being too ambigous
 2022-06-19 00:59:23 +00:00
Razgriz
e37400e1ac Merge pull request #3064 from Rykka-Stormheart/shep-dev-ambience-3.0 
Update Ambient Sounds 3.0
 2022-05-18 21:42:59 -07:00
TheGreatKitsune
386b7e9803 merge master into vore-sprites 2022-05-08 19:21:09 -05:00
Nadyr
bc74b92698 Merge pull request #4216 from CHOMPStation2/upstream-merge-12902 
[MIRROR] Adds Echo Song language
 2022-05-08 11:14:49 -04:00