CitadelStationBot b09aa9d082 [MIRROR] Fixes stacking when crafting items (#2814) ...

* Merge pull request #30746 from YPOQ/stackfix

Fixes stacking when crafting items

* Fixes stacking when crafting items

2017-09-17 12:03:31 -05:00

..

circuitboards

[MIRROR] Fix monastery shuttle + Pods (#2599)

2017-09-13 17:58:25 -05:00

devices

[MIRROR] PDA game log entry contains ckey (#2808)

2017-09-17 11:58:11 -05:00

grenades

Merge branch 'master' into upstream-merge-30056

2017-09-13 06:08:59 -05:00

implants

Merge branch 'master' into upstream-merge-30056

2017-09-13 06:08:59 -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

[MIRROR] Fixes stacking when crafting items (#2814)

2017-09-17 12:03:31 -05:00

storage

Adds missing span-endings

2017-09-11 07:10:09 -05:00

tanks

[MIRROR] Tank gauge rounding fix (#2800)

2017-09-17 11:58:50 -05:00

AI_modules.dm

Update AI_modules.dm

2017-09-12 03:08:53 -05: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

…

bodybag.dm

…

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

[MIRROR] Adds href token to station name rejection (#2798)

2017-09-17 12:00:39 -05:00

chrono_eraser.dm

double wew

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

cigs_lighters.dm

Merge pull request #2698 from Citadel-Station-13/upstream-merge-30583

2017-09-12 23:31:28 -05:00

clown_items.dm

Adds missing span-endings

2017-09-11 07:10:09 -05: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

commit

2017-09-13 06:04:22 -05:00

defib.dm

Adds missing span-endings

2017-09-11 07:10:09 -05:00

dehy_carp.dm

…

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

Update dna_injector.dm

2017-09-12 03:09:19 -05:00

documents.dm

…

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

[MIRROR] Clarifies the egyptian staff desc (#2811)

2017-09-17 12:03:12 -05:00

inducer.dm

[MIRROR] Standardized power displays (#2539)

2017-09-13 17:57:16 -05: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

Adds missing span-endings

2017-09-11 07:10:09 -05: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

…

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

Update tools.dm

2017-09-12 03:36:41 -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

[MIRROR] Chainsaws now have a suicide! (#2734)

2017-09-13 22:53:55 -05:00

vending_items.dm

Update vending_items.dm

2017-09-11 17:50:49 -05:00

weaponry.dm

fuck

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