cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,142 Commits 10 Branches 0 Tags
a06f70b32b704ad2a52f93e270f5618a1d7d76f7
Commit Graph

20151 Commits

Author SHA1 Message Date
Nadyr
84345c2931 Merge pull request #4844 from CHOMPStation2/upstream-merge-13658 
[MIRROR] fixes runtime with stack dna transfer
 2022-09-04 18:21:14 -04:00
Casey
8a0aef53f8 Merge pull request #13658 from Heroman3003/stackruntime 
fixes runtime with stack dna transfer
 2022-09-04 21:50:22 +00:00
Casey
514d5def1e Merge pull request #13655 from Heroman3003/ghostcomm 
Fixes ghost comms runtime probably
 2022-09-04 21:49:12 +00:00
Nadyr
43928fcfb6 Merge pull request #4827 from CHOMPStation2/upstream-merge-13636 
[MIRROR] Adds some more reasons for job-board auto posting
 2022-09-04 17:17:42 -04:00
Nadyr
0dcd5e2016 powder that makes you say yes 2022-09-04 17:00:53 -04:00
Nadyr
29bdc97850 powder that makes you say yes 2022-09-04 17:00:00 -04:00
Nadyr
dbdcc9eeb6 Merge pull request #4816 from CHOMPStation2/upstream-merge-13616 
[MIRROR] Makes ignore_walls ignore only walls and not other things
 2022-09-04 16:55:25 -04:00
Nadyr
0543038500 Merge pull request #4814 from CHOMPStation2/upstream-merge-13612 
[MIRROR] Pizza vouchers now fit inside wallets
 2022-09-04 16:53:24 -04:00
Casey
a4eae77456 Adds some more reasons for job-board auto posting 2022-09-03 16:35:45 +00:00
Casey
21554ed113 Merge pull request #13627 from Very-Soft/micro_structures 
Makes it so you need to be inside to leave
 2022-09-02 05:14:10 +00:00
Casey
def2ba5549 Merge pull request #13616 from Heroman3003/soundchange 
Makes ignore_walls ignore only walls and not other things
 2022-08-31 07:38:20 +00:00
Casey
4c46939600 Merge pull request #13612 from Verkister/patch-118 
Pizza vouchers now fit inside wallets
 2022-08-31 07:35:06 +00:00
Nadyr
2123838942 Merge pull request #4809 from CHOMPStation2/upstream-merge-13608 
[MIRROR] /objs with mobs in them spit out the mobs before they Destroy()
 2022-08-31 01:14:24 -04:00
Nadyr
f83b6c2ad8 Merge branch 'master' into upstream-merge-13606 2022-08-30 19:01:55 -04:00
Casey
50e4e471ee Merge pull request #13608 from Very-Soft/micro_structures 
/objs with mobs in them spit out the mobs before they Destroy()
 2022-08-30 10:52:02 +00:00
Casey
4d7e22c2e1 Adjustments to Mouse holse, micro hiding, and smole buildings! WOW! 2022-08-30 09:07:18 +00:00
Nadyr
a278ddbb6d Merge branch 'master' into upstream-merge-13605 2022-08-30 00:03:11 -04:00
Casey
fad28d0138 Micro hiding! 2022-08-30 03:47:11 +00:00
Casey
1905520600 Mouse hole! 2022-08-29 05:36:25 +00:00
Nadyr
44a8097881 Merge pull request #4785 from CHOMPStation2/upstream-merge-13576 
[MIRROR] Makes flashlights not runtime.
 2022-08-28 20:42:17 -04:00
Nadyr
5cdfba0298 Merge pull request #4784 from CHOMPStation2/upstream-merge-13578 
[MIRROR] Makes the inducer not break forever when trying to charge a gun
 2022-08-28 19:26:42 -04:00
Nadyr
d46d8dc33c Merge pull request #4782 from CHOMPStation2/upstream-merge-13570 
[MIRROR] Adds Altevian cuisine
 2022-08-28 19:26:06 -04:00
Nadyr
a734024908 Merge pull request #4771 from Verkister/patch-87 
Fixes ancient oversight in recursive explosions
 2022-08-28 19:10:02 -04:00
Nadyr
323a57e271 Merge pull request #4747 from CHOMPStation2/upstream-merge-13536 
[MIRROR] More casino updates
 2022-08-28 18:51:48 -04:00
