LetterJay a5a8f8faba Merge pull request #2691 from Citadel-Station-13/upstream-merge-30530 ...

[MIRROR] Adds Gondoland and the rare Gondolas

2017-09-12 01:21:09 -05:00

..

circuitboards

quadruple wew

2017-08-29 10:02:18 -07:00

devices

Merge pull request #2566 from Citadel-Station-13/upstream-merge-30117

2017-09-11 22:41:24 -05:00

grenades

Merge branch 'master' into upstream-merge-30079

2017-09-06 09:24:23 -05:00

implants

Update implantchair.dm

2017-09-11 17:47:55 -05:00

melee

double wew

2017-08-29 09:53:11 -07:00

robot

Merge pull request #2436 from Citadel-Station-13/upstream-merge-30004

2017-09-06 09:15:11 -05:00

stacks

Adds Gondoland and the rare Gondolas (#30530)

2017-09-10 17:10:45 -05:00

storage

Merge branch 'master' into upstream-merge-30079

2017-09-06 09:24:23 -05: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

double wew

2017-08-29 09:53:11 -07:00

cigs_lighters.dm

quadruple wew

2017-08-29 10:02:18 -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

double wew

2017-08-29 09:53:11 -07:00

handcuffs.dm

goddamnit_again (#2511)

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

his_grace.dm

double wew

2017-08-29 09:53:11 -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

Merge branch 'master' into upstream-merge-30079

2017-09-06 09:24:23 -05: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

double wew

2017-08-29 09:53:11 -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

pinpointer.dm

Crew monitoring rework part 1: crew pinpointers

2017-08-30 17:03:20 -05: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

Adds departmental banners

2017-09-11 13:37:58 -05: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

quadruple wew

2017-08-29 10:02:18 -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

this sure was FUN

2017-09-07 09:47:56 -05: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

all of my HATE

2017-09-10 15:20:58 -05:00

toys.dm

double wew

2017-08-29 09:53:11 -07:00

trash.dm

here we go again (#2456)

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

twohanded.dm

chainsaws rebalance, but working this time :)

2017-09-08 10:00:47 -05: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

fuck

2017-09-11 14:37:55 -05:00