Jordan Brown
2a68dce1ed
Fixes ruins spawning over shuttle docks
2017-10-12 16:02:39 -05:00
oranges
494bb0222c
Makes cameras work on shuttles
2017-10-10 03:15:13 -05:00
LetterJay
ea41c07221
white
2017-10-08 22:47:42 -05:00
LetterJay
71cec9faad
Merge pull request #3223 from Citadel-Station-13/upstream-merge-31409
...
[MIRROR] Buckled mobs rotation fix
2017-10-08 16:21:24 -04:00
LetterJay
8ea93639ca
Merge pull request #3222 from Citadel-Station-13/upstream-merge-31405
...
[MIRROR] Gives ghosts direction is their meaningless existence
2017-10-08 16:21:06 -04:00
Jordan Brown
8c4e9d6a02
Merge pull request #31409 from ninjanomnom/buckled-mobs
...
Buckled mobs rotation fix
2017-10-08 01:48:55 -05:00
Emmett Gaines
e5e8a807a2
fixes directionless ghosts having direction ( #31405 )
2017-10-08 01:37:34 -05:00
ShizCalev
92ec5c11ab
Fixes being able to sell camera mobs to CentCom ( #31306 )
...
* Fixes being able to sell camera mobs to CENTCOM
* Did it Ninja's way.
2017-10-07 19:13:28 -05:00
LetterJay
cf37555c4d
Merge pull request #3151 from Citadel-Station-13/upstream-merge-31302
...
[MIRROR] Move shuttleRotate into the shuttle module
2017-10-05 09:13:41 -04:00
LetterJay
a1ae6add27
Merge pull request #3152 from Citadel-Station-13/upstream-merge-31296
...
[MIRROR] Cleans up and fixes old landmarks
2017-10-05 09:12:35 -04:00
LetterJay
47b72055cd
Update shuttle.dm
2017-10-05 05:19:49 -05:00
oranges
bb9982e772
Merge pull request #31296 from ShizCalev/landmark-cleanup
...
Cleans up and fixes old landmarks
2017-10-05 03:05:40 -05:00
oranges
cedb56af1b
Merge pull request #31302 from ninjanomnom/shuttle-rotation
...
Move shuttleRotate into the shuttle module
2017-10-05 03:05:32 -05:00
Emmett Gaines
d50c0e10f6
Makes shuttle movement a bit smoother and faster
2017-10-05 02:31:10 -05:00
bawhoppen
82981339ed
Adds desc to things lacking them.
2017-10-01 15:07:37 -05:00
LetterJay
04d071deda
Merge branch 'master' into upstream-merge-30763
2017-09-30 15:30:46 -04:00
Jordan Brown
e5ef3d2405
Configuration datum refactor
2017-09-28 21:37:53 -05:00
KorPhaeron
6fca708b33
Advanced camera consoles use a list for z lock rather than a single z level ( #30661 )
...
* Refactor Abductor Console
* Station lock
2017-09-28 10:44:12 -05:00
LetterJay
d8de375ada
Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969
...
[MIRROR] DisplayTimeText mk2
2017-09-27 23:39:03 -04:00
Emmett Gaines
2610101820
fixes shuttles creating duplicate area types ( #31008 )
2017-09-26 07:26:37 -05:00
ShizCalev
169aa85d9c
DisplayTimeText mk2
2017-09-24 18:59:57 -05:00
oranges
6278d49662
Href tokens
2017-09-24 17:34:37 -05:00
CitadelStationBot
9c9020ec32
[MIRROR] Removes dead testing code ( #2854 )
...
* Merge pull request #30860 from ninjanomnom/quickfix
Removes dead testing code
* Removes dead testing code
2017-09-19 06:24:12 -05:00
pubby
a01f3213f5
Traitorbro gamemode
2017-09-17 18:03:12 -05:00
CitadelStationBot
fc62f8bf3e
[MIRROR] Shuttle multi-tile object fix ( #2748 )
...
* multi-tile object fix (#30674 )
* Shuttle multi-tile object fix
2017-09-14 07:37:54 -05:00
CitadelStationBot
82d0aae420
[MIRROR] Changes shuttle port direction var from an angle to a dir ( #2613 )
...
* Changes shuttle port direction var from an angle to a dir
* actually ports the directions
* Update shuttle.dm
* how
2017-09-13 20:39:55 -05:00
CitadelStationBot
9d52a495b2
[MIRROR] Fix monastery shuttle + Pods ( #2599 )
...
* Fix monastery shuttle + Pods
* actually ports podfix
2017-09-13 17:58:25 -05:00
LetterJay
1471b6cac6
Merge branch 'master' into upstream-merge-30297
2017-09-13 06:41:37 -05:00
LetterJay
a960b63b0a
Merge branch 'master' into upstream-merge-30056
2017-09-13 06:08:59 -05:00
LetterJay
c2a41c9b51
commit
2017-09-13 06:04:22 -05:00
LetterJay
cd0997aa1e
Merge branch 'master' into upstream-merge-30297
2017-09-12 23:36:35 -05:00
LetterJay
9adcc174b3
Update shuttle.dm
2017-09-11 17:09:44 -05:00
LetterJay
6b25a0e42b
Merge pull request #2647 from Citadel-Station-13/upstream-merge-30465
...
[MIRROR] Fixes shuttle name on ramming.
2017-09-11 15:22:36 -05:00
LetterJay
726b86f3a4
Update on_move.dm
2017-09-11 14:18:28 -05:00
LetterJay
2f10e78ba7
Update on_move.dm
2017-09-11 13:56:28 -05:00
KorPhaeron
d05fdb0eb0
Makes the station Z level into a list instead of a single define
2017-09-11 12:40:35 -05:00
AnturK
317958fb5c
Fixes more CanPass misuse ( #30493 )
...
* Fixes more CanPass misuse
* Let's not give wrong impression
* spans
2017-09-09 19:41:02 -05:00
CitadelStationBot
d35717e1ab
[MIRROR] Fixes assault pod blinking docking effects ( #2667 )
...
* Fixes assault pod blinking docking effects (#30492 )
* Fixes assault pod blinking docking effects
2017-09-08 20:15:10 -05:00
AnturK
c2c69d359f
Fixes shuttle name on ramming.
2017-09-07 10:34:28 -05:00
LetterJay
bae0563d47
initial commit
2017-09-05 16:17:50 -05:00
Poojawa
3a76fdc2e9
Update supply.dm
2017-09-04 21:26:19 -05:00
LetterJay
92e055be97
Quick sync ( #2587 )
...
* sync since the mirror was down
* fucking byond
* can't forget these
2017-09-04 04:38:49 -05:00
CitadelStationBot
9b00f12ba0
Makes the shuttle code a little bit more robust by removing a snowflake loop ( #2559 )
2017-09-04 01:36:00 -05:00
kevinz000
c638386507
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 )
...
* fuck pubby
* fuck you too ceres
* ree
* this is going to be a disaster isn't it
* disaster
* dme
* -_-
* tg
* woops
* proper sync
* Welcome to conflict hell.
* lets hope this fixes more things than it breaks
* gdi
* goddamnit
2017-08-24 21:07:58 -07:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24
ok this is going to be a pain in the ass ain't it ( #2458 )
...
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996
Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" ( #2457 )
...
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
LetterJay
a0cf777040
Merge branch 'master' into upstream-merge-29940
2017-08-21 23:29:24 -05:00
CitadelStationBot
b5e7f7f7fe
[MIRROR] Adds defines for mouse_opacity ( #2381 )
...
* Adds defines for mouse_opacity
* Delete misc.dm.rej
* Update misc.dm
2017-08-21 20:29:37 -07:00
CitadelStationBot
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
