cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-20 14:23:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,026 Commits 8 Branches 0 Tags
e259e77ebee03d4e080f4c57e6ec29ccce3c847f
Commit Graph

12867 Commits

Author SHA1 Message Date
Nadyr
e259e77ebe Merge pull request #2777 from User-U-U/medinerdsurgerytools 
Gives Medihound borg module surgery Tools
 2021-08-14 01:39:40 -04:00
Razgriz
d3cd7fd03b Removes broken YW bots. 
Borg code would need to be overhauled again.
 2021-08-12 20:48:33 -07:00
Tename
b57805eaf5 Done 2021-08-10 23:44:06 -07:00
Nadyr
0b635bc357 Merge pull request #2764 from CHOMPStationBot/upstream-merge-11367 
[MIRROR] Fimxes shadekin eyecolors displaying wonkily
 2021-08-09 18:47:56 -04:00
Aronai Sieyes
008c1ba080 Merge pull request #11367 from Heroman3003/eue-fix 
Fimxes shadekin eyecolors displaying wonkily
 2021-08-09 03:29:02 +00:00
Aronai Sieyes
9ea77444f9 Merge pull request #11366 from Verkister/patch-78 
Finally fixes "It's contains glorping slush"
 2021-08-08 20:11:59 +00:00
Nadyr
949daef5b1 Merge pull request #2748 from CHOMPStation2/Razgriz1032-patch-9 
Protean now gets default survival box
 2021-08-08 06:38:36 -04:00
Razgriz
768f6e4f6e Merge pull request #2737 from CHOMPStationBot/upstream-merge-11338 
[MIRROR] New Floor Tanks
 2021-08-08 01:06:27 -07:00
Aronai Sieyes
5183b0fa73 Merge pull request #11364 from VOREStation/Fixes/11352 
Fixes #11352
 2021-08-08 01:39:43 +00:00
Razgriz
391853b436 Merge pull request #2742 from CHOMPStationBot/upstream-merge-11343 
[MIRROR] Port Eris maint drone as option
 2021-08-07 15:13:28 -07:00
Razgriz
18481e157f Protean now gets default survival box 2021-08-07 14:25:25 -07:00
Chompstation Bot
6731e90dae Port Eris maint drone as option 2021-08-06 22:15:57 +00:00
Chompstation Bot
b2b980c371 New Floor Tanks 2021-08-06 15:38:14 +00:00
Novacat
d072b0923b Merge pull request #11349 from VOREStation/Arokha/barerrerr 
Make a borer subtype for adminbuse
 2021-08-06 15:01:22 +00:00
Aronai Sieyes
dfd88b4ba7 Merge pull request #11326 from Verkister/hudbutts 
Fixes the small hud buttons not getting hud colors
 2021-08-02 13:40:43 +00:00
Nadyr
f0d5ea81a4 Merge pull request #2710 from CHOMPStationBot/upstream-merge-10773 
[MIRROR] [MIRROR] Adds optional area-based definition for outdoors-ness
 2021-08-01 17:47:09 -04:00
Nadyr
9a38017a08 powder that makes you say yes 2021-08-01 15:19:20 -04:00
Chompstation Bot
21b6022a3a [MIRROR] Adds optional area-based definition for outdoors-ness 2021-08-01 15:41:46 +00:00
Chompstation Bot
e0900e747c Reworks Shadekin eyecolors (again) 2021-08-01 14:48:52 +00:00
Nadyr
1a38674550 Merge pull request #2696 from CHOMPStationBot/upstream-merge-11311 
[MIRROR] Vore Panel and Character Setup HUD buttons
 2021-08-01 00:06:19 -04:00
Nadyr
4e1149b326 Merge pull request #2700 from CHOMPStationBot/upstream-merge-11313 
[MIRROR] Fix fake fox type
 2021-07-31 23:53:00 -04:00
Nadyr
8a720df372 powder that makes you say yes 2021-07-31 23:51:10 -04:00
Nadyr
4b5f5a8367 powder that makes you say yes 2021-07-31 23:47:32 -04:00
Aronai Sieyes
bb0a118a96 Merge pull request #11313 from VOREStation/Arokha/faketype 
Fix fake fox type
 2021-08-01 03:27:05 +00:00
