cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,323 Commits 6 Branches 0 Tags
801238f4d2f326f937b6c20ab8a428096109717d
Commit Graph

960 Commits

Author SHA1 Message Date
Nadyr
81b3ccb3a0 Merge pull request #6304 from CHOMPStation2/upstream-merge-14936 
[MIRROR] Little Weakref Refactor
 2023-06-09 22:27:56 -04:00
Heroman3003
2281afdf24 More 515 Compatibility 2023-06-05 21:21:35 +00:00
Heroman3003
8cf37fc7f1 TGUI Interface Hotfix 2023-06-04 19:13:12 +00:00
Heroman3003
3d53d2bb62 Little Weakref Refactor 2023-06-03 09:22:18 +00:00
Darlantan
ac96197d7f VR code tweaks, mob TF, ghost joining, qdel to VR escapees 2023-05-24 08:42:09 -04:00
Nadyr
3bab511efd Merge pull request #6159 from BlackMajor/matrices 
Matrices and supporting colour code
 2023-04-30 22:48:38 -04:00
Heroman3003
7a79811045 Merge pull request #14819 from SatinIsle/More-speech-bubbles 
More Speech Bubbles
 2023-05-01 00:58:18 +00:00
BlackMajor
65a5644b02 Ugh 2023-04-30 21:39:18 +12:00
BlackMajor
6f9f78213d Merge branch 'master' into matrices 2023-04-30 16:14:51 +12:00
Verkister
c39f2fc63b Adds item digestion blacklist and crowbar access hatch to release blacklisted stuff 2023-04-05 23:38:46 +03:00
Razgriz
7fd46a4844 Merge pull request #5979 from Seris02/badsimplecorpses 
changes the getmobs list to show mobs that have or had a client first
 2023-03-22 14:37:04 -07:00
Seris02
cc3ab6e307 changes the getmobs list to show mobs that have or had a client first 2023-03-20 18:06:57 +08:00
Casey
bec0b21aee Merge pull request #14718 from Heroman3003/goldupdate 
Adds a mob to gold extract pool
 2023-03-19 18:29:05 +00:00
Nadyr
5bbc06a4f3 Merge pull request #5937 from CHOMPStation2/upstream-merge-14616 
[MIRROR] Creates framework for renaming visitable overmap objs on initialization
 2023-03-17 03:24:01 -04:00
Heroman3003
4a44fb90ab Creates framework for renaming visitable overmap objs on initialization 2023-03-14 19:30:04 +00:00
Casey
c3ceffdc32 Merge pull request #14672 from KillianKirilenko/kk-misc2 
Square Bubble
 2023-03-13 03:33:20 +00:00
BlackMajor
818f2d64e0 yeah 2023-03-02 20:41:12 +13:00
TheGreatKitsune
1d36a4215d Item TF spawnpoints 2023-02-26 15:43:47 -06:00
BlackMajor
59766b720c Merge pull request #5790 from CHOMPStation2/upstream-merge-14536 
[MIRROR] Makes speech bubbles manually selectable, adds a whole bunch of new ones
 2023-02-27 00:01:40 +13:00
Razgriz
79d2c49ff7 Merge pull request #5773 from CHOMPStation2/upstream-merge-14539 
[MIRROR] [MIRROR] Adds const to holodeck copy bypass list.
 2023-02-26 00:54:29 -07:00
Razgriz
dea240e56d Merge pull request #5769 from CHOMPStation2/upstream-merge-14532 
[MIRROR] [MIRROR] Fix AI hologram sprites.
 2023-02-26 00:53:03 -07:00
Casey
41c20ca400 Merge pull request #14536 from Heroman3003/protean 
Makes speech bubbles manually selectable, adds a whole bunch of new ones
 2023-02-25 19:29:25 +00:00
Heroman3003
503a4a14f1 Merge pull request #14539 from VOREStation/upstream-merge-8959 
[MIRROR] Adds const to holodeck copy bypass list.
 2023-02-23 08:41:30 +00:00
Heroman3003
ad62f08ab4 Merge pull request #14532 from VOREStation/upstream-merge-8954 
[MIRROR] Fix AI hologram sprites.
 2023-02-22 08:55:54 +00:00
Seris02
f40ca96a27 fixing double messages 2023-02-16 14:48:00 +08:00
Seris02
2d3fe30765 better radio? 2023-02-15 13:18:30 +08:00
Bib Bob
d4617389ad Monkeys can now leave remains 2023-01-29 23:23:07 -06:00
Razgriz
9197e1b95d Merge branch 'master' into upstream-merge-14220 2023-01-21 22:24:10 -07:00
Razgriz
418643dce3 unfucc exploration 
please do not the department
 2023-01-21 22:21:39 -07:00
Casey
63c49c4e90 Replaces RP's carp, drone and jellyfish events with new Roaming Wildlife event 2023-01-03 21:56:23 +00:00
Casey
764e792895 Remove the Exploration Department 2022-12-23 16:21:39 +00:00
Heroman3003
70923e0c22 Adds admin tokens 2022-12-11 19:41:31 +00:00
Casey
7b4401a394 Merge pull request #14017 from KillianKirilenko/kk-linebreak 
Permit (Some) Linebreaks
 2022-11-06 16:55:26 +00:00
Heroman3003
5a1e7bdefa Merge pull request #13909 from VOREStation/upstream-merge-8737 
[MIRROR] fix || in type2parent switch, gentle refactor
 2022-10-29 06:36:07 +00:00
Casey
24a6d07198 Merge pull request #13881 from VOREStation/upstream-merge-8199 
[MIRROR] Ports Diagonal Movement [READY FOR MERGE]
 2022-10-10 03:08:39 +00:00
Razgriz
8f46e54856 idk what is wrong with these 2022-10-02 22:27:41 -07:00
Razgriz
c13b8117e1 more comments 2022-10-02 22:08:06 -07:00
Razgriz
8e872b9c9b comments 2022-10-02 22:06:52 -07:00
Razgriz
df46985d2e powder that makes you say yes 2022-10-02 22:05:32 -07:00
Casey
892960d661 Blueprint Revamp. 2022-10-02 17:59:49 +00:00
Casey
8f93154262 Merge pull request #13641 from Heroman3003/light-fix 
Fixes lighting runtime when moving hats on shuttles
 2022-09-03 16:50:50 +00:00
Casey
d389e9d3e8 Merge pull request #13548 from Cameron653/SANITIZATION_OVERLOAD 
Prevents embedding of phishing links in debug logs
 2022-08-21 19:56:51 +00:00
Nadyr
6f78be6a1b Merge pull request #4642 from CHOMPStation2/upstream-merge-13430 
[MIRROR] Adds zip.ogg to vore sounds
 2022-08-01 22:40:07 -04:00
Casey
241f900f8e Merge pull request #13430 from foopwo/zipwin 
Adds zip.ogg to vore sounds
 2022-08-01 04:18:09 +00:00
Poojawa
575a719688 get_random_colour() now prepends a # 2022-07-31 18:10:04 +00:00
Casey
48f835f41f Fixes in-chat icons being broken in oldchat 2022-07-20 17:24:27 +00: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
3fc20c3e2b powder that makes you say yes 2022-07-19 20:34:36 -04:00
Nadyr
555328c5bc powder that makes you say yes 2022-07-19 20:30:23 -04:00
Nadyr
7f2936e816 Merge branch 'master' into upstream-merge-13193 2022-07-19 20:17:40 -04:00