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
65,074 Commits 5 Branches 0 Tags
db993cd5834b0126237bc0ab81b817970f3735d3
Commit Graph

741 Commits

Author SHA1 Message Date
Nadyr
a85ee7115f Merge branch 'master' into upstream-merge-9924 2021-03-21 03:35:47 -04:00
Nadyr
48d8812b9e Update global_lists_vr.dm 2021-03-21 02:00:04 -04:00
Nadyr
95a2350221 Update global_lists.dm 2021-03-21 01:24:14 -04:00
Chompstation Bot
2a5c21c8f5 [MIRROR] Kaleidoscope 2: The Retabbening 2021-03-21 01:24:14 -04:00
Chompstation Bot
006cc9fa0e Fixes Custom Species Base Selection 2021-03-12 05:25:32 +00:00
Novacat
6af8ca393b Merge pull request #9900 from VOREStation/upstream-merge-7958 
[MIRROR] Fixes context-menu examine expanding incorrect target
 2021-03-10 19:46:45 +00:00
Novacat
1d0ca9dd1e Merge pull request #9867 from VOREStation/upstream-merge-7928 
[MIRROR] Added a GPS compass.
 2021-03-09 22:59:48 +00:00
Novacat
955be2e5fe Merge pull request #9876 from VOREStation/upstream-merge-7953 
[MIRROR] Fixed/generalized loadout implants.
 2021-03-08 16:53:20 +00:00
cadyn
fc25da825e Revert "Fix ghost double comms with new link allinone" 2021-03-05 14:00:51 -08:00
Razgriz
01fc087eeb Merge pull request #1460 from CHOMPStation2/cadyn-patch-9 
Fix bullets I guess
 2021-03-04 02:15:20 -07:00
Cadyn
7cae69b7c9 Fix ghost double comms with link allinone 2021-03-03 23:39:03 -08:00
cadyn
067fbe283d Update mobs.dm 2021-02-28 19:33:10 -08:00
cadyn
b4d1f6d520 Fix bullets I guess 2021-02-28 19:23:38 -08:00
Nadyr
553c26bde2 Merge pull request #1427 from CHOMPStationBot/upstream-merge-9793 
[MIRROR] Silky, silky webs. Adds Weaver trait, with ability to weave spiderwebs and more!
 2021-02-28 08:08:43 -05:00
cadyn
a815e7b384 Update global_lists.dm 2021-02-27 13:23:03 -08:00
Chompstation Bot
dbc2902fc1 Steals and fixes a memory leak fix from the freeloaders 2021-02-27 15:06:52 +00:00
Chompstation Bot
d11ff04c30 Silky, silky webs. Adds Weaver trait, with ability to weave spiderwebs and more! 2021-02-26 21:41:34 +00:00
Razgriz
fdf4277123 Citadel Mirror: fixes a pretty horrific memory leak 
This fix is taken from citadel station pr #2779. Fixes a "pretty horrific memory leak" that is called any time someone opens character creator.
 2021-02-25 17:09:11 -07:00
Cadyn
3995353b03 Bot cleanup and config 
Cleaning my code up and adding stuff to config
 2021-02-24 16:05:49 -08:00
Cadyn
51ce2042af Faxes and ahelps admin channel changes 2021-02-24 13:36:31 -08:00
Cadyn
bbb338edba Auto stash before merge of "tgs4" and "origin/master" 2021-02-23 03:02:32 -08:00
Chompstation Bot
653d2b9179 Communicator UI Improvements + Camera Console Moving Camera Fixes (rebundled) 2021-02-14 08:51:59 -05:00
Nadyr
39292dfe36 Merge pull request #1291 from CHOMPStationBot/upstream-merge-9676 
[MIRROR] Adds in 1 new eggs end 3 joke eggs.
 2021-02-14 07:33:01 -05:00
Razgriz
aaee7ed0fd Merge pull request #1214 from kcin2001/trash-eat-bots 
Synths get a special list of Trash eat items and add a few items to normal trash eat
 2021-02-11 22:39:44 -07:00
Verkister
113bf6356a Merge pull request #9676 from H0lySquirr3l/master 
Adds in 1 new eggs end 3 joke eggs.
 2021-02-11 10:59:20 +00:00
Razgriz
9760ad2b36 Revert #1238 
Revert #1238 SQL ReturnlessQuery()
 2021-02-07 17:34:25 -07:00
Razgriz
c446790d4f Merge pull request #1234 from cadyn/ballistics-v4 
Ballistics v4
 2021-02-06 22:59:44 -07:00
Cadyn
aee6b61ffb added and implemented ReturnlessQuery() 2021-02-04 17:58:40 -08:00
Razgriz
14c7fcfef1 Merge branch 'master' into trash-eat-bots 2021-02-04 14:26:50 -07:00
Cadyn
d93a3dac65 Ballistics v4 2021-02-04 01:56:16 -08:00
Chompstation Bot
d3c7cc6040 New advanced Egg Release mechanics. 2021-02-01 19:35:41 +00:00
Razgriz
710c6b5021 Merge pull request #1197 from CHOMPStationBot/upstream-merge-9615 
[MIRROR] Converts Morph Spawn and Maint Pred events to use ghostpods
 2021-01-30 00:20:38 -07:00
kcin2001
7e53ea41c5 add synth list of trash eat items 2021-01-29 23:15:58 -08:00
kcin2001
3ba3df17f0 adding misc trash eat items 2021-01-29 23:15:00 -08:00
cadyn
1aa0df2c2a fixing lasers yeeting through mobs 2021-01-29 20:12:38 -08:00
Cadyn
be51ec1b85 Porting attack logs to use SQL 2021-01-27 16:59:27 -08:00
Cadyn
00bc513e6e Implementing TGSQL security 2021-01-27 10:51:12 -08:00
Chompstation Bot
be8d010ff9 Converts Morph Spawn and Maint Pred events to use ghostpods 2021-01-27 02:25:00 +00:00
Cadyn
02163907f2 Updoot for quick fixies 2021-01-26 01:51:18 -08:00
Cadyn
76ed115e37 Porting TG's SQL 2021-01-25 23:37:49 -08:00
cadyn
b379c65606 Merge pull request #1191 from cadyn/master 
The logenning: Privacy begone, and Moderators having context and evidence welcome.
 2021-01-25 18:45:05 -08:00
Cadyn
95f9b99873 The logenning 2021-01-25 15:25:36 -08:00
Chompstation Bot
9c8634a84b Makes most neutral traits available to all species 2021-01-24 06:33:08 +00:00
Razgriz
0e0accc447 Merge pull request #1112 from CHOMPStationBot/upstream-merge-9191 
[MIRROR] Vore transform overhaul
 2021-01-20 04:12:05 -07:00
Chompstation Bot
d1f2ad4a18 Vore transform overhaul 2021-01-20 01:00:01 -05:00
BlackMajor
96d2868d2d tiny optimisation 2021-01-17 17:59:03 +13:00
Novacat
ddbc8874c2 Merge pull request #9557 from Novacat/nova-basicfixes 
Some fixes
 2021-01-09 05:53:13 +00:00
Chompstation Bot
f7df37c72d Adds Verie's fluff items + framework for hair accessories 2020-12-11 12:13:12 +00:00
Cadyn
a9fce95444 Fix ghost radio 2020-11-27 16:17:51 -08:00
cadyn
d260757e91 yumyum radio go vroom hehe 2020-11-24 22:45:41 -08:00