Chompstation Bot
f0e0a6424b Vore Panel and Character Setup HUD buttons 2021-08-01 03:25:38 +00:00
Razgriz
4e847ee9d8 Merge pull request #2691 from Darlantanis/ballistics_revert 
Revert ballistics overhaul
 2021-07-31 18:20:48 -07:00
Nadyr
1aab6fcc45 Merge pull request #2693 from CHOMPStationBot/upstream-merge-11309 
[MIRROR] Fixes eggless nurse/spider queens being able to lay eggs when player-controlled
 2021-07-31 20:16:33 -04:00
Novacat
9c2276203f Merge pull request #11309 from Heroman3003/BENEDICT 
Fixes eggless nurse/spider queens being able to lay eggs when player-controlled
 2021-07-31 23:53:52 +00:00
Darlantan
9604899135 Revert ballistics overhaul 2021-07-30 21:25:04 -04:00
Nadyr
4b561c4e5e powder that makes you say yes 2021-07-30 19:48:20 -04:00
Nadyr
94d93a5c0f Merge pull request #2665 from CHOMPStationBot/upstream-merge-11249 
[MIRROR] Observer darkness levels
 2021-07-26 19:50:44 -04:00
Nadyr
ce471497f4 powder that makes you say yes 2021-07-26 18:29:50 -04:00
Nadyr
8979895cd2 Merge pull request #2662 from CHOMPStationBot/upstream-merge-11252 
[MIRROR] Adds *scary for synths
 2021-07-26 18:24:48 -04:00
Nadyr
263538e2e0 Merge pull request #2654 from Shadowfire117/casinomanualrework 
Less Ringa ding and work in progress new casino manual
 2021-07-26 18:24:24 -04:00
Chompstation Bot
7a1079dcca Observer darkness levels 2021-07-26 13:31:49 +00:00
Aronai Sieyes
7acce9cc33 Merge pull request #11252 from VOREStation/Arokha/synthscare 
Adds *scary for synths
 2021-07-26 13:31:27 +00:00
Shadowfire
94b8471cc0 Less Ringa ding and work in progress new casino manual 
Now people cant spam the slot machines and get platinum coins, they are once more special! Also new codex casino manual. Albeit still entries needs to be done at later moments but is being added for safety reasons and to access while I only have a laptop to work on.
 2021-07-25 17:45:47 +02:00
Nadyr
7f9453c3ba Merge pull request #2628 from CHOMPStationBot/upstream-merge-11200 
[MIRROR] new loading screen
 2021-07-22 18:33:25 -04:00
Nadyr
1433deddfc Merge pull request #2626 from CHOMPStationBot/upstream-merge-11197 
[MIRROR] Expands spider features
 2021-07-22 18:26:01 -04:00
Nadyr
192aebb527 powder that makes you say yes 2021-07-22 18:21:53 -04:00
Nadyr
f191839d08 powder that makes you say yes 2021-07-22 18:15:29 -04:00
Aronai Sieyes
397153f82a Merge pull request #11209 from VOREStation/Arokha/howdthisgoaway 
This is the second time I've coded this, huh
 2021-07-22 19:53:39 +00:00
Chompstation Bot
58a498c918 Expands spider features 2021-07-22 16:20:15 +00:00
Razgriz
ca85723e8a Merge pull request #2623 from Cyrelius/master 
Xenobio Adjustments
 2021-07-22 01:14:10 -07:00
Nadyr
2ac3993558 Merge pull request #2617 from CHOMPStationBot/upstream-merge-11179 
[MIRROR] Optimize a couple things
 2021-07-20 21:45:26 -04:00
Nadyr
6470bc0080 Merge pull request #2619 from CHOMPStationBot/upstream-merge-11188 
[MIRROR] Remove tons of pointless helpers
 2021-07-20 21:25:43 -04:00
Nadyr
3aa78bbb82 Merge pull request #2603 from CHOMPStationBot/upstream-merge-11163 
[MIRROR] Tweak alien eggs
 2021-07-20 21:24:38 -04:00
Nadyr
8c992ce355 powder that makes you say yes 2021-07-20 21:19:25 -04:00
Nadyr
e39c3b02ee Merge pull request #2616 from CHOMPStationBot/upstream-merge-11180 
[MIRROR] Update gateways
 2021-07-20 21:09:59 -04:00
Nadyr
d6f1561d42 Merge branch 'CHOMPStation2:master' into upstream-merge-11163 2021-07-20 21:05:41 -04:00