cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-13 10:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,137 Commits 8 Branches 0 Tags
bdf7cff2232ebd1300ec8d898aaa763f8faf3bcb
Commit Graph

3737 Commits

Author SHA1 Message Date
Chompstation Bot
beef8e7f82 Virology Revamp 2021-08-13 15:38:46 +00:00
Chompstation Bot
6df9089784 Adds medical kiosk to code/buildable 2021-07-25 22:02:18 +00:00
Chompstation Bot
8818729b17 Add recycling machinery 2021-07-24 17:04:28 +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
Novacat
b456b5287b Merge pull request #11121 from KillianKirilenko/kk-fixes2 
Fix Agent IDs
 2021-07-17 14:24:27 +00:00
Nadyr
f201b53fe4 powder that makes you say yes 2021-07-16 18:15:52 -04: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
28b4a57852 Merge pull request #2529 from CHOMPStationBot/upstream-merge-11050 
[MIRROR] Add RSF to autolathes
 2021-07-13 22:55:11 -04: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
Nadyr
a803e5175f Merge pull request #2493 from CHOMPStationBot/upstream-merge-11002 
[MIRROR] Move like every clothing icon file
 2021-07-13 22:21:08 -04:00
Nadyr
31823707a7 powder that makes you say yes 2021-07-12 23:31:31 -04:00
Aronai Sieyes
8faa3a57ce Merge pull request #11050 from VOREStation/Arokha/rsf 
Add RSF to autolathes
 2021-07-12 23:47:42 +00:00
Aronai Sieyes
54af7b4f8a Merge pull request #11042 from VOREStation/Arokha/altstorage 
Storage alt-click support
 2021-07-12 23:46:27 +00:00
Aronai Sieyes
27545a7859 Merge pull request #11010 from VOREStation/Arokha/qpadlink 
Fix some bugs
 2021-07-10 20:12:23 +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
Nadyr
48c609ddca Merge pull request #2487 from CHOMPStationBot/upstream-merge-10988 
[MIRROR] Fixes #10885
 2021-07-10 01:38:31 -04:00
Nadyr
c229da42a6 Merge pull request #2486 from CHOMPStationBot/upstream-merge-10989 
[MIRROR] Fixes pocky having no sprite.
 2021-07-10 01:36:36 -04:00
Nadyr
49866902a7 Merge pull request #2479 from CHOMPStationBot/upstream-merge-10980 
[MIRROR] Expands do_after/do_mob exclusive var to affect target
 2021-07-10 01:30:52 -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
c495e183a8 Merge pull request #10988 from MarinaGryphon/issue/10885 
Fixes #10885
 2021-07-09 16:18:08 +00:00
Aronai Sieyes
e4692d0b94 Merge pull request #10989 from MarinaGryphon/issue/pocky 
Fixes pocky having no sprite.
 2021-07-09 16:18:00 +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
287a5deee3 Use material defines more 2021-07-07 19:02:05 +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
24fd91203f Merge pull request #2388 from CHOMPStationBot/upstream-merge-10780 
[MIRROR] Port Eris grenade sprites
 2021-07-03 21:18:06 -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
Nadyr
55b85e0ccf Merge pull request #2386 from CHOMPStationBot/upstream-merge-10789 
[MIRROR] Port Bay microwave, utensil/kitchen knife sprites
 2021-07-03 21:16:45 -04:00
Aronai Sieyes
972bcbda4b Merge pull request #10780 from VOREStation/Arokha/erisgrenades 
Port Eris grenade sprites
 2021-07-04 00:38:22 +00: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
Aronai Sieyes
5e675845de Merge pull request #10789 from VOREStation/Arokha/eriskitchen 
Port Bay microwave, utensil/kitchen knife sprites
 2021-07-04 00:38:10 +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
Razgriz
fe89786213 Merge pull request #2338 from CHOMPStationBot/upstream-merge-10791 
[MIRROR] Port Eris mining satchel sprites, satchel of holding
 2021-07-03 14:09:30 -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
Aronai Sieyes
bb53b874df Merge pull request #10781 from VOREStation/Arokha/erisitems 
Port Eris random items
 2021-07-03 20:14:30 +00:00
Razgriz
1b9d60be6c Update storage.dm 2021-07-03 00:27:01 -07:00
Nadyr
18395abbe7 Merge pull request #2314 from CHOMPStationBot/upstream-merge-10769 
[MIRROR] Allows removing items from storage easier
 2021-07-01 21:31:51 -04:00
Nadyr
8171e7736b Merge pull request #2303 from CHOMPStationBot/upstream-merge-10775 
[MIRROR] [MIRROR] Halves Item Slowdown Effects
 2021-07-01 21:30:30 -04:00
Aronai Sieyes
04c88a9ec1 Merge pull request #10769 from VOREStation/Arokha/storageclick 
Allows removing items from storage easier
 2021-06-30 19:37:06 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00