cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,497 Commits 10 Branches 0 Tags
840510f1b240d25f53964cbfa50f15a5b1d77b19
Commit Graph

32854 Commits

Author SHA1 Message Date
Casey
840510f1b2 Merge pull request #13390 from Heroman3003/two-fixes 
Fixes two bugs
 2022-07-24 23:39:47 +00:00
Casey
7509a2a6ed Merge pull request #13387 from Cameron653/COMBAT_REWORK 
Allows attacks to properly damage simple_mobs.
 2022-07-24 19:28:17 +00:00
Nadyr
61b64def0f Merge pull request #4593 from BlackMajor/voice-sound-fixes 
prbt2
 2022-07-21 23:10:43 -04:00
BlackMajor
b815728aa5 Update mercs.dm 2022-07-22 13:51:51 +12:00
BlackMajor
5f6d47093b Update emote.dm 2022-07-21 23:36:53 +12:00
BlackMajor
b8b2aca1bc Merge branch 'master' into voice-sound-fixes 2022-07-21 23:35:54 +12:00
BlackMajor
dedf7fd50b if prbt is so good why isnt there a prbt2 2022-07-21 23:34:06 +12: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
b862768bd8 Merge pull request #4585 from CHOMPStation2/upstream-merge-13370 
[MIRROR] Pilot NIFsoft Uploaders
 2022-07-20 21:12:36 -04:00
Nadyr
c5a0f8fb24 Merge pull request #4584 from CHOMPStation2/upstream-merge-13371 
[MIRROR] Fixes in-chat icons being broken in oldchat
 2022-07-20 21:12:22 -04:00
Nadyr
d96777a733 Merge pull request #4583 from CHOMPStation2/upstream-merge-13372 
[MIRROR] makes brainzsnax obtainable ingame
 2022-07-20 21:09:50 -04:00
Nadyr
9421ac5e63 Merge pull request #4582 from CHOMPStation2/upstream-merge-13373 
[MIRROR] Adds polaris audible emotes available for all
 2022-07-20 21:05:30 -04: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
Nadyr
895c47db8b powder that makes you say yes 2022-07-20 20:56:49 -04:00
BlackMajor
39fdb5aae1 Merge branch 'master' into voice-sound-fixes 2022-07-21 12:52:42 +12:00
Nadyr
1b4cc6b555 Merge pull request #4581 from CHOMPStation2/upstream-merge-13357 
[MIRROR] [MIRROR] Nerfs allergic reactions (Again)
 2022-07-20 20:50:48 -04:00
Nadyr
e8796e8fde powder that makes you say yes 2022-07-20 20:48:16 -04:00
Nadyr
4e0846e3a9 Merge pull request #4574 from CHOMPStation2/upstream-merge-13362 
[MIRROR] Change interpersonal belly transfers to a seperate option
 2022-07-20 20:47:17 -04:00
Nadyr
7c6139b62f Merge branch 'master' into upstream-merge-13368 2022-07-20 20:41:14 -04:00
Nadyr
8cb2cabcb0 Merge pull request #4577 from CHOMPStation2/upstream-merge-13365 
[MIRROR] Adds pride pins to vending machines (Looty Inc.)
 2022-07-20 20:37:56 -04:00
Nadyr
3dc5633fbf Merge pull request #4565 from CHOMPStation2/upstream-merge-13353 
[MIRROR] Back to GB!
 2022-07-20 20:35:11 -04:00
Nadyr
1bc55469b9 Merge pull request #4564 from CHOMPStation2/upstream-merge-13352 
[MIRROR] Buffs Blockers and alters the new sound toggle verbs again
 2022-07-20 20:34:48 -04:00
Nadyr
f384ebb0f7 Merge branch 'master' into upstream-merge-13362 2022-07-20 20:30:25 -04:00
TheGreatKitsune
ded4b2f0cc Fix clearing flavor text when cancelling 2022-07-20 19:26:15 -05:00
Nadyr
af73e3da0a Merge pull request #4559 from CHOMPStation2/upstream-merge-13338 
[MIRROR] Cleans up casino map a bit
 2022-07-20 20:25:49 -04:00
Nadyr
8c2a87a3ee Merge pull request #4570 from CHOMPStation2/upstream-merge-13350 
[MIRROR] Allows direct prey transfer to bellies of other preds
 2022-07-20 20:22:13 -04:00
Nadyr
57145d9e2a Merge pull request #4545 from TheGreatKitsune/chemmaster-fix 
Add ability to recolor pill bottles
 2022-07-20 20:21:13 -04:00
Nadyr
6ece3102d7 Merge pull request #4568 from CHOMPStation2/upstream-merge-13348 
[MIRROR] Makes abandoned crates destroy contents when tamper is detected
 2022-07-20 20:20:03 -04:00
Nadyr
af513e9d02 Merge pull request #4558 from CHOMPStation2/upstream-merge-13335 
[MIRROR] Adds digestion nutrition traits
 2022-07-20 20:18:19 -04: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
Nadyr
887e13fb19 Merge branch 'master' into upstream-merge-13338 2022-07-20 20:10:05 -04:00
Nadyr
83365e7d2a powder that makes you say yes 2022-07-20 20:01:43 -04:00
Nadyr
571e28dee3 powder that makes you say yes 2022-07-20 19:58:35 -04:00
Nadyr
2dc10dacb4 Merge branch 'master' into upstream-merge-13335 2022-07-20 19:55:34 -04:00
Nadyr
b1c904123f Merge pull request #4548 from CHOMPStation2/upstream-merge-13321 
[MIRROR] Adds light and heavy frame traits
 2022-07-20 19:50:29 -04:00
Casey
a42e3e59e4 Pilot NIFsoft Uploaders 2022-07-20 17:24:31 +00:00
Casey
48f835f41f Fixes in-chat icons being broken in oldchat 2022-07-20 17:24:27 +00:00
Casey
95ad982fb2 Merge pull request #13372 from Screemonster/braaaaiiiins 
makes brainzsnax obtainable ingame
 2022-07-20 17:24:22 +00:00
Casey
42b0dab93a Merge pull request #13373 from Verkister/patch-117 
Adds polaris audible emotes available for all
 2022-07-20 17:23:16 +00:00
Casey
31471796a1 Merge pull request #13357 from VOREStation/upstream-merge-8668 
[MIRROR] Nerfs allergic reactions (Again)
 2022-07-20 17:23:10 +00:00
BlackMajor
1affb3a089 Some preferred changes 2022-07-20 22:34:04 +12:00
TheGreatKitsune
e294c54eab Add comments to final file 2022-07-19 22:08:35 -05:00
TheGreatKitsune
507c993161 Merge master into chemmaster-fix and add comments 2022-07-19 22:06:30 -05: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
46be321937 Merge branch 'master' into upstream-merge-13321 2022-07-19 20:53:26 -04:00
Nadyr
78747ce871 Merge pull request #4488 from CHOMPStation2/upstream-merge-13255 
[MIRROR] Adds language preview to character setup
 2022-07-19 20:52:37 -04:00