cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-18 13:23:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
67,404 Commits 8 Branches 0 Tags
5cefa8d4e325c19407fd949b89d82b0d1799110e
Commit Graph

46433 Commits

Author SHA1 Message Date
Casey
5cefa8d4e3 department berets (mostly heads tbh) 2021-12-12 04:20:38 -05:00
Nadyr
fa7890eef4 Merge pull request #3428 from CHOMPStation2/upstream-merge-11816 
[MIRROR] Vore mobs can eat you while unconcious
 2021-12-12 04:14:00 -05:00
Nadyr
d12a0f1b42 Merge pull request #3492 from CHOMPStation2/upstream-merge-11752 
[MIRROR] Renames Engineer, new alt-titles for Stellar Delight
 2021-12-12 04:13:36 -05:00
Nadyr
bf5f98c728 Merge pull request #3427 from CHOMPStation2/upstream-merge-11815 
[MIRROR] Adds catslug to maintpred options
 2021-12-12 04:13:27 -05:00
Nadyr
380945ddeb Merge pull request #3432 from CHOMPStation2/upstream-merge-11820 
[MIRROR] Adds vorepanel save doublecheck for non-slot chars
 2021-12-12 04:06:01 -05:00
Nadyr
460ce8c0f9 Merge pull request #3423 from CHOMPStation2/upstream-merge-11809 
[MIRROR] webedit graffiti examine . = ..()
 2021-12-12 03:57:51 -05:00
Nadyr
58accf0791 powder that makes you say yes 2021-12-12 03:56:58 -05:00
Nadyr
63af8e82c1 powder that makes you say yes 2021-12-12 03:54:27 -05:00
Nadyr
f880a70a18 powder that makes you say yes 2021-12-12 03:53:42 -05:00
Nadyr
165b5681d7 powder that makes you say yes 2021-12-12 03:52:07 -05:00
Casey
9163ddb85b Renames Engineer, new alt-titles for Stellar Delight 2021-12-12 08:46:53 +00:00
Nadyr
e1b158fd0f Merge pull request #3422 from CHOMPStation2/upstream-merge-11808 
[MIRROR] A Miner Update [forgot to test a thing]
 2021-12-12 03:41:33 -05:00
Nadyr
2cef388d77 Merge pull request #3424 from CHOMPStation2/upstream-merge-11812 
[MIRROR] Fixes invisible Heat Exchange Pipes
 2021-12-12 03:38:28 -05:00
Nadyr
d34d8203dd Merge branch 'master' into upstream-merge-11809 2021-12-12 03:37:13 -05:00
Nadyr
638d163670 Merge pull request #3417 from CHOMPStation2/upstream-merge-11802 
[MIRROR] fixes floor attackbys theoretically
 2021-12-12 03:35:29 -05:00
Nadyr
bb410d704d powder that makes you say yes 2021-12-12 03:32:16 -05:00
Nadyr
34e548bf2c powder that makes you say yes 2021-12-12 03:29:51 -05:00
Nadyr
0f3d3fd5c2 powder that makes you say yes 2021-12-12 03:26:46 -05:00
Nadyr
9cf9988593 Merge pull request #3418 from CHOMPStation2/upstream-merge-11801 
[MIRROR] Belly Interaction Improvements
 2021-12-12 03:23:34 -05:00
Nadyr
8d2e260f17 Merge pull request #3421 from CHOMPStation2/upstream-merge-11807 
[MIRROR] Adds general-purpose cooking oil, replaces usages of corn oil
 2021-12-12 03:23:06 -05:00
Nadyr
bbba20e9a3 Merge branch 'master' into upstream-merge-11802 2021-12-12 03:16:19 -05:00
Nadyr
a9699288a1 Merge pull request #3419 from CHOMPStation2/upstream-merge-11805 
[MIRROR] Simplemob QOL
 2021-12-12 02:54:05 -05:00
Nadyr
3dba9d5740 Merge pull request #3414 from CHOMPStation2/upstream-merge-11798 
[MIRROR] Makes long tails not be taur butts and corrects some hair colors
 2021-12-12 02:39:03 -05:00
Nadyr
d3c1d20387 Merge pull request #3413 from CHOMPStation2/upstream-merge-11797 
[MIRROR] Makes fuzzycuffs easier to get out of
 2021-12-12 02:34:31 -05:00
