Commit Graph

17 Commits

Author SHA1 Message Date
quotefox
19810f7e98 Merge pull request #59 from Azarak/master
It's me trying to fix a conflict and I've never done this don't mind me
2019-11-08 20:48:47 +00:00
Azarak
1544eafb4f TG GENETICS AAAAAAAA
aaaaaaaa
2019-11-04 23:20:16 +01:00
quotefox
bbfb448536 Merge pull request #43 from shellspeed1/tricord-balance
makes od deal 1/4th of damage
2019-10-25 17:08:27 +01:00
shellspeed1
48f06aa113 makes od deal 1/4th of damage 2019-10-23 11:16:07 -07:00
shellspeed1
5d1ed71dc2 Code work to port carpets from citadel 2019-10-19 12:02:31 -07:00
shellspeed1
0e0f5e642f Ooof 2019-10-18 13:24:24 -07:00
shellspeed1
22e7d9dee8 fixes 2019-10-15 17:10:52 -07:00
shellspeed1
984417ea63 oh god oh fuck oh god 2019-10-15 13:42:18 -07:00
shellspeed1
6a0cb72b6a error fixing 2019-10-15 11:59:46 -07:00
shellspeed1
470ec5d62b whew 2019-10-14 18:46:06 -07:00
quotefox
713fdeeade Merge pull request #33 from Azarak/master
Fixes for Stimulum and Nitryl
2019-10-14 16:49:49 +01:00
quotefox
bd718654c3 update dump! 2019-10-14 16:48:21 +01:00
Azarak
0c4a3753bd Fixes for Stimulum and Nitryl 2019-10-14 13:54:11 +02:00
shellspeed1
dad1e738c7 Add files via upload 2019-09-23 19:30:11 -07:00
shellspeed1
37a0d1fb19 Delete chem_pack.dm 2019-09-23 19:29:47 -07:00
shellspeed1
8425cb1361 Add files via upload 2019-09-23 18:07:40 -07:00
Quotefox
7091cdbe8c Uploading all files. 2019-09-23 18:26:34 +02:00