746e57bd86
Allowed shuttle docking ports to be hidden from some shuttle docking computers
2017-12-10 14:23:08 -06:00
0b07f80b62
custom docker improvements ( #32626 )
2017-11-24 12:59:17 -06:00
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
43113cd9b5
Merge pull request #31947 from AnturK/yarr
...
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.
If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.
There's an internal GPS onboard so crew will always be able to follow the shuttle.
Crew of 3, moderately armed. (Balance pending)
Shuttle engines have 3 minute cooldown between jumps.
Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
2017-11-13 03:19:38 -06:00
44ca2d67f6
Merge pull request #31663 from ninjanomnom/shuttle-subsystem
...
Repopulates SSshuttle recover
2017-10-14 18:49:24 -05:00
b17a770299
Config option to automatically call the shuttle for high casualties ( #31309 )
2017-10-06 21:35:49 -05:00
99319f5d4d
Update shuttle.dm
2017-09-30 14:23:40 -05:00
7e2873cd46
Corrected shuttle refuel time
2017-09-30 00:59:00 -05:00
d8de375ada
Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969
...
[MIRROR] DisplayTimeText mk2
2017-09-27 23:39:03 -04:00
169aa85d9c
DisplayTimeText mk2
2017-09-24 18:59:57 -05:00
6278d49662
Href tokens
2017-09-24 17:34:37 -05:00
41277ff110
Removes old debug text
2017-09-21 06:30:11 -05:00
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
d05fdb0eb0
Makes the station Z level into a list instead of a single define
2017-09-11 12:40:35 -05:00
92e055be97
Quick sync ( #2587 )
...
* sync since the mirror was down
* fucking byond
* can't forget these
2017-09-04 04:38:49 -05:00
93647d77ad
[DNM] Fixes the codebase ( #2556 )
...
* fixes stuff
* goddamnit flags
2017-08-30 00:08:40 -07:00
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
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
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
ab27b63cf9
Merge branch 'master' into upstream-merge-29611
2017-08-15 18:55:12 -05:00
cc7ad81f79
Adds helpers to avoid << use
2017-08-08 22:28:16 -05:00
cdbaf5c4e8
Standardized CENTCOM spelling
2017-08-08 09:05:44 -05:00
35fba1933e
Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
...
[MIRROR] Made some object lists less terrible to read
2017-07-31 03:43:03 -05:00
ba0c60a697
Adds logging of shuttle request reasons.
2017-07-25 09:53:46 -05:00
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
ca2d03a082
Moves transit space to separate z level. ( #1696 )
2017-06-30 20:56:45 -07:00
165e684e9b
Update shuttle.dm
2017-06-26 08:01:38 -05:00
61a8d76122
Update shuttle.dm
2017-06-26 06:36:09 -05:00
e1d6c5d278
increases round time
2017-06-17 22:47:32 -05:00
9842b19282
3 hour rounds
2017-06-17 22:44:42 -05:00
13767b91ad
Fixes admiral recall ( #1374 )
2017-06-04 02:18:42 -07:00
2fadc0e58b
Fixes Gang War's infinity shuttle
2017-05-26 11:27:38 -05:00
cbae09b538
rej cleanup/commit
2017-05-22 16:59:39 -05:00
4463646952
[MIRROR] MC Runlevels ( #988 )
...
* MC Runlevels
* Update ticker.dm
* Delete ticker.dm.rej
2017-05-18 12:42:43 -05:00
946013ac22
Fixes rcds working on transit space ( #981 )
2017-05-18 11:54:10 -05:00
4a9ef49cf3
[MIRROR] Fixes SSShuttle not checking for missing arrivals ( #908 )
...
* Fixes SSShuttle not checking for missing arrivals
* Update shuttle.dm
* Delete shuttle.dm.rej
2017-05-18 07:34:31 -05:00
57a0e05679
Even admin-called shuttles will be affected by alert level
2017-04-27 16:55:12 -05:00
4baa357739
Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker
2017-04-24 18:07:12 -05:00
7e9b96a00f
April sync ( #360 )
...
* Maps and things no code/icons
* helpers defines globalvars
* Onclick world.dm orphaned_procs
* subsystems
Round vote and shuttle autocall done here too
* datums
* Game folder
* Admin - chatter modules
* clothing - mining
* modular computers - zambies
* client
* mob level 1
* mob stage 2 + simple_animal
* silicons n brains
* mob stage 3 + Alien/Monkey
* human mobs
* icons updated
* some sounds
* emitter y u no commit
* update tgstation.dme
* compile fixes
* travis fixes
Also removes Fast digest mode, because reasons.
* tweaks for travis Mentors are broke again
Also fixes Sizeray guns
* oxygen loss fix for vore code.
* removes unused code
* some code updates
* bulk fixes
* further fixes
* outside things
* whoops.
* Maint bar ported
* GLOBs.
2017-04-13 23:37:00 -05:00
Cruix