deathride58 6a07a66cb3 Merge branch 'master' into upstream-merge-37476

2018-05-06 07:07:02 +00:00

..

explorer_gear.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

goliath_hide.dm

…

kinetic_crusher.dm

Uppercases slot defines.

2018-04-27 20:14:39 -05:00

lazarus_injector.dm

…

marker_beacons.dm

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

mineral_scanner.dm

Merge branch 'master' into upstream-merge-37476

2018-05-06 07:07:02 +00:00

mining_tools.dm

Uppercases slot defines.

2018-04-27 20:14:39 -05:00

regenerative_core.dm

…

resonator.dm

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

survival_pod.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

vendor_items.dm

…

wormhole_jaunter.dm

Merge branch 'master' into upstream-merge-37476

2018-05-06 07:07:02 +00:00