cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-06 07:23:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,078 Commits 7 Branches 0 Tags
b2912331b51f4d0b05fabe7944d7be2ace29dbba
Commit Graph

312 Commits

Author SHA1 Message Date
Casey
b2912331b5 Merge pull request #14418 from Flump1/master 
Ports four outfits from skyrat
 2023-02-04 05:37:57 +00:00
Nadyr
8ae9cf61e4 Merge pull request #5590 from CHOMPStation2/upstream-merge-14358 
[MIRROR] Adds loaded dice + a custom item
 2023-01-27 10:28:55 -05:00
Razgriz
a3c840b7b9 Update vending_machines.dm 2023-01-24 18:26:42 -07:00
Heroman3003
59819128b4 Adds loaded dice + a custom item 2023-01-22 01:36:16 +00:00
Heroman3003
6b5a73d2da Merge pull request #14257 from Heroman3003/varios-fixes 
Various minor fixes
 2022-12-28 05:02:08 +00:00
tacoguy7765093
9185b2299f Makes Glucose a craftable reagent and uncomments VOREstation removal from sweatmaxes. (#5409) 
* Gives glucose a crafting recipe and un comments sweatmax glucose.

* slash

* nerf this

* Moving glucose pens to medical tab
 2022-12-26 12:13:22 -07:00
Novacat
1e7cbec2e3 Missing href token adds 2022-12-15 20:43:47 +00:00
Casey
10e697c6fe Merge pull request #14136 from Heroman3003/altevian-thanksgiving 
Adds more altevian things
 2022-11-26 22:41:43 +00:00
Casey
a452b89e36 Merge pull request #13943 from FunnyCatEnjoyer/FunnyCat2 
Adds the tactical AR visor.
 2022-10-23 18:53:11 +00:00
Nadyr
c972b89ef8 Merge pull request #5149 from CHOMPStation2/upstream-merge-13918 
[MIRROR] Adds the Security Hudpatch MKII to the game
 2022-10-19 17:14:52 -04:00
Casey
973ce30d54 Merge pull request #13918 from FunnyCatEnjoyer/FunnyCat 
Adds the Security Hudpatch MKII to the game
 2022-10-16 21:08:46 +00:00
Casey
6b40e7118c Merge pull request #13919 from FunnyCatEnjoyer/FunnyCat2 
Halloween costume update. feat Hotdog and Turnip suits.
 2022-10-16 21:08:41 +00:00
Casey
f6708d3687 Adds in 'compliance implant' 2022-10-02 17:58:42 +00:00
Razgriz
64a7d9a36d Merge pull request #5010 from CHOMPStation2/upstream-merge-12971 
[MIRROR] [MIRROR] Bartending enhancements (ABLE TO BE MERGED)
 2022-09-22 22:17:43 -07:00
Razgriz
f3c10fdf10 powder that makes you say yes 2022-09-22 21:48:00 -07:00
Casey
efef3da1af Merge pull request #13771 from Heroman3003/hotfood-nerf 
Removes hotfood vendors from station spawning
 2022-09-23 00:56:17 +00:00
Casey
f2716e95ae Adds more altevian content 2022-09-18 09:39:22 +00: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
a21d776ca2 powder that makes you say yes 2022-08-28 18:36:59 -04:00
Casey
85cf31f79c Merge pull request #13570 from Heroman3003/altevian-foods 
Adds Altevian cuisine
 2022-08-25 23:00:13 +00:00
Casey
da9722545b More casino updates 2022-08-21 19:38:41 +00:00
Casey
5f21619665 Merge pull request #13496 from Runa-Dacino/schnapsen_vending 
Adds ""Bits and Bobs"" EGY and Schnapsen to vending machines
 2022-08-14 19:13:35 +00:00
Nadyr
c5a0f8fb24 Merge pull request #4584 from CHOMPStation2/upstream-merge-13371 
[MIRROR] Fixes in-chat icons being broken in oldchat
 2022-07-20 21:12:22 -04:00
Nadyr
d96777a733 Merge pull request #4583 from CHOMPStation2/upstream-merge-13372 
[MIRROR] makes brainzsnax obtainable ingame
 2022-07-20 21:09:50 -04:00
Nadyr
8cb2cabcb0 Merge pull request #4577 from CHOMPStation2/upstream-merge-13365 
[MIRROR] Adds pride pins to vending machines (Looty Inc.)
 2022-07-20 20:37:56 -04:00
Casey
48f835f41f Fixes in-chat icons being broken in oldchat 2022-07-20 17:24:27 +00:00
Casey
95ad982fb2 Merge pull request #13372 from Screemonster/braaaaiiiins 
makes brainzsnax obtainable ingame
 2022-07-20 17:24:22 +00:00
Casey
571da888da Merge pull request #13365 from Runa-Dacino/pride_pin 
Adds pride pins to vending machines (Looty Inc.)
 2022-07-19 22:02:58 +00:00
Casey
28642c7888 Back to GB! 2022-07-17 09:30:27 +00:00
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Casey
839441f481 Merge pull request #13015 from lm40/master 
Makes ATMs more intuitive
 2022-05-29 17:46:21 +00:00
Casey
4aa0977f19 A couple more engineering QoL changes. 2022-05-22 18:24:54 +00:00
Casey
c608a6b9bc Fixes dumb cat mistakes 2022-05-18 08:59:06 +00:00
Novacat
4b4ba32e03 Merge pull request #12968 from Heroman3003/RUNTIME-FIX-END-ME 
Fixes runtimes being broken. Removes back-worn watertanks. NO I DO NO…
 2022-05-14 13:05:43 +00:00
Casey
fd5a1d7ce2 Merge pull request #12820 from Heroman3003/slow_sizegun 
Adds gradual sizegun
 2022-04-24 07:16:37 +00:00
Nadyr
0c55878a57 Merge pull request #4099 from CHOMPStation2/upstream-merge-12765 
[MIRROR] Lettuce Eat
 2022-04-17 23:29:42 -04:00
Casey
abea22deec Merge pull request #12765 from GhostActual/Lettuce-Eat 
Lettuce Eat
 2022-04-17 17:55:59 +00:00
Casey
b9f0c0ef92 Late Night Stuff 2022-04-17 09:21:02 +00:00
Casey
061b177978 Mini Aurora Port 2022-04-04 18:07:58 -04:00
Nadyr
a121954e24 Merge pull request #3992 from CHOMPStation2/upstream-merge-12592 
[MIRROR] The Grand /TG Port - Part 6
 2022-04-04 17:52:53 -04:00
Casey
de0be34c99 The Grand /TG Port - Part 6 2022-04-03 03:32:03 +00:00
Casey
60b1eeff99 Merge pull request #12579 from GhostActual/tg-port-5 
The Grand /TG Port - Part 5
 2022-04-03 03:30:56 +00:00
Razgriz
841fde6240 Merge pull request #3818 from CHOMPStation2/upstream-merge-12406 
[MIRROR] Adds holster variety to Secdrobe
 2022-03-11 15:54:51 -07:00
Razgriz
b01d409de6 Merge pull request #3828 from CHOMPStation2/master 
Merge master into 12392
 2022-03-11 15:21:48 -07:00
Casey
5d7d96ef12 Merge pull request #12406 from BonniePandora/Secdrobe-minor-QoL 
Adds holster variety to Secdrobe
 2022-03-09 17:20:48 +00:00
Casey
5510dbf441 Merge pull request #12392 from Heroman3003/cookiefix 
Brings REAL cookies to everywhere they belong
 2022-03-07 09:06:24 +00:00
Casey
7be78d396e Merge pull request #12375 from GhostActual/vaporwave-dreams 
Vaporwave Dreams
 2022-03-07 03:06:16 +00:00
Razgriz
40ab4d17f2 Merge pull request #3747 from CHOMPStation2/upstream-merge-12319 
[MIRROR] Trader!
 2022-03-01 01:20:01 -07:00
Razgriz
5611f22f73 Merge pull request #3759 from CHOMPStation2/upstream-merge-12345 
[MIRROR] Adds hats to fishing vendors
 2022-03-01 01:08:30 -07:00
Razgriz
c57ef19032 Merge branch 'master' into upstream-merge-12319 2022-03-01 00:53:31 -07:00