kevinz000 9cb65df70d Merge pull request #2426

2017-08-29 22:27:21 -07:00

..

circuitboards

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

devices

Maintains that weird entire-tcomms-setup-in-one-machine thing

2017-08-26 11:08:01 -05:00

grenades

sync

2017-08-29 22:05:16 -07:00

implants

Adds logging cause of microbomb activation in admin logs

2017-08-28 02:19:59 -05:00

melee

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

robot

clean up

2017-08-28 10:34:31 -05:00

stacks

clean up

2017-08-28 10:34:31 -05:00

storage

Merge pull request #2426

2017-08-29 22:27:21 -07:00

tanks

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

AI_modules.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

airlock_painter.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

apc_frame.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

blueprints.dm

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

body_egg.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

bodybag.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

candle.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

cardboard_cutouts.dm

ok this is going to be a pain in the ass ain't it (#2458)

2017-08-22 05:01:38 -07:00

cards_ids.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

charter.dm

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

chrono_eraser.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

cigs_lighters.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

clown_items.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

clown.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

control_wand.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

cosmetics.dm

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

courtroom.dm

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

crayons.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

defib.dm

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

dehy_carp.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

dice.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

dna_injector.dm

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

documents.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

eightball.dm

ok this is going to be a pain in the ass ain't it (#2458)

2017-08-22 05:01:38 -07:00

extinguisher.dm

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

flamethrower.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

gift.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

handcuffs.dm

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

his_grace.dm

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

holosign_creator.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

holy_weapons.dm

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

inducer.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

kitchen.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

latexballoon.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

manuals.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

miscellaneous.dm

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

mop.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

paint.dm

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

paiwire.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

pneumaticCannon.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

powerfist.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

RCD.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

RCL.dm

Merge branch 'master' into upstream-merge-29964

2017-08-29 21:07:01 -07:00

religion.dm

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

RPD.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

RSF.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

scrolls.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

sharpener.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

shields.dm

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

shooting_range.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

signs.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

singularityhammer.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

stunbaton.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

taster.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

teleportation.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

teleprod.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

theft_tools.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

tools.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

toys.dm

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

trash.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

twohanded.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

vending_items.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

weaponry.dm

Merge pull request #2496 from Citadel-Station-13/upstream-merge-30173

2017-08-28 08:46:53 -05:00