Commit Graph

19 Commits

Author SHA1 Message Date
CuteMoff
dd295d20c2 Merge branch 'master' into Plasmaispogtake2 2021-03-25 10:44:12 -04:00
CuteMoff
7265724c5b Update basemats.dm 2021-03-25 10:29:56 -04:00
CuteMoff
ee4fad7966 Update basemats.dm 2021-03-23 20:34:17 -04:00
Letter N
2542fe05e9 mapmerge update + mats properly work 2021-03-05 15:38:35 +08:00
Letter N
cb346a3847 a 2021-03-05 14:29:36 +08:00
The0bserver
4dacbbb0a9 deeper brass color™ (and damage) 2020-09-05 20:34:49 -04:00
The0bserver
cddd46fce3 Maybe this will work. Maybe it won't. 2020-09-05 18:52:20 -04:00
lolman360
bda2c740ba Merge branch 'master' into AnPrimAssistants 2020-08-21 11:08:13 +10:00
lolman360
bb86003510 w e w 2020-08-18 10:04:52 +10:00
lolman360
de2d80696e dix 2020-08-16 22:04:28 +10:00
silicons
815ddd1866 oh boy 2020-08-05 21:34:26 -07:00
Ghommie
c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
Ghom
85186a9714 Porting updates related to material datums. (#12317)
* Porting updates related to material datums.

* art_type

* oh oh
2020-05-25 14:21:00 -07:00
Ghom
e7f455e7af makes the uranium mat three times less radioactive 2020-05-02 00:42:21 +02:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
ForrestWick
0a54f8a7a0 I'M SORRY MR GITHUB PLS DONT BEAT ME 2020-04-09 17:27:18 -05:00
Ghommie
0876a1eef6 Porting datum components system updates. 2020-03-12 18:22:26 +01:00
Ghommie
f2c8a7cd6f Porting a couple material datums code updates and fixes. 2020-03-04 15:59:46 +01:00
Ghommie
55fa48737e Forgot about not versioned files. 2020-02-02 01:28:16 +01:00