cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,269 Commits 10 Branches 0 Tags
e4d8e5263e98d6c5655d292355f17be3e986e45d
Commit Graph

331 Commits

Author SHA1 Message Date
Aronai Sieyes
72f5e790db Upstream-11421 2021-08-24 21:10:20 -07:00
Chompstation Bot
1372d838e1 Port Bay and Eris walls 2021-07-22 20:29:32 +00:00
Chompstation Bot
d0d23ed393 Fixes a bunch of bools missed in #11100 2021-07-16 21:12:20 +00:00
Nadyr
ab141bf081 powder that makes you say yes 2021-07-13 22:47:26 -04:00
Chompstation Bot
50dd8ad121 Fix crafting menu, add plant fiber crafting things 2021-07-11 19:16:38 +00:00
Nadyr
60fa095962 Merge pull request #2488 from CHOMPStationBot/upstream-merge-10993 
[MIRROR] Stack Examine Improvements, Log Examine Fix
 2021-07-10 01:47:29 -04:00
Aronai Sieyes
205ef740bd Merge pull request #10993 from MarinaGryphon/issue/logpile 
Stack Examine Improvements, Log Examine Fix
 2021-07-09 16:19:16 +00:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Aronai Sieyes
68bf885c8e Merge pull request #10921 from VOREStation/Arokha/fixglass 
Fix glass sheets construction menu
 2021-07-05 23:58:05 +00:00
Chompstation Bot
14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Chompstation Bot
275458f14a Port in-game painting from /tg/ 2021-07-03 22:31:15 -04:00
Chompstation Bot
ea9582b5b1 Further Map Changes 2021-07-03 21:15:08 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Chompstation Bot
a94e471add Material Container Component & Autolathe QoL 2021-06-13 03:18:30 +00:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Nadyr
11e49d2f00 Delete materials_ch.dm 2021-04-30 01:51:29 -04:00
Nadyr
3dee3182c4 Create cloth_ch.dm 2021-04-30 01:50:21 -04:00
Nadyr
ee4c7b23f6 Delete material_recipes_ch.dm 2021-04-30 01:46:47 -04:00
Nadyr
47eb696051 Create plasteel_ch.dm 2021-04-30 01:46:31 -04:00
Nadyr
af8eddf8e5 Create wood_ch.dm 2021-04-30 01:45:27 -04:00
Nadyr
6e6860f5e2 Update plastic.dm 2021-04-30 01:44:47 -04:00
Nadyr
5455cf8cb6 Create plastic_ch.dm 2021-04-30 01:44:26 -04:00
Nadyr
88e8a4ce45 Delete wood_ch.dm 2021-04-30 01:42:20 -04:00
Nadyr
6168af405c Delete plastic_ch.dm 2021-04-30 01:42:05 -04:00
Nadyr
74d12b9d39 Create wood_ch.dm 2021-04-30 01:40:31 -04:00
Nadyr
78b2101c9e Create plastic_ch.dm 2021-04-30 01:39:54 -04:00
Nadyr
5283c62b41 Delete material_recipes.dm 2021-04-30 01:36:02 -04:00
Nadyr
c471121e12 Update plastic.dm 2021-04-30 01:35:30 -04:00
Nadyr
90fbe63cc3 Delete materials.dm 2021-04-30 01:31:42 -04:00
Nadyr
e729ec2953 Update cloth.dm 2021-04-30 01:31:31 -04:00
Chompstation Bot
fd5b2f094f [MIRROR] Moves material stacks to modules/materials 2021-04-28 16:38:58 +00:00
Novacat
aa8abda597 Merge pull request #10117 from VOREStation/upstream-merge-8019 
[MIRROR] Autolathes don't spam debug on first use
 2021-04-10 12:36:45 +00:00
Chompstation Bot
413bafbb91 Some minor mapfixes 2021-04-03 02:40:33 -04:00
Nadyr
2d28682a36 Update material_recipes.dm 2021-04-02 22:53:31 -04:00
Chompstation Bot
0001021815 [MIRROR] Tanning Tweaks 2021-03-30 20:55:26 +00:00
Razgriz
6e171d3182 Merge pull request #1536 from CHOMPStationBot/upstream-merge-9396 
[MIRROR] [MIRROR] Matter Matters
 2021-03-16 22:22:28 -07:00
Razgriz
a762c07a8a Update material_recipes.dm 2021-03-10 22:17:41 -07:00
Nadyr
604b71d59b Merge pull request #1539 from CHOMPStationBot/upstream-merge-9620 
[MIRROR] [MIRROR] Industrial Expansion
 2021-03-10 01:05:16 -05:00
Chompstation Bot
b85e9fc4d9 [MIRROR] Industrial Expansion 2021-03-09 21:53:03 +00:00
Chompstation Bot
9270659dbb [MIRROR] Matter Matters 2021-03-09 20:42:39 +00:00
Chompstation Bot
598a7814e8 [MIRROR] Adds a modular armour version of the explorer suit and adds sprites to specialist armour 2021-03-09 20:17:06 +00:00
Novacat
8be1af3b62 Merge pull request #9849 from Heroman3003/striptease-yeah-baby 
Makes dance poles (de)constructible
 2021-03-04 18:57:20 +00:00
Novacat
5b4dc36b49 Merge pull request #9816 from VOREStation/upstream-merge-7929 
[MIRROR] Snow no longer goes clang and shovels are more efficient
 2021-02-28 23:29:07 +00:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Novacat
5211edc9c0 Merge pull request #9573 from VOREStation/upstream-merge-7786 
[MIRROR] Gadgets & Gizmos
 2021-01-24 06:55:05 +00:00
Sharkmare
a1864adb4e Changing mat name to carpet 
Red used to be carpet, carpet rework changed it.

IF anyone is willing to code search any non carpet carpets, be my guest and fix this mess, for now, this is a hotfix
 2021-01-09 00:46:38 +01:00
Sharkmare
d14ab6d796 Fixing Red comfy Chairs. Closes #1014 
Carpet restructure broke red comfy chairs, why was it this way in the first place, i dunno, lets rework it
 2021-01-09 00:36:31 +01:00
Novacat
7e16cd134a Merge pull request #9527 from VOREStation/upstream-merge-7780 
[MIRROR] Adds a Whip.
 2020-12-28 17:12:39 +00:00
Novacat
cd1ad32cb2 Merge pull request #9422 from VOREStation/upstream-merge-7762 
[MIRROR] Plainleather & Tobacco
 2020-12-08 03:38:26 +00:00