cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-07 16:04:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,576 Commits 7 Branches 0 Tags
ff68eaaffdc2445cbc0daa7d7d895c615a315420
Commit Graph

274 Commits

Author SHA1 Message Date
Nadyr
60c6d78cca Merge pull request #5152 from CHOMPStation2/upstream-merge-13924 
[MIRROR] [MIRROR] speculative fix for obj/random's not being deleted
 2022-10-19 17:15:39 -04:00
Nadyr
bc7ece8d95 Merge pull request #5147 from CHOMPStation2/upstream-merge-13916 
[MIRROR] [MIRROR] Fixes overlooked invisible spawner when mapping
 2022-10-19 17:13:24 -04:00
Casey
f5a847464c Merge pull request #13924 from VOREStation/upstream-merge-8752 
[MIRROR] speculative fix for obj/random's not being deleted
 2022-10-16 21:10:01 +00:00
Casey
aaef0c5556 Merge pull request #13916 from VOREStation/upstream-merge-8751 
[MIRROR] Fixes overlooked invisible spawner when mapping
 2022-10-16 21:07:35 +00:00
Casey
1d3e58a5a9 Merge pull request #13895 from KillianKirilenko/kk-randomsoap 
Random-Soap Addon
 2022-10-16 21:02:50 +00:00
Nadyr
dc0115955a Merge pull request #5117 from CHOMPStation2/upstream-merge-13868 
[MIRROR] [MIRROR] Rub A Dub Dub [READY FOR MERGE]
 2022-10-11 20:37:18 -04:00
Casey
557371a7f5 Merge pull request #13868 from VOREStation/upstream-merge-8726 
[MIRROR] Rub A Dub Dub [READY FOR MERGE]
 2022-10-10 03:07:29 +00:00
Casey
7a4a02a0fd Smole vending tweak 2022-10-10 02:56:29 +00:00
Razgriz
ddb814a248 Merge pull request #5011 from CHOMPStation2/upstream-merge-12899 
[MIRROR] [MIRROR] Adds Sjorgen Inertial Shotgun (by H-H) (ABLE TO BE MERGED)
 2022-09-22 22:17:56 -07:00
Razgriz
0a3deac50c powder that makes you give birth to an angry yes demon 2022-09-22 22:01:53 -07:00
Razgriz
2bb42df36d powder that makes you say yes 2022-09-22 21:55:10 -07:00
Casey
efef3da1af Merge pull request #13771 from Heroman3003/hotfood-nerf 
Removes hotfood vendors from station spawning
 2022-09-23 00:56:17 +00:00
Nadyr
d46d8dc33c Merge pull request #4782 from CHOMPStation2/upstream-merge-13570 
[MIRROR] Adds Altevian cuisine
 2022-08-28 19:26:06 -04:00
Casey
85cf31f79c Merge pull request #13570 from Heroman3003/altevian-foods 
Adds Altevian cuisine
 2022-08-25 23:00:13 +00:00
Casey
da9722545b More casino updates 2022-08-21 19:38:41 +00:00
Casey
26dce1db7b Mouse Ray 2022-07-08 00:32:36 +00:00
Nadyr
978e9cb5a5 Merge pull request #4184 from CHOMPStation2/upstream-merge-12856 
[MIRROR] Quick GB tweaks
 2022-05-01 18:05:02 -04:00
Razgriz
f49e053631 Merge pull request #4154 from CHOMPStation2/upstream-merge-12838 
[MIRROR] Wild!
 2022-04-28 13:53:08 -07:00
Casey
7245e3880d Quick GB tweaks 2022-04-28 06:22:23 +00:00
Casey
759e1095ad Merge pull request #12816 from VOREStation/upstream-merge-8570 
[MIRROR] Fixes ALL random tech components having a chance of being anomalous
 2022-04-26 21:15:55 +00:00
