ab42a6242f
Merge pull request #3920 from Citadel-Station-13/LetterJay-patch-2
...
Fixes flavor text on examine
2017-11-13 13:14:25 -06:00
d983c7d928
Update examine.dm
2017-11-13 11:54:18 -06:00
304cfeb262
Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947
...
[MIRROR] Pirate ship event
2017-11-13 11:52:40 -06:00
f46db62f48
Update examine.dm
2017-11-13 11:49:47 -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
7c45ae5cb7
Adds Extended Drill Hair
2017-11-13 03:12:44 -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
e97bc1028e
Update examine.dm
2017-11-12 14:09:20 -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
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
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
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
83c40d5fcc
Fixes medbots not injecting from one tile away
2017-11-11 14:31:29 -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
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
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
248d63fa3a
Makes editing movements delay configs have an effect again ( #32530 )
2017-11-09 11:06:03 -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
b48e8da861
Merge pull request #32442 from KorPhaeron/flyingrevert
...
Reverts flying mobs passing through people
2017-11-07 08:04:43 -06:00
787994ca3c
Merge pull request #3840 from Citadel-Station-13/upstream-merge-32437
...
[MIRROR] Adds an organ storage bag to the syndicate medborg
2017-11-07 04:46:44 -06:00
9c12ee48e1
Adds an organ storage bag to the syndicate medborg ( #32437 )
...
* Adds an organ storage bag to the syndicate medborg
* Adds the drill and extinguisher
2017-11-06 15:15:10 -06:00
1b1411f41f
Monkeys can no longer transmit diseases through hardsuits ( #32431 )
2017-11-05 20:45:34 -06:00
39692c6134
Merge pull request #3790 from Citadel-Station-13/upstream-merge-32354
...
[MIRROR] Woody golems get woody names.
2017-11-04 22:47:34 -05:00
dd32227946
Merge pull request #3786 from Citadel-Station-13/upstream-merge-32346
...
[MIRROR] removes lesser drake crusher loot
2017-11-04 22:45:17 -05:00
056594114f
Woody golems get woody names. ( #32354 )
...
* ya, that'll do em.
* we all make mistakes
* heat signature is a great game
* it's aliiiiive
* caving: the commit
2017-11-03 17:01:24 -05:00
a509a99b52
crusher loot fix ( #32346 )
2017-11-03 15:54:44 -05:00
8f1d81f816
Dullahan Fixes ( #32358 )
...
* Dullahan
* Fixes cyborg issue
* Fixes hearing issues
2017-11-03 15:54:19 -05:00
02a0da9c38
Merge pull request #3765 from Citadel-Station-13/upstream-merge-31640
...
[MIRROR] [Ready]Ghosts can now Health Scan
2017-11-03 00:13:58 -05:00
e43e73c0c1
Merge pull request #3764 from Citadel-Station-13/upstream-merge-32243
...
[MIRROR] [s] New blob overminds off the station Z level are moved to the station
2017-11-03 00:13:37 -05:00
8006c60784
Merge pull request #3762 from Citadel-Station-13/upstream-merge-32284
...
[MIRROR] Fix a few syntactic aberrations
2017-11-03 00:13:00 -05:00
d04b5cbeef
Ghosts can now Health Scan ( #31640 )
...
* Ghosts can now Health Scan
* cyberbossing
* Update observer.dm
2017-11-02 08:46:42 -05:00
07efcb0425
[s] New blob overminds off the station Z level are moved to the station ( #32243 )
...
* [s] New blob overminds are now placed at normal blob spawn points
* Update transform_procs.dm
2017-11-02 04:30:18 -05:00
144df6c549
Fix a few syntactic aberrations ( #32284 )
2017-11-02 04:21:51 -05:00
41893fc147
Spamming runes / battlecries / etc will no longer trigger spam prevention ( #32303 )
...
* Update say.dm
* Update runes.dm
* Update standard.dm
* Update ratvarian_language.dm
2017-11-02 04:13:18 -05:00
8aef4f3b57
Rename brown gas to nitryl ( #32271 )
2017-11-01 21:37:20 -05:00
486982b422
Merge pull request #32145 from PKPenguin321/patch-16
...
Fixes a camera issue with scout holoparasites
2017-10-31 15:32:04 -05:00
6e4e0e4f2d
Merge pull request #3709 from Citadel-Station-13/upstream-merge-32118
...
[MIRROR] actually fixes not being able to stop wagging your tail this time
2017-10-31 03:03:58 -04:00
59bea99c4b
Merge pull request #3702 from Citadel-Station-13/upstream-merge-32123
...
[MIRROR] Removes statues from the gold slime pool
2017-10-31 03:01:34 -04:00
1092b020f4
Merge pull request #3690 from Citadel-Station-13/upstream-merge-32214
...
[MIRROR] Fixes old simple animal humanoid issues
2017-10-30 22:14:32 -04:00
6963ad2aac
Merge pull request #3680 from Citadel-Station-13/upstream-merge-32041
...
[MIRROR] Excludes clockwork wargolems from golem mutation toxin, nerfs normal clockwork golems
2017-10-30 22:11:33 -04:00
49dce5c9ea
Update emote.dm
2017-10-30 21:09:00 -05:00
ca1581bd11
Update emote.dm
2017-10-30 20:35:24 -05:00
93f39805e9
actually fixes not being able to stop wagging your tail this time
2017-10-30 15:24:38 -05:00
b6fea33316
Removes statues from the gold slime pool ( #32123 )
...
* Update statue.dm
* Update statue.dm
2017-10-30 14:53:56 -05:00
f8bd9ecf9c
Fixes old simple animal humanoid issues ( #32214 )
...
* fixes issue
* ignore that
* Spacebattle doesn't even open in DM
* Conflicts fixed for real
* Fixes pathing weirdness
* wonderful
2017-10-30 06:50:04 -05:00
48cc684de0
Update golems.dm
2017-10-29 22:41:23 -05:00
LetterJay