Qustinnus 2312ff09be Fixing conflicts

2017-07-19 11:19:52 +02:00

..

effects

Fixing conflicts

2017-07-19 11:19:52 +02:00

items

Fixing conflicts

2017-07-19 11:19:52 +02:00

structures

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

buckling.dm

Merge pull request #28434 from Cyberboss/BuckleFix

2017-06-14 21:57:35 -04:00

empulse.dm

Replaces ex_act and emp_act numbers with defines (#29215)

2017-07-13 08:56:26 -03:00

items.dm

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

obj_defense.dm

Replaces ex_act and emp_act numbers with defines (#29215)

2017-07-13 08:56:26 -03:00

objs.dm

Refactors flightsuit code to hopefully be less dumb (#28033)

2017-07-11 11:23:02 +12:00

radiation.dm

fixes swarmers dying to rad

2017-06-21 00:01:40 -04:00

structures.dm

Changes some 1s and 0s to TRUE and FALSE (#29144)

2017-07-10 10:31:34 -04:00

weapons.dm

…