Casey
d6e576123c Wild! 2022-04-26 09:19:54 +00:00
Casey
c9eb919583 Big Pharma's Blessing: Snorting Mechanics 2022-04-17 21:17:05 +00:00
Casey
12243e2fa5 Map tweaks! 2022-04-09 04:41:10 +00:00
Razgriz
1e2ec6febb Merge pull request #4018 from CHOMPStation2/upstream-merge-12662 
[MIRROR] New Donk-pockets
 2022-04-07 00:52:38 -07:00
Razgriz
4cedeee7e0 powder that makes you say yes 2022-04-05 21:17:53 -07:00
Casey
61ea8e3f3d New Donk-pockets 2022-04-06 02:12:51 +00:00
Casey
97eccd40fa Merge pull request #12659 from Very-Soft/tweaks 
Adjusts trees and vendor spawners
 2022-04-06 00:56:29 +00:00
Nadyr
a121954e24 Merge pull request #3992 from CHOMPStation2/upstream-merge-12592 
[MIRROR] The Grand /TG Port - Part 6
 2022-04-04 17:52:53 -04:00
Casey
de0be34c99 The Grand /TG Port - Part 6 2022-04-03 03:32:03 +00:00
Casey
60b1eeff99 Merge pull request #12579 from GhostActual/tg-port-5 
The Grand /TG Port - Part 5
 2022-04-03 03:30:56 +00:00
Razgriz
d85864e3e4 Merge pull request #3934 from CHOMPStation2/upstream-merge-12522 
[MIRROR] Firearms 1
 2022-03-27 16:41:35 -07:00
Casey
a20f1a7c2b Merge pull request #12541 from GhostActual/Firearms1 
Did a Whoops
 2022-03-26 04:43:06 +00:00
Nadyr
83caabb9c7 powder that makes you say yes 2022-03-25 18:32:51 -04:00
Casey
e71a04a991 Merge pull request #12504 from GhostActual/Robs-You-In-Public 
Robs You In Public
 2022-03-21 20:21:21 +00:00
Casey
8e0552a788 Colts, Revolvers, and Tasers 2022-03-20 03:10:23 +00:00
Casey
5510dbf441 Merge pull request #12392 from Heroman3003/cookiefix 
Brings REAL cookies to everywhere they belong
 2022-03-07 09:06:24 +00:00
Casey
80f5298a18 Ammo Boxes 2022-03-03 21:23:43 +00:00
Casey
a2646d37c5 Merge pull request #12319 from Very-Soft/trader 
Trader!
 2022-02-25 19:58:15 +00:00
Casey
3d6510f3ea Donk Co. Toys 2022-02-19 04:27:50 +00:00
Casey
80e943716f talon miner 2022-02-06 23:21:47 +00:00
Nadyr
46c47164ce powder that makes you say yes 2021-12-05 13:47:04 -05:00
Nadyr
1dc06fd9e6 Merge branch 'master' into upstream-merge-11928 2021-12-05 12:50:21 -05:00
Nadyr
1d43637079 Merge pull request #3236 from CHOMPStation2/upstream-merge-11906 
[MIRROR] Fixes another active edge trigger potential
 2021-12-05 12:15:52 -05:00
Nadyr
f9a407ba4b powder that makes you say yes 2021-12-05 12:00:39 -05:00
Nadyr
a8490c5623 powder that makes you say yes 2021-12-05 09:27:14 -05:00
Casey
fe8c4753eb Offmap Tweaks 2021-12-03 07:14:17 +00:00
BlackMajor
55e8bfa69d Simulated you dingus 2021-11-15 12:18:42 +13:00
BlackMajor
44d8d3245e quick mapping tool pr 2021-11-15 12:16:05 +13:00
Chompstation Bot
60de9a473c Stellar Delight! 2021-10-30 13:34:04 +00:00
Chompstation Bot
0fc8ba9656 Tool Time (Fixed) 2021-10-27 16:02:47 +00:00