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
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
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
CitadelStationBot
4d19a89519
Removes a great amount of machinery copypasta with circuitboards.
2017-08-09 19:24:19 -05:00
CitadelStationBot
cdbaf5c4e8
Standardized CENTCOM spelling
2017-08-08 09:05:44 -05:00
CitadelStationBot
c3ccae5298
Fixes stuff on shuttles not rotating in the proper direction
2017-08-05 12:20:30 -05:00
CitadelStationBot
95f900a97d
Adds emergency toolbox to escape pod supplies ( #2182 )
2017-07-29 19:51:55 -07:00
ktccd
c52f7a0475
Delayed objective ( #2140 )
...
Delayed objective [Latejoiners can now be selected as traitor targets]
2017-07-27 05:27:58 -07:00
CitadelStationBot
c3329f1b84
Portals do not go on supply shuttles
2017-07-26 15:44:51 -05:00
CitadelStationBot
7bb4ff2d2a
Fixes yet another supply shuttle issue ( #2105 )
2017-07-24 04:07:21 -07:00
CitadelStationBot
20d86558d2
Cleans up jumpToNullSpace proc a bit and fixes pod doors
2017-07-20 22:25:57 -05:00
LetterJay
27b826a6f1
Merge pull request #2033 from Citadel-Station-13/upstream-merge-29260
...
[MIRROR] Changes all access const to be a define
2017-07-19 13:18:58 -05:00
CitadelStationBot
0b7d08d5ac
Fixes the baseturf bad arg runtime and fixes the jumpToNullSpace proc
2017-07-19 04:05:53 -05:00
CitadelStationBot
8d9dc6dd13
[MIRROR] Fixes a ... likely important bug with shuttle code.... ( #2061 )
...
* Fixes a ... likely important bug with shuttle code....
* Delete turf.dm.rej
* Update turf.dm
2017-07-18 06:01:02 -07:00
CitadelStationBot
e522f715a2
[Ready] Shuttle dock() rewrite ( #2040 )
2017-07-17 22:52:18 -07:00
CitadelStationBot
609ae007ae
Changes all access const to be a define
2017-07-16 11:44:47 -05:00
CitadelStationBot
d21766956e
[MIRROR] Cleaned up some emag_acts ( #2018 )
...
* Cleaned up some emag_acts
* Delete port_gen.dm.rej
* Update port_gen.dm
2017-07-15 13:17:56 -07:00
CitadelStationBot
1da785ffb5
Removes old height parameter from CanPass proc
2017-07-13 17:46:36 -05:00
CitadelStationBot
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
CitadelStationBot
90c2a4f867
Removes now-unnecessary obj_integrity definitions
2017-07-09 19:44:48 -05:00
CitadelStationBot
b6b999b15a
Lowercased computer names
2017-07-06 20:09:27 -05:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
21ef6c18b3
Fixes pods not counting as escape
2017-07-03 17:14:27 -05:00
CitadelStationBot
ca2d03a082
Moves transit space to separate z level. ( #1696 )
2017-06-30 20:56:45 -07:00
LetterJay
1c9a15f74d
Update emergency.dm
2017-06-29 05:07:12 -05:00
LetterJay
8cd84f7496
Update emergency.dm
2017-06-29 04:44:26 -05:00
CitadelStationBot
1e7c986ab5
Fixes emergency shuttle endgame state
2017-06-28 08:31:55 -05:00
LetterJay
028752c3de
Merge pull request #1777 from Citadel-Station-13/upstream-merge-28564
...
[MIRROR] Shuttle engines affecting travel time
2017-06-26 09:00:54 -05:00
CitadelStationBot
1a38b6fd6f
Shuttle engines affecting travel time
2017-06-25 20:53:00 -05:00
CitadelStationBot
e57a753701
Exporting mechs!
2017-06-25 11:35:00 -05:00
CitadelStationBot
e8663bee81
Refactors the latejoin list
2017-06-04 15:08:35 -05:00
LetterJay
b19115e10f
Merge branch 'master' into upstream-merge-27454
2017-05-30 23:48:25 -05:00
LetterJay
80896d0371
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27675
2017-05-30 14:14:25 -05:00
