Cadyn 07775449d7 Fixing conflicts

2020-10-05 18:10:53 -07:00

..

ashtray.dm

Persistent Trash/Dirt/Graffiti/Notices

2020-07-24 05:24:56 -04:00

bats.dm

…

chainsaw.dm

Chainsaws - replaced New with Initialize so chainsaws can be mapped in

2020-08-05 20:15:04 -04:00

foam.dm

…

gravemarker.dm

Rewrite examine() to pass a list around

2020-04-29 16:42:50 -04:00

kitchen.dm

Rebase onto Master for Volume Control Panel, Squash Commits

2020-08-27 19:47:38 -04:00

knives_vr.dm

…

knives.dm

Rebase onto Master for Volume Control Panel, Squash Commits

2020-08-27 19:47:38 -04:00

material_armor.dm

Convert /material to /datum/material

2020-09-27 16:16:44 -07:00

material_weapons.dm

Fixing conflicts

2020-10-05 18:10:53 -07:00

misc.dm

Rebase onto Master for Volume Control Panel, Squash Commits

2020-08-27 19:47:38 -04:00

shards_vr.dm

Refactors Ore Eating to Allow the Consumption of Material Sheets

2020-05-22 03:55:04 -04:00

shards.dm

Alter playsound paradigm

2020-05-18 23:42:15 -04:00

sledgehammer_construction_ch.dm

Add a craftable, two-handed sledgehammer.

2020-01-21 13:48:28 +01:00

swords.dm

Rebase onto Master for Volume Control Panel, Squash Commits

2020-08-27 19:47:38 -04:00

thrown.dm

…

twohanded_ch.dm

Add a craftable, two-handed sledgehammer.

2020-01-21 13:48:28 +01:00

twohanded.dm

Rebase onto Master for Volume Control Panel, Squash Commits

2020-08-27 19:47:38 -04:00

whetstone.dm

Rewrite examine() to pass a list around

2020-04-29 16:42:50 -04:00