cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-05-12 18:10:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
67,944 Commits 7 Branches 0 Tags
22d7e1b856f650ca7053475351b69bb63149914d
Commit Graph

907 Commits

Author SHA1 Message Date
Nadyr 97e80df2a7 Merge branch 'master' into upstream-merge-12029 2022-01-09 20:18:25 -05:00
Casey 61a2292fc2 Merge pull request #12013 from Hatterhat/patch-5 
inducer on holding belt
 2022-01-09 01:52:31 +00:00
Casey a84c109a45 more stuff fits on toolbelts of holding take 2 because i fucked up somewhere 2022-01-09 01:51:08 +00:00
Nadyr b796814d3c Merge pull request #3473 from CHOMPStation2/upstream-merge-11878 
[MIRROR] Fix for issue #5643
 2021-12-12 06:05:03 -05:00
CHOMPStation2 e79f88adfe powder that makes you say yes 2021-12-09 23:40:10 -07:00
Casey b897e76c07 Fix for issue #5643 2021-12-10 06:13:28 +00:00
Casey e773ca01c9 Merge pull request #11832 from Hatterhat/pad-booster 
mechaport gaming
 2021-12-10 02:51:14 +00:00
Nadyr 2b394a1bf0 Merge pull request #3141 from CHOMPStationBot/upstream-merge-11705 
[MIRROR] Brainfood
 2021-10-27 20:17:28 -04:00
Nadyr 3928831eac Merge pull request #3133 from CHOMPStationBot/upstream-merge-11679 
[MIRROR] Restricts candle boxes to only hold candles
 2021-10-27 19:23:21 -04:00
Nadyr 033a33f739 powder that makes you say yes 2021-10-27 19:07:24 -04:00
Chompstation Bot 4a5b2182c1 Brainfood 2021-10-27 16:07:14 +00:00
Chompstation Bot 0fc8ba9656 Tool Time (Fixed) 2021-10-27 16:02:47 +00:00
Chompstation Bot 21ad9c1e79 Restricts candle boxes to only hold candles 2021-10-27 15:41:48 +00:00
Aronai Sieyes 33deecbad3 Merge pull request #11589 from VOREStation/upstream-merge-8293 
[MIRROR] Adds multitools to roboticist/engi toolbelts
 2021-10-25 00:05:02 +00:00
Verkister 0dcff8498b Earlyports all my current upstream open PRs 
hngh it's been months
 2021-10-22 17:11:58 +03:00
Chompstation Bot ad57dfbb92 Adds more clothing from Polaris and various sources 2021-09-27 18:31:54 +00:00
Nadyr f90573b3d2 Merge pull request #3014 from CHOMPStationBot/upstream-merge-11566 
[MIRROR] Adds randpixel to vore eggs.
 2021-09-24 17:06:04 -04:00
Nadyr 1df7f47c3b Merge pull request #3013 from CHOMPStationBot/upstream-merge-11562 
[MIRROR] Medical and utility belts of holding
 2021-09-24 17:05:40 -04:00
Casey 23bcc0e69c Merge pull request #11566 from Verkister/patch-82 
Adds randpixel to vore eggs.
 2021-09-24 03:48:56 +00:00
Casey 38f2a0b96a Merge pull request #11562 from PastelPrinceDan/belts 
Medical and utility belts of holding
 2021-09-24 03:47:47 +00:00
Casey ae13ff1ed2 Merge pull request #11524 from GhostActual/boxed 
Boxing Day
 2021-09-24 03:21:13 +00:00
Chompstation Bot af0d7a0f6b Make stack amount var private 2021-08-26 15:39:04 +00:00
Aronai Sieyes e19a87e44a Upstream-11408 2021-08-24 21:09:43 -07:00
Nadyr 119b23b280 Merge pull request #2855 from CHOMPStationBot/upstream-merge-11442 
[MIRROR] Fulpstation Briefcases
 2021-08-24 22:57:13 -04:00
Aronai Sieyes c37ae601b6 Merge pull request #11442 from GhostActual/baggage 
Fulpstation Briefcases
 2021-08-25 00:00:00 +00:00
