CitadelStationBot 938f409782 [MIRROR] Christmas (#4491) ...

* Christmas (#33690)

* Christmas Event Updates

* Dont recreate the list every time

* Check for drop del

* Changes some things to placate that one guy from FTL

* Christmas

2017-12-22 13:14:25 -08:00

..

circuitboards

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

devices

Merge pull request #4445 from Citadel-Station-13/upstream-merge-33635

2017-12-21 03:47:50 +00:00

grenades

Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00

implants

Merge branch 'master' into upstream-merge-33470

2017-12-21 03:24:03 -06:00

melee

Replaces a bunch of loc assignments with forcemoves and moves to nullspace

2017-12-13 13:56:57 -06:00

robot

Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00

stacks

Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00

storage

Fixes some syndicate duffelbags missing inhands

2017-12-20 19:54:56 -06:00

tanks

Merge branch 'master' into upstream-merge-33470

2017-12-21 03:24:03 -06:00

tools

Update weldingtool.dm

2017-12-21 04:36:01 -06:00

AI_modules.dm

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

airlock_painter.dm

Replaces a bunch of loc assignments with forcemoves and moves to nullspace

2017-12-13 13:56:57 -06:00

apc_frame.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

blueprints.dm

Performance and usability improvement for blueprints

2017-11-13 03:32:35 -06:00

body_egg.dm

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

bodybag.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

candle.dm

…

cardboard_cutouts.dm

Fixes foam darts on cardboard cutouts and shooting range targets (#31579)

2017-10-12 15:46:05 -05:00

cards_ids.dm

Update cards_ids.dm

2017-12-19 19:31:44 -06:00

charter.dm

JSON feedback

2017-11-17 01:44:12 -06:00

chrono_eraser.dm

Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00

cigs_lighters.dm

Merge branch 'master' into upstream-merge-33470

2017-12-21 03:24:03 -06:00

clown_items.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

clown.dm

…

control_wand.dm

…

cosmetics.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

courtroom.dm

…

crayons.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

defib.dm

Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00

dehy_carp.dm

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

dice.dm

Defines math, take 2

2017-12-17 10:02:43 -06:00

dna_injector.dm

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

documents.dm

…

eightball.dm

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

extinguisher.dm

[READY]Refactors reagent container types

2017-12-18 22:54:51 -06:00

flamethrower.dm

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

gift.dm

[MIRROR] Christmas (#4491)

2017-12-22 13:14:25 -08:00

handcuffs.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

his_grace.dm

Defines math, take 2

2017-12-17 10:02:43 -06:00

holosign_creator.dm

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

holy_weapons.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

inducer.dm

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

kitchen.dm

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

latexballoon.dm

…

manuals.dm

[MIRROR] [Review Again] Updates the cloning manual (#3663)

2017-10-28 01:19:38 -07:00

miscellaneous.dm

…

mop.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

paint.dm

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

paiwire.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

pet_carrier.dm

Merge pull request #33392 from vuonojenmustaturska/patch-1

2017-12-10 02:53:02 -06:00

pinpointer.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

plushes.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

pneumaticCannon.dm

Defines math, take 2

2017-12-17 10:02:43 -06:00

powerfist.dm

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

RCD.dm

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

RCL.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

religion.dm

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

RPD.dm

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

RSF.dm

Fix many instances of "the the"

2017-10-13 09:41:54 -05:00

scrolls.dm

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

sharpener.dm

Defines math, take 2

2017-12-17 10:02:43 -06:00

shields.dm

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

shooting_range.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

signs.dm

…

singularityhammer.dm

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

stunbaton.dm

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

taster.dm

…

teleportation.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

teleprod.dm

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

theft_tools.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

tools.dm

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

toys.dm

Merge pull request #33664 from optimumtact/darkgenerallordhassnowflakeears

2017-12-20 00:14:28 -06:00

trash.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

twohanded.dm

Adds jousting (#33531)

2017-12-18 20:54:21 -06:00

vending_items.dm

Merge branch 'master' into upstream-merge-33316

2017-12-11 00:01:02 +00:00

weaponry.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00