Nadyr
f64d19b948 powder that makes you say yes 2022-08-28 18:32:03 -04:00
Nadyr
b185777e95 Merge pull request #4746 from CHOMPStation2/upstream-merge-13534 
[MIRROR] Makes the freezer able to hold more items at cost of size.
 2022-08-28 18:31:00 -04:00
Nadyr
85c1d90a99 Merge pull request #4701 from CHOMPStation2/upstream-merge-13488 
[MIRROR] Adds mentors
 2022-08-28 17:59:26 -04:00
Casey
d99af385b6 Merge pull request #13576 from Cameron653/flashlight_runtimefix 
Makes flashlights not runtime.
 2022-08-25 23:01:29 +00:00
Casey
2e989c1bc3 Merge pull request #13578 from Cameron653/inducer_fix 
Makes the inducer not break forever when trying to charge a gun
 2022-08-25 23:01:25 +00:00
Casey
85cf31f79c Merge pull request #13570 from Heroman3003/altevian-foods 
Adds Altevian cuisine
 2022-08-25 23:00:13 +00:00
Verkister
320dc916b8 Also fixes a more recent one 2022-08-25 15:53:51 +03:00
Verkister
50facbf850 Fixes ancient oversight in recursive explosions 
earlyport from the future where i've pr'd this upstreams (too sleepy in present)
 2022-08-24 23:16:49 +03:00
Casey
da9722545b More casino updates 2022-08-21 19:38:41 +00:00
Casey
eb3f1875b2 Merge pull request #13534 from Cameron653/NEED_A_MEDIC_BAG 
Makes the freezer able to hold more items at cost of size.
 2022-08-21 19:37:35 +00:00
Razgriz
ac27046ab4 Fix for bad topic response in bot channel 
I think maybe this will work? According to coderbus, "Depending on your fork, there was also a bad revision of /tg/ DM code that wrongfully intercepted TGS topics with a rate limiter. You can check this isn't happening by checking the macro TGS_TOPIC is the first thing called in your /world/Topic()"
 2022-08-20 17:52:31 -07: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
fd1730f7ab Merge pull request #4720 from CHOMPStation2/upstream-merge-13492 
[MIRROR] Experimental implementation of automated role pings
 2022-08-17 18:00:19 -04:00
Nadyr
4c2388a68a powder that makes you say yes 2022-08-17 17:38:45 -04: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
796ae69274 Experimental implementation of automated role pings 2022-08-16 08:01:16 +00:00
Nadyr
4209a92290 Merge pull request #4703 from CHOMPStation2/upstream-merge-13494 
[MIRROR] Fixes secure briefcase AltClick
 2022-08-14 17:44:49 -04:00
Nadyr
6ca4bb352d Merge pull request #4702 from CHOMPStation2/upstream-merge-13493 
[MIRROR] Fixes recharge station overlays
 2022-08-14 17:44:23 -04:00
Nadyr
dc1701ae71 Merge pull request #4692 from CHOMPStation2/upstream-merge-13476 
[MIRROR] LEMME SUCC
 2022-08-14 17:30:44 -04:00
Nadyr
aa27319d18 Merge pull request #4691 from CHOMPStation2/upstream-merge-13468 
[MIRROR] [MIRROR] Removes eject from the mecha radial.
 2022-08-14 17:29:39 -04:00
Nadyr
0cce4310e4 Merge pull request #4690 from CHOMPStation2/upstream-merge-13469 
[MIRROR] Makes you able to select the borg plushies
 2022-08-14 17:28:52 -04:00
Nadyr
8f10ac1c1a Merge pull request #4684 from CHOMPStation2/upstream-merge-13442 
[MIRROR] [READY] Adds Altevian species
 2022-08-14 17:18:49 -04:00
Casey
4a0fa06764 Merge pull request #13494 from ItsSelis/secure-briefcase-fix 
Fixes secure briefcase AltClick
 2022-08-14 19:12:29 +00:00
Casey
cffa2804be Merge pull request #13493 from ItsSelis/recharge-station-fix 
Fixes recharge station overlays
 2022-08-14 19:11:22 +00:00
Casey
529616b1aa Adds mentors 2022-08-14 19:10:14 +00:00
Casey
b4dae2dca6 Condenses all the animal languages and deletes unused/unwanted languages 2022-08-14 05:44:51 +00:00