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
81,612 Commits 5 Branches 0 Tags
9f0e900ca7ea0e9f51ff88dcec1f7f6b26cfb991
Commit Graph

1033 Commits

Author SHA1 Message Date
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
Casey
8d83d4d3fd Adds roulette balls 2022-07-15 22:31:00 +00:00
Razgriz
27bed6853c Merge pull request #4459 from CHOMPStation2/upstream-merge-13220 
[MIRROR] Makes all things that check for dorms check for forbid events var
 2022-07-03 17:15:03 -07:00
Casey
e1edec79c8 Ports some modular computer stuff from baystation 2022-07-01 03:58:58 +00:00
Casey
84e6bfd922 Makes all things that check for dorms check for forbid events var 2022-06-30 22:59:57 +00:00
Casey
6ab64ba666 Implements all-species positive and negative traits 2022-06-29 06:01:30 +00:00
Casey
68c3469d60 ALL runtimes 2022-06-23 09:41:56 +00:00
Nadyr
a280fab734 Merge branch 'master' into upstream-merge-13139 2022-06-23 01:03:05 -04:00
Nadyr
eca51baab0 Merge pull request #4391 from CHOMPStation2/upstream-merge-13126 
[MIRROR] Encoding Fixes
 2022-06-22 23:28:12 -04:00
Nadyr
f78cff4eab Merge pull request #4357 from Rykka-Stormheart/shep-dev-stealth-mode 
Stealth Staff PMs now display the rank of the sender rather than ADMIN
 2022-06-22 23:14:45 -04:00
Nadyr
34e33565a5 powder that makes you say yes 2022-06-22 23:02:26 -04:00
Nadyr
07bbd46635 powder that makes you say yes 2022-06-22 23:01:37 -04:00
Nadyr
ceeab2a091 powder that makes you say yes 2022-06-22 23:01:06 -04:00
Casey
44471870fc Encoding Fixes 2022-06-22 22:59:46 -04:00
Casey
b326ad5267 Merge pull request #13139 from ItsSelis/fallback-behavior 
Changed TGUI fallback behavior
 2022-06-23 02:33:18 +00:00
Casey
78f8b46e7d readd_quotes() for TGUI Text Input 2022-06-22 22:22:32 -04:00
Rykka
ed22cb07f2 Add missed CHOMPEdit 2022-06-22 15:19:53 -06:00
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Rykka
ce9c35fe53 Stealth Staff PMs now display the rank of the sender rather than ADMIN 
As above. I spent way too long on this chasing the wrong path for getting it done oops
 2022-06-16 15:44:28 -06:00
Novacat
24aa127d67 Chest -> Torso Targeting Fixes 2022-05-09 01:08:04 +00:00
Casey
759d9add4c Merge pull request #12708 from VOREStation/upstream-merge-8511 
[MIRROR] updated get_atom_on_turf
 2022-04-11 19:25:40 +00:00
Casey
9609511e87 Makes Xenobio Great Again 2022-03-27 18:59:22 +00:00
Casey
361a2f1568 Strapless satchel moved to bag selection 2022-03-20 18:33:21 +00:00
Casey
6e5a7deaeb Merge pull request #12373 from Very-Soft/dominantprey 
Dominant Prey and Dominant Predators
 2022-03-07 03:02:50 +00:00
Casey
5603fb7bd4 Merge pull request #12358 from BonniePandora/PDA-clamshell+more 
New PDA type, new sprites for other types & overlays!
 2022-03-02 18:14:44 +00:00
Razgriz
f7190c5fa2 Merge pull request #3760 from CHOMPStation2/upstream-merge-12325 
[MIRROR] Analyzer information upgrade
 2022-03-01 01:08:52 -07:00
Casey
67e6c48f83 Merge pull request #12325 from BonniePandora/AtmosQoL1 
Analyzer information upgrade
 2022-02-27 19:25:29 +00:00
Casey
58a5611395 Merge pull request #12291 from Heroman3003/8330-fix 
8330 fix
 2022-02-19 22:33:38 +00:00