LetterJay 134201d185 Merge pull request #4494 from Citadel-Station-13/upstream-merge-32433 ...

[MIRROR] [READY]Refactors projectile trajectories, fixes piercing projectile inaccuracy and beam rifle visual deflections

2017-12-25 21:26:17 -06:00

..

beds_chairs

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

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

crates_lockers

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

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

transit_tubes

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

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

ai_core.dm

…

aliens.dm

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

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

artstuff.dm

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

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

barsigns.dm

…

bedsheet_bin.dm

…

destructible_structures.dm

…

displaycase.dm

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

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

divine.dm

…

door_assembly.dm

…

dresser.dm

…

electricchair.dm

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

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

extinguisher.dm

…

false_walls.dm

…

fireaxe.dm

…

fireplace.dm

Defines math, take 2

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

flora.dm

[MIRROR] Christmas (#4491)

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

fluff.dm

…

ghost_role_spawners.dm

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

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

girders.dm

…

grille.dm

Defines math, take 2

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

guncase.dm

…

hivebot.dm

…

holosign.dm

…

janicart.dm

[READY]Refactors reagent container types

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

kitchen_spike.dm

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

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

ladders.dm

…

lattice.dm

Defines math, take 2

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

life_candle.dm

…

manned_turret.dm

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

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

memorial.dm

…

mineral_doors.dm

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

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

mirror.dm

changes one letter (#33591)

2017-12-17 11:30:37 -06:00

mop_bucket.dm

Update mop_bucket.dm

2017-12-19 15:29:36 -06:00

morgue.dm

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

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

musician.dm

Defines math, take 2

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

noticeboard.dm

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

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

petrified_statue.dm

[Ready Again]Refactors disabilities into lists, allowing for independent disability sources

2017-12-18 15:19:53 -06:00

plasticflaps.dm

…

reflector.dm

Merge pull request #32433 from kevinz000/vector_projectiles

2017-12-21 19:33:42 -06:00

safe.dm

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

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

showcase.dm

…

signs.dm

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

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

spirit_board.dm

…

statues.dm

…

table_frames.dm

…

tables_racks.dm

Merge branch 'master' into upstream-merge-33498

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

tank_dispenser.dm

…

target_stake.dm

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

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

traps.dm

…

watercloset.dm

[READY]Refactors reagent container types

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

windoor_assembly.dm

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

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

window.dm

Merge branch 'master' into upstream-merge-33498

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