LetterJay 518b264654 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783 ...

# Conflicts:
#	_maps/map_files/generic/CentCom.dmm
#	code/modules/mob/living/living.dm

2017-12-29 01:34: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

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

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

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

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

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

bedsheet_bin.dm

merges #3877 proper

2017-11-22 17:37:22 -05:00

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

Airlock Construction Update

2017-12-10 15:23:34 -06:00

dresser.dm

Fixes dresser being unattackable (#31123)

2017-09-30 10:30:09 -05:00

electricchair.dm

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

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

extinguisher.dm

Remove drop_item, drop_item_v, put_in_hands_or_del

2017-10-07 12:37:06 -05:00

false_walls.dm

Adds a timer to falsewall code (#32637)

2017-11-13 03:29:21 -06:00

fireaxe.dm

Remove drop_item, drop_item_v, put_in_hands_or_del

2017-10-07 12:37:06 -05:00

fireplace.dm

Defines math, take 2

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

flora.dm

Christmas event changes (#33861)

2017-12-29 00:28:02 -06:00

fluff.dm

Moves some machine sprites into /machines/ folder

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

ghost_role_spawners.dm

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

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

girders.dm

Updates some item drops to use drop_location()

2017-11-24 12:59:33 -06:00

grille.dm

Defines math, take 2

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

guncase.dm

512 forward compatibility merge

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

hivebot.dm

Update hivebot.dm

2017-10-13 22:32:10 -05:00

holosign.dm

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

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

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

Refactor ladders so that they actually work (#32797)

2017-11-20 02:05:52 -06:00

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

save point - a lot of shit to fix

2017-12-27 07:03:40 -06:00

plasticflaps.dm

Minor speedups to movement: First Blood Part 2

2017-11-14 15:00:45 -06:00

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

Moves some machine sprites into /machines/ folder

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

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

Plasma statues get fixed (#33224)

2017-12-03 13:16:45 -06:00

table_frames.dm

…

tables_racks.dm

Merge branch 'master' into upstream-merge-33498

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

tank_dispenser.dm

Remove drop_item, drop_item_v, put_in_hands_or_del

2017-10-07 12:37:06 -05:00

target_stake.dm

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

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

traps.dm

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

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

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