deathride58 and GitHub
d202867730
Update carbon.dm
2017-11-17 23:23:13 -05:00
deathride58 and GitHub
f1818eb11b
Update death.dm
2017-11-17 23:22:02 -05:00
vuonojenmustaturska and CitadelStationBot
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
LetterJay and GitHub
286442cf4a
Merge pull request #3833 from Citadel-Station-13/upstream-merge-32183
...
[MIRROR] Ling datum antag standarization.
2017-11-15 15:00:46 -06:00
LetterJay and GitHub
2715fd1b6c
Merge pull request #3950 from deathride58/slimernosliming
...
Re-disables slimeperson splitting
2017-11-15 10:54:51 -06:00
LetterJay and GitHub
163ef812fb
Merge pull request #3945 from Citadel-Station-13/upstream-merge-32702
...
[MIRROR] Minor speedups to movement: First Blood Part 2
2017-11-15 10:41:16 -06:00
LetterJay and GitHub
46ba6cbc7b
Merge pull request #3943 from Citadel-Station-13/upstream-merge-32620
...
[MIRROR] Greatly increases the performance of station-ending plasma fires
2017-11-15 10:40:40 -06:00
LetterJay and GitHub
3c28ea5426
Merge pull request #3713 from Citadel-Station-13/upstream-merge-32277
...
[MIRROR] Removes golem debug code that spams world
2017-11-15 10:30:31 -06:00
LetterJay and GitHub
1939e96bb6
Merge branch 'master' into upstream-merge-32183
2017-11-15 10:22:40 -06:00
deathride58
f1274b41f2
redisables slime splitting
2017-11-14 19:27:19 -05:00
LetterJay and GitHub
0885c57b39
Update mob.dm
2017-11-14 16:10:46 -06:00
LetterJay and GitHub
809951c56c
Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176
...
[MIRROR] loc -- > forcemove
2017-11-14 15:58:20 -06:00
vuonojenmustaturska and CitadelStationBot
8136148303
Minor speedups to movement: First Blood Part 2
2017-11-14 15:00:45 -06:00
vuonojenmustaturska and CitadelStationBot
157998e974
Greatly increases the performance of station-ending plasma fires
2017-11-14 13:51:45 -06:00
Robustin and CitadelStationBot
2fc1e5c8e5
More nuanced damage examination ( #32707 )
...
* More nuanced damage examinations
* Tweaking examination values
* Redundancy Removal
2017-11-14 13:48:20 -06:00
LetterJay and GitHub
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
LetterJay and GitHub
d983c7d928
Update examine.dm
2017-11-13 11:54:18 -06:00
LetterJay and GitHub
304cfeb262
Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947
...
[MIRROR] Pirate ship event
2017-11-13 11:52:40 -06:00
LetterJay and GitHub
f46db62f48
Update examine.dm
2017-11-13 11:49:47 -06:00
oranges and CitadelStationBot
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
oranges and CitadelStationBot
7c45ae5cb7
Adds Extended Drill Hair
2017-11-13 03:12:44 -06:00
LetterJay and GitHub
14944d8711
Merge branch 'master' into upstream-merge-32183
2017-11-12 23:09:55 -06:00
LetterJay and GitHub
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
LetterJay and GitHub
e97bc1028e
Update examine.dm
2017-11-12 14:09:20 -06:00
LetterJay and GitHub
8d78a999e1
Update jellypeople.dm
2017-11-12 13:17:41 -06:00
LetterJay and GitHub
6da7d8e8b5
Update posibrain.dm
2017-11-12 13:17:08 -06:00
LetterJay and GitHub
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
LetterJay and GitHub
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
kevinz000 and CitadelStationBot
80a06368bf
Fixes Colossus Projectiles ( #32621 )
2017-11-12 01:27:20 -06:00
LetterJay and GitHub
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
Dax Dupont and CitadelStationBot
83c40d5fcc
Fixes medbots not injecting from one tile away
2017-11-11 14:31:29 -06:00
LetterJay and GitHub
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
LetterJay and GitHub
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
Jordan Brown and CitadelStationBot
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
Jordan Brown and CitadelStationBot
248d63fa3a
Makes editing movements delay configs have an effect again ( #32530 )
2017-11-09 11:06:03 -06:00
LetterJay and GitHub
d6e5942baf
Merge branch 'master' into upstream-merge-31176
2017-11-09 03:24:38 -06:00
LetterJay and GitHub
e73fbd0a8e
Update pirate.dm
2017-11-09 03:15:01 -06:00
LetterJay and GitHub
1808943097
Update faithless.dm
2017-11-09 03:14:53 -06:00
Blute1 and CitadelStationBot
e6031b0d5c
Process_Spacemove proc improvement
2017-11-08 19:51:57 -06:00
Leo and CitadelStationBot
b48e8da861
Merge pull request #32442 from KorPhaeron/flyingrevert
...
Reverts flying mobs passing through people
2017-11-07 08:04:43 -06:00
LetterJay and GitHub
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
Anonmare and CitadelStationBot
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
MoreRobustThanYou and CitadelStationBot
1b1411f41f
Monkeys can no longer transmit diseases through hardsuits ( #32431 )
2017-11-05 20:45:34 -06:00
AnturK and CitadelStationBot
2e0aaf8598
Ling datum antag standarization.
2017-11-05 19:32:59 -06:00
LetterJay and GitHub
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
LetterJay and GitHub
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
Armhulen and CitadelStationBot
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
imsxz and CitadelStationBot
a509a99b52
crusher loot fix ( #32346 )
2017-11-03 15:54:44 -05:00
KorPhaeron and CitadelStationBot
8f1d81f816
Dullahan Fixes ( #32358 )
...
* Dullahan
* Fixes cyborg issue
* Fixes hearing issues
2017-11-03 15:54:19 -05:00
LetterJay and GitHub
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