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

..

_computer.dm

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

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

aifixer.dm

512 forward compatibility merge

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

apc_control.dm

Defines math, take 2

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

arcade.dm

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

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

atmos_alert.dm

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

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

atmos_control.dm

Defines math, take 2

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

buildandrepair.dm

Fixes computers deleting on build (#32942)

2017-11-21 02:43:34 -06:00

camera_advanced.dm

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

2017-12-29 01:34:17 -06:00

camera.dm

here we go again (#2456)

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

card.dm

512 forward compatibility merge

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

cloning.dm

save point - a lot of shit to fix

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

communications.dm

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

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

crew.css

initial commit - cross reference with 5th port - obviously has compile errors

2016-07-03 02:17:19 -05:00

crew.dm

Replaces a bunch of mob loops with hopefully better ones

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

crew.js

Standardized CENTCOM spelling

2017-08-08 09:05:44 -05:00

dna_console.dm

save point - a lot of shit to fix

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

gulag_teleporter.dm

Defines math, take 2

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

launchpad_control.dm

512 forward compatibility merge

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

law.dm

here we go again (#2456)

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

medical.dm

Cleans up unused code

2017-11-20 10:14:32 -06:00

message.dm

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

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

monastery_shuttle.dm

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

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

Operating.dm

Merge pull request #32864 from ike709/dir

2017-11-19 22:42:28 -06:00

pod.dm

512 forward compatibility merge

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

prisoner.dm

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

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

robot.dm

making prs isn't even worth it anymore (#33056)

2017-11-24 22:36:22 -06:00

security.dm

Replaces a bunch of mob loops with hopefully better ones

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

station_alert.dm

Update station_alert.dm

2017-11-14 16:06:54 -06:00

telecrystalconsoles.dm

Update telecrystalconsoles.dm

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

teleporter.dm

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

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