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
63,446 Commits 6 Branches 0 Tags
31b47bc0d1fa6a6f16a2fdedef004d1d38d0effb
Commit Graph

315 Commits

Author SHA1 Message Date
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
Razgriz
5d1977b324 Merge pull request #817 from CHOMPStationBot/upstream-merge-9287 
[MIRROR] [MIRROR] Fresh Meat, Leatherworking
 2020-11-08 23:41:34 -07:00
Razgriz
1cb9bbbf45 Update materials.dm 2020-11-08 17:14:47 -07:00
Chompstation Bot
018d176c51 [MIRROR] Fresh Meat, Leatherworking 2020-11-08 17:04:32 +00:00
Razgriz
54755b9e2b Port Feeder from Old Chomp 
FEEEEEEED.
 2020-11-04 01:31:11 -07:00
Cadyn
1d0e69633f Fix silly stuff 2020-10-05 19:46:50 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
ShadowLarkens
3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07:00
Novacat
e8f7b01ea4 Merge branch 'master' into kk-adminships 2020-09-27 17:02:08 -04:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Cerebulon
95ff8c2080 Tweaks to pickup/equip sounds. 2020-09-20 06:57:07 -04:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Killian
eb8ecaddb2 hull/glass replacement, further polish, other misc tweaks 
also adds plastitanium hull components for later use
 2020-09-08 06:34:44 +01:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
Cyantime
d8dcc61ea5 Makes unbreakable walls unacidable (#7532) 2020-08-22 04:11:17 -04:00
Mechoid
496322f4f1 Reagent Hoses 2020-08-20 21:24:06 -04:00