cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-29 03:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,287 Commits 6 Branches 0 Tags
b061a207ffcb338d7098e88db758ca6bec42a4cf
Commit Graph

2468 Commits

Author SHA1 Message Date
Chompstation Bot
b974746755 Add a lot of clothes/armor/suits/spacesuits/rigs 2021-07-14 22:44:11 -04:00
Nadyr
19b0e94af7 Merge pull request #2510 from CHOMPStationBot/upstream-merge-11025 
[MIRROR] Fix crafting menu, add plant fiber crafting things
 2021-07-13 22:59:04 -04: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
Aronai Sieyes
8faa3a57ce Merge pull request #11050 from VOREStation/Arokha/rsf 
Add RSF to autolathes
 2021-07-12 23:47:42 +00:00
Chompstation Bot
50dd8ad121 Fix crafting menu, add plant fiber crafting things 2021-07-11 19:16:38 +00:00
Aronai Sieyes
d989caaf41 Merge pull request #11021 from VOREStation/Arokha/nifcraftmenus 
Make nif/crafting menu buttons not be hidden
 2021-07-11 19:14:17 +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
f27ac30e5a Merge pull request #2478 from CHOMPStationBot/upstream-merge-10979 
[MIRROR] Port current SSgarbage from /tg/
 2021-07-10 01:37:07 -04:00
Nadyr
2cad763c26 Merge pull request #2447 from CHOMPStationBot/upstream-merge-10852 
[MIRROR] Use material defines more
 2021-07-09 23:22:03 -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
Chompstation Bot
8b3a896d98 Port current SSgarbage from /tg/ 2021-07-09 16:13:02 +00:00
Chompstation Bot
28c2ee46d3 Adds a weretiger. 2021-07-07 21:08:45 +00:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Chompstation Bot
70167dde60 Add painting tools for more ART 2021-07-05 16:40:36 +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
e15e92c2c5 Merge pull request #2329 from CHOMPStation2/Razgriz1032-patch-7 
Give medical doctors on spawn an advanced medkit instead of regular
 2021-07-03 20:45:08 -04:00
Chompstation Bot
e0ff2b4ffe Port various backpacks 2021-07-04 00:38:04 +00:00
Razgriz
385a6b8546 Port a fix from #2316 2021-07-03 00:38:05 -07:00
Razgriz
e3a9cd3775 Merge branch 'master' into upstream-merge-10764 2021-07-03 00:26:13 -07:00
Razgriz
ffe017bf01 Give medical doctors on spawn an advanced medkit instead of regular 2021-07-03 00:19:51 -07:00
Nadyr
e18d99d3e1 Merge pull request #2311 from CHOMPStationBot/upstream-merge-10752 
[MIRROR] The One Where You Can Aim Lights
 2021-07-01 21:30:46 -04:00
Chompstation Bot
bf04ca9003 Port /tg/ vis_contents openspace 2021-06-30 19:49:25 +00:00
Chompstation Bot
15fd9df408 The One Where You Can Aim Lights 2021-06-30 19:29:41 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Razgriz
f692192d2c Merge pull request #2276 from CHOMPStationBot/upstream-merge-10727 
[MIRROR] Medicine Tweaks
 2021-06-26 13:24:46 -07:00
Chompstation Bot
5cbb0e48e0 Medicine Tweaks 2021-06-23 16:35:01 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Chompstation Bot
087c7b63be [MIRROR] Refactors posters to use decls 2021-06-21 02:22:59 +00:00
Nadyr
030baa7ac8 powder that makes you say yes 2021-06-20 20:47:59 -04:00
Razgriz
b287747d4e Merge branch 'master' into upstream-merge-10683 2021-06-20 17:17:44 -07:00
Nadyr
937fafb5f5 Merge pull request #2245 from CHOMPStationBot/upstream-merge-10708 
[MIRROR] Phaser handbow crate name change
 2021-06-19 22:24:31 -04:00
Nadyr
c510fb5432 Merge pull request #2240 from CHOMPStationBot/upstream-merge-10686 
[MIRROR] [MIRROR] Removes Global Iterators
 2021-06-19 22:23:45 -04:00
Nadyr
a02607fe5a Merge branch 'master' into upstream-merge-10708 2021-06-19 22:03:34 -04:00
Nadyr
f0c2544f17 Merge pull request #2231 from CHOMPStationBot/upstream-merge-10652 
[MIRROR] Porting Over De-Husking Surgery
 2021-06-19 21:58:37 -04:00
Nadyr
e6034c46b1 Merge pull request #2224 from CHOMPStationBot/upstream-merge-10677 
[MIRROR] Fix compiler warning from unused var.
 2021-06-19 21:45:33 -04:00
Nadyr
0d1fcfd35e powder that makes you say yes 2021-06-19 21:35:29 -04:00
Nadyr
678de50987 Merge pull request #2211 from CHOMPStationBot/upstream-merge-10657 
[MIRROR] adds the phaser handbow
 2021-06-19 21:20:22 -04:00
Chompstation Bot
d582dd49aa Phaser handbow crate name change 2021-06-20 00:46:12 +00:00
Chompstation Bot
42cdb33edb [MIRROR] Removes Global Iterators 2021-06-19 13:43:53 +00:00
Razgriz
ffd82c6d5e Merge branch 'master' into upstream-merge-10683 2021-06-18 19:31:31 -07:00
Razgriz
540d32375d Merge pull request #2220 from CHOMPStationBot/upstream-merge-10662 
[MIRROR] Port current /tg/ lighting system
 2021-06-18 18:43:24 -07:00
Chompstation Bot
4b89d37b6d Porting Over De-Husking Surgery 2021-06-18 21:07:55 +00:00
Chompstation Bot
b69e24086a 6 fixes 2021-06-18 18:02:23 +00:00
Aronai Sieyes
0a6997151e Merge pull request #10677 from VOREStation/vplk-warning-fix 
Fix compiler warning from unused var.
 2021-06-18 15:54:42 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Novacat
55fffc549a Merge pull request #10669 from VOREStation/vplk-some-vv-bitfields 
Configure some VV bitfields and fix editor
 2021-06-18 04:17:48 +00:00
Novacat
fafe1bc65c Merge pull request #10657 from TheDavestDave/phaser-handbow 
adds the phaser handbow
 2021-06-17 19:50:01 +00:00
Novacat
21dc916a5b Merge pull request #10644 from VOREStation/upstream-merge-8129 
[MIRROR] leg holsters in cargo crate
 2021-06-14 11:55:39 +00:00
Chompstation Bot
a94e471add Material Container Component & Autolathe QoL 2021-06-13 03:18:30 +00:00
Chompstation Bot
c753eb778a Explorer storage items 2021-06-07 19:37:53 -04:00