Chompstation Bot d189c9a12f Crusher Gaming 2021-08-24 23:58:27 +00:00
Nadyr d189d28954 Merge pull request #2596 from CHOMPStationBot/upstream-merge-11153 
[MIRROR] Fixes #11151
 2021-07-19 19:56:57 -04:00
Aronai Sieyes bd74045604 Merge pull request #11153 from VOREStation/Fixes/11151attempt2 
Fixes #11151
 2021-07-19 22:22:45 +00:00
Chompstation Bot dc1328d93c Fixes Talon being referred to as if ITV is a company 2021-07-19 15:12:30 +00:00
Chompstation Bot 481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Chompstation Bot 3d2783aec7 Ports new Bay SolGov suits as Commonwealth suits 2021-07-15 19:29:34 -04:00
Aronai Sieyes 6f7f3b8460 Merge pull request #11093 from VOREStation/Arokha/emptynear 
Allow emptying contents from nearby bags
 2021-07-15 19:04:20 +00:00
Nadyr acc7d80190 Merge pull request #2527 from CHOMPStationBot/upstream-merge-11042 
[MIRROR] Storage alt-click support
 2021-07-13 22:53:47 -04:00
Aronai Sieyes 54af7b4f8a Merge pull request #11042 from VOREStation/Arokha/altstorage 
Storage alt-click support
 2021-07-12 23:46:27 +00:00
Chompstation Bot 16a731dd39 Move like every clothing icon file 2021-07-10 16:23:23 +00:00
Nadyr b90a37b854 Merge pull request #2490 from CHOMPStationBot/upstream-merge-10995 
[MIRROR] Properly Adds Bio-Regenerator to Surgery Bag
 2021-07-10 01:47:51 -04:00
Novacat 29b5b3bf05 Merge pull request #10995 from Enzo-Leon/medical_tools 
Properly Adds Bio-Regenerator to Surgery Bag
 2021-07-09 18:24:29 +00:00
Aronai Sieyes f835374f26 Merge pull request #10980 from MarinaGryphon/issue/8289 
Expands do_after/do_mob exclusive var to affect target
 2021-07-09 16:14:12 +00:00
Chompstation Bot b99adcaca4 Add pouches! 2021-07-06 01:00:11 +00:00
Chompstation Bot 14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Nadyr c21ee657fe Merge pull request #2385 from CHOMPStationBot/upstream-merge-10794 
[MIRROR] Port various backpacks
 2021-07-03 21:40:25 -04:00
Nadyr 6660a70e82 Merge pull request #2387 from CHOMPStationBot/upstream-merge-10782 
[MIRROR] Port Eris Trashbag of Holding
 2021-07-03 21:17:31 -04:00
Aronai Sieyes ce2cbc8ae2 Merge pull request #10782 from VOREStation/Arokha/trashholding 
Port Eris Trashbag of Holding
 2021-07-04 00:38:17 +00:00
Chompstation Bot e0ff2b4ffe Port various backpacks 2021-07-04 00:38:04 +00:00
Razgriz 1a3c753f4a Merge pull request #2346 from CHOMPStationBot/upstream-merge-10802 
[MIRROR] Port several foods and food sprites
 2021-07-03 14:49:34 -07:00
Razgriz 2441163c4c Merge pull request #2344 from CHOMPStationBot/upstream-merge-10792 
[MIRROR] Eris portable freezer, medical briefcase
 2021-07-03 14:27:19 -07:00
Aronai Sieyes 64db1a458b Merge pull request #10802 from VOREStation/Icons/food 
Port several foods and food sprites
 2021-07-03 20:31:07 +00:00
Aronai Sieyes 30a01c6490 Merge pull request #10792 from VOREStation/Arokha/portamed 
Eris portable freezer, medical briefcase
 2021-07-03 20:26:49 +00:00
Chompstation Bot 42cbf0e1e5 Port Eris mining satchel sprites, satchel of holding 2021-07-03 20:17:02 +00:00
Razgriz 1b9d60be6c Update storage.dm 2021-07-03 00:27:01 -07:00