cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-06-16 03:43:01 +01:00
Code Issues Packages Projects Releases Wiki Activity
67,404 Commits 9 Branches 0 Tags
5cefa8d4e325c19407fd949b89d82b0d1799110e
Commit Graph

31323 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 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 d34d8203dd Merge branch 'master' into upstream-merge-11809 2021-12-12 03:37:13 -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 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 31a34f8700 Merge pull request #3412 from CHOMPStation2/upstream-merge-11796 
[MIRROR] [MIRROR] Fixes emote targetting.
 2021-12-12 02:32:56 -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 d89e459049 powder that makes you say yes 2021-12-12 01:35:36 -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 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 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 8b61d3ca7a powder that makes you say yes 2021-12-10 01:55:43 -07:00
Razgriz 064f1b1a20 Merge branch 'master' into upstream-merge-11935 2021-12-10 01:48:12 -07:00
Razgriz a4637d6c1a powder that makes you say whatever 2021-12-10 01:47:17 -07:00
Razgriz 1700939abe Merge pull request #3338 from CHOMPStation2/upstream-merge-11872 
[MIRROR] [MIRROR] Fixes simplemobs with 0 init nutrition runtiming
 2021-12-10 01:23:08 -07:00
Razgriz 695e9befa5 powder that makes you say yes 2021-12-10 01:22:53 -07:00
Razgriz 003a0a0c11 powder that makes you say yes 2021-12-10 01:11:57 -07:00
Razgriz cfe0107753 powder that makes you say yes 2021-12-10 01:03:48 -07:00
Razgriz 01b4d2f182 powder that makes you say yes 2021-12-10 01:01:40 -07:00
Razgriz f26f2f1880 powder that makes you say yes 2021-12-10 00:59:15 -07:00
Razgriz 308bffe8d3 Update graffiti.dm 2021-12-10 00:57:47 -07:00
CHOMPStation2 3faebaf8f6 powder that makes you say yes 2021-12-10 00:50:18 -07:00
Casey f8cf8f7322 Adds Soft Falling positive trait 2021-12-10 07:21:20 +00:00
CHOMPStation2 57c0be6720 Merge pull request #3475 from CHOMPStation2/upstream-merge-11883 
[MIRROR] Makes Bitters inhibit Martini Classic reaction
 2021-12-09 23:38:38 -07:00
Casey 3c89650556 Merge pull request #11755 from Hatterhat/gaiter-second-pass 
neck gaiter second pass - thank you @dan
 2021-12-10 06:24:31 +00:00
Casey cb16101fb6 Merge pull request #11883 from Heroman3003/negroni 
Makes Bitters inhibit Martini Classic reaction
 2021-12-10 06:22:07 +00:00
Casey 9b5cb78a40 Adds vorepanel save doublecheck for non-slot chars 2021-12-10 01:42:00 +00:00
Casey 31ab947bfe Vore mobs can eat you while unconcious 2021-12-10 01:09:14 +00:00