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
3ea8808201
Merge pull request #3673 from Citadel-Station-13/upstream-merge-32161
...
[MIRROR] 512 forward compatibility merge
2017-11-12 23:06:55 -06:00
768e80544e
Update autolathe_designs.dm
2017-11-12 15:41:25 -06:00
f812be1ee0
Update autolathe_designs.dm
2017-11-12 14:46:18 -06:00
e97bc1028e
Update examine.dm
2017-11-12 14:09:20 -06:00
fa6b955dcf
Update tgui.dm
2017-11-12 13:18:42 -06:00
5ca3389cc2
Update clipboard.dm
2017-11-12 13:17:59 -06:00
8d78a999e1
Update jellypeople.dm
2017-11-12 13:17:41 -06:00
6da7d8e8b5
Update posibrain.dm
2017-11-12 13:17:08 -06:00
439723caff
Update adminhelp.dm
2017-11-12 11:18:11 -06:00
d8c25f656b
Update admin_investigate.dm
2017-11-12 08:56:53 -06:00
94578d2f37
Merge pull request #3897 from Citadel-Station-13/upstream-merge-32621
...
[MIRROR] Fixes colossus projectiles only shooting north
2017-11-12 08:21:39 -06:00
9b406f88a7
Merge pull request #3879 from Citadel-Station-13/upstream-merge-32400
...
[MIRROR] Assmos tweaks/minor additions.
2017-11-12 08:21:09 -06:00
f2ef581114
Merge pull request #3878 from Citadel-Station-13/upstream-merge-32545
...
[MIRROR] clamps view range and add view range to a minimum of 7
2017-11-12 08:20:58 -06:00
94bdcb6848
Merge pull request #3876 from Citadel-Station-13/upstream-merge-32556
...
[MIRROR] Fixed teleporting food out of the deep fryer
2017-11-12 08:20:10 -06:00
1c8ae63808
Merge pull request #3836 from Citadel-Station-13/upstream-merge-32453
...
[MIRROR] Little change. More the same
2017-11-12 08:20:01 -06:00
80a06368bf
Fixes Colossus Projectiles ( #32621 )
2017-11-12 01:27:20 -06:00
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
da70da9c89
Merge pull request #3887 from Citadel-Station-13/upstream-merge-32592
...
[MIRROR] Fixes medbots not injecting from one tile away
2017-11-11 15:57:08 -06:00
5a7ea4de92
Merge pull request #3892 from Citadel-Station-13/upstream-merge-32584
...
[MIRROR] Fixes some cases where changeturf were called incorrectly
2017-11-11 15:56:45 -06:00
3b14c035cd
Merge pull request #3891 from Citadel-Station-13/upstream-merge-32577
...
[MIRROR] Fixes lich revival text spelling
2017-11-11 15:56:35 -06:00
c2d1a16954
Fixes some cases where changeturf were called incorrectly ( #32584 )
2017-11-11 14:32:13 -06:00
6962cf8b24
Merge pull request #32577 from PKPenguin321/patch-13
...
Fixes lich revival text spelling
2017-11-11 14:32:04 -06:00
64d0c4711f
Merge pull request #32583 from Iamgoofball/patch-334
...
Frog masks no longer have a sound
2017-11-11 14:31:37 -06:00
83c40d5fcc
Fixes medbots not injecting from one tile away
2017-11-11 14:31:29 -06:00
29cf96f2d0
Merge pull request #3881 from Citadel-Station-13/upstream-merge-32560
...
[MIRROR] Renames charcoal bottles
2017-11-11 12:40:08 -06:00
88c67ccaa7
Merge pull request #3872 from Citadel-Station-13/upstream-merge-32518
...
[MIRROR] Ensures sentienced animals know how to speak all the languages their master does
2017-11-11 12:38:32 -06:00
fc04d94a29
Merge pull request #3870 from Citadel-Station-13/upstream-merge-32530
...
[MIRROR] Makes editing movements delay configs have an effect again
2017-11-11 12:37:59 -06:00
a3ba99a7e8
Merge pull request #3869 from Citadel-Station-13/upstream-merge-32531
...
[MIRROR] Fixes word crimes
2017-11-11 12:37:43 -06:00
9071fde91b
Merge pull request #3860 from Citadel-Station-13/upstream-merge-32515
...
[MIRROR] Process_Spacemove proc improvement
2017-11-11 12:36:35 -06:00
c11dc9d20f
Merge pull request #32560 from Mark9013100/11/9/17_char_antitox
...
Renames charcoal bottles
2017-11-10 09:10:41 -06:00
7f9800e8fa
Assmos tweaks/minor additions. ( #32400 )
...
* Adds pluoxium formation, makes fusion radioactive and nerfs it, makes noblium cost more energy.
* Review response.
* tanks now melt above 1 Million degrees Kelvin.
2017-11-10 01:31:16 -06:00
114936682c
Merge pull request #32545 from Buggy123/patch-33
...
clamps view range and add view range to a minimum of 7
2017-11-09 23:25:23 -06:00
b6e7e8501d
Merge pull request #32556 from Cruix/deep_fryer
...
Fixed teleporting food out of the deep fryer
2017-11-09 23:21:59 -06:00
1aeb81cc25
Ensures sentienced animals know how to speak all the languages their master does ( #32518 )
...
* Ensures sentienced animals know how to speak Common
* Give all of master's languages
* Languages
2017-11-09 11:08:25 -06:00
248d63fa3a
Makes editing movements delay configs have an effect again ( #32530 )
2017-11-09 11:06:03 -06:00
3fa561c3b1
fixes spelling and stuff ( #32531 )
2017-11-09 11:04:50 -06:00
a9d8bf1c7a
Merge pull request #3822 from Citadel-Station-13/upstream-merge-32379
...
[MIRROR] Scale fullscreen overlays to the view size
2017-11-09 03:24:57 -06:00
b8fb23c964
Merge pull request #3818 from Citadel-Station-13/upstream-merge-32374
...
[MIRROR] Fixes canceling cavity implants
2017-11-09 03:24:48 -06:00
9725456c65
Update machine_unloading.dm
2017-11-09 03:23:25 -06:00
460f19297f
Merge pull request #3751 from Citadel-Station-13/upstream-merge-32292
...
[MIRROR] animate sqdl wrapper works now.
2017-11-09 03:20:01 -06:00
f46dc540ed
Merge pull request #3846 from Citadel-Station-13/upstream-merge-32442
...
[MIRROR] Reverts flying mobs passing through people
2017-11-09 03:18:26 -06:00
e73fbd0a8e
Update pirate.dm
2017-11-09 03:15:01 -06:00
1808943097
Update faithless.dm
2017-11-09 03:14:53 -06:00
e6031b0d5c
Process_Spacemove proc improvement
2017-11-08 19:51:57 -06:00
ea44e4a1d9
Merge pull request #3857 from Citadel-Station-13/upstream-merge-32489
...
[MIRROR] Global vest lists
2017-11-08 02:21:36 -06:00
1abde42c7a
Merge pull request #3854 from Citadel-Station-13/upstream-merge-32428
...
[MIRROR] Fixes spacevines causing negative pressure/temperature
2017-11-08 02:20:42 -06:00
d82ae80e99
Merge pull request #3850 from Citadel-Station-13/upstream-merge-32478
...
[MIRROR] Editing a variable now logs the old value
2017-11-08 01:46:22 -06:00
5f5f313551
Global vest lists ( #32489 )
...
* Global vest lists
* revised coat
* Fixed duped proc
2017-11-07 23:57:57 -06:00
0513ce290e
Merge pull request #32428 from kevinz000/patch-374
...
Fixes spacevines causing negative pressure/temperature
2017-11-07 14:36:56 -06:00
oranges