Nadyr
31a34f8700 Merge pull request #3412 from CHOMPStation2/upstream-merge-11796 
[MIRROR] [MIRROR] Fixes emote targetting.
 2021-12-12 02:32:56 -05:00
Nadyr
675bd480b6 Merge pull request #3409 from CHOMPStation2/upstream-merge-11793 
[MIRROR] Reworks timestamps of specific time using wrong time compared to station time
 2021-12-12 02:28:47 -05:00
Nadyr
30b8d64c17 Merge pull request #3408 from CHOMPStation2/upstream-merge-11792 
[MIRROR] fixes body scanner not being synced with display/station time
 2021-12-12 02:27:20 -05:00
Nadyr
97748f9f81 Merge pull request #3395 from CHOMPStation2/upstream-merge-11777 
[MIRROR] i hate the engraving antichrist
 2021-12-12 02:19:10 -05:00
Nadyr
7ebcb463e0 Merge pull request #3403 from CHOMPStation2/upstream-merge-11785 
[MIRROR] Fixes riding on stairs
 2021-12-12 02:03:43 -05:00
Nadyr
62921c7b1a Merge pull request #3401 from CHOMPStation2/upstream-merge-11779 
[MIRROR] Fixes infinite glass from low walls
 2021-12-12 02:00:08 -05:00
Nadyr
d89e459049 powder that makes you say yes 2021-12-12 01:35:36 -05:00
Nadyr
a91a503dc3 powder that makes you say yes 2021-12-12 01:34:46 -05:00
Nadyr
3c32302c67 powder that makes you say yes 2021-12-12 01:34:01 -05:00
Nadyr
e2171f3b29 powder that makes you say yes 2021-12-12 01:33:08 -05:00
Nadyr
eb7f7f278e powder that makes you say yes 2021-12-12 01:31:24 -05:00
Nadyr
5cab1d9d04 Merge pull request #3396 from CHOMPStation2/upstream-merge-11776 
[MIRROR] the christmas clothing pr no one asked for
 2021-12-12 01:26:42 -05:00
Nadyr
35b6006c77 powder that makes you say yes 2021-12-12 00:27:27 -05:00
Nadyr
6832934a5d powder that makes you say yes 2021-12-11 23:57:37 -05:00
Nadyr
11c9ae1a1d powder that makes you say yes 2021-12-11 23:28:59 -05:00
Nadyr
b2f9a21c34 powder that makes you say yes 2021-12-11 23:07:36 -05:00
Nadyr
3ccb809e3e powder that makes you say yes 2021-12-11 23:06:22 -05:00
Nadyr
959d841128 Merge pull request #3478 from CHOMPStation2/upstream-merge-11772 
[MIRROR] Adds Soft Falling positive trait
 2021-12-11 23:04:24 -05:00
Nadyr
1bb3f74e41 Merge pull request #3339 from CHOMPStation2/upstream-merge-11768 
[MIRROR] Fixes a broken poster
 2021-12-11 18:29:48 -05:00
Nadyr
23fc4e2b19 Merge pull request #3305 from CHOMPStation2/upstream-merge-11760 
[MIRROR] Makes Chem Storage list alphabetical
 2021-12-11 18:25:25 -05:00
Razgriz
2ab7f180a0 powder that makes you say yes 2021-12-10 19:42:12 -07:00
Casey
ea14e85c90 Merge pull request #11953 from Very-Soft/spacewhaletweak 
Space Whale Tweaks
 2021-12-10 21:11:55 +00:00
Razgriz
3b86cb45c7 Merge pull request #3259 from CHOMPStation2/upstream-merge-11947 
[MIRROR] pastelprincedan & hatterhat fluff items
 2021-12-10 13:23:35 -07:00
Razgriz
f623ad7005 Merge pull request #3258 from CHOMPStation2/upstream-merge-11935 
[MIRROR] Custom item for Coolcrow420, minor change to stamp code
 2021-12-10 13:23:08 -07:00
Razgriz
41e5c0d3fe Merge pull request #3255 from CHOMPStation2/upstream-merge-11759 
[MIRROR] Allows removal of digital t-valves
 2021-12-10 13:22:38 -07:00
Razgriz
8b61d3ca7a powder that makes you say yes 2021-12-10 01:55:43 -07:00