Commit Graph

2792 Commits

Author SHA1 Message Date
LetterJay
ad3b59c247 Merge pull request #3281 from Citadel-Station-13/upstream-merge-31498
[MIRROR] Fixes emote runtimes
2017-10-10 22:28:14 -04:00
AnturK
e880545425 Fixes emote runtimes (#31498)
* Emote runtime

* Bleh didn't add all
2017-10-10 08:42:30 -05:00
Leo
ed3a031543 Merge pull request #31497 from AnturK/cyberboss-pls
Fixes some tempremoves
2017-10-10 07:10:35 -05:00
LetterJay
9d7877cd02 Merge pull request #3277 from Citadel-Station-13/upstream-merge-31012
[MIRROR] Syndicate turrets (and other machines in walls) can now be hit by projectiles. Also reworks target priorities.
2017-10-10 05:56:18 -04:00
LetterJay
b7c65c7482 Merge pull request #3274 from Citadel-Station-13/upstream-merge-31492
[MIRROR] Fixes xeno mass confusion
2017-10-10 05:55:38 -04:00
LetterJay
c24a212f0e Merge pull request #3272 from Citadel-Station-13/upstream-merge-31447
[MIRROR] Adds walk and step SDQL2 wrappers
2017-10-10 05:55:17 -04:00
LetterJay
a1d4868601 Merge pull request #3270 from Citadel-Station-13/upstream-merge-31437
[MIRROR] Makes the santa event properly poll ghosts
2017-10-10 05:54:44 -04:00
LetterJay
c3533fee76 Merge pull request #3269 from Citadel-Station-13/upstream-merge-31408
[MIRROR] Makes cameras work on shuttles
2017-10-10 05:54:33 -04:00
LetterJay
0331110388 Merge pull request #3268 from Citadel-Station-13/upstream-merge-31416
[MIRROR] Clockwork Golems will not slip on glass
2017-10-10 05:54:18 -04:00
LetterJay
26800c1d1d Merge pull request #3267 from Citadel-Station-13/upstream-merge-31399
[MIRROR] Allows you to choose how much to insert into protolathe/exofab/circuitprinter/dronedispenser
2017-10-10 05:54:08 -04:00
LetterJay
b0c833059e Update chunk.dm 2017-10-10 04:40:26 -05:00
GLACoding
9050cc63ca Syndicate turrets (and other machines in walls) can now be hit by projectiles. Also reworks target priorities. (#31012)
* Projectile code additions

* Adds !prehit checks and corrects the check for energy cannon spam

* Adds checks for machines and structures to stop double hitting

* JJRcop Requesting Fixes #1

* JJRcop Requested Fixes #2

* Fixes projectiles unable to hit mobs in machines

* Adds in a new proc select_target, and rewrites some bits

Fixes projectiles double hitting when targetting machines with mobs on them, also makes it so weapons with forcedodge can hit targets inside walls.

* AnturK requested fix #1
2017-10-10 03:28:33 -05:00
oranges
429543f4ae Merge pull request #31492 from ShizCalev/sometimes-i-drink-a-glass-of-water-just-to-suprise-my-liver
Fixes xeno mass confusion
2017-10-10 03:22:03 -05:00
kevinz000
7f08bf08e3 Adds walk and step SDQL2 wrappers (#31447)
* Update SDQL_2_wrappers.dm

* Update SDQL_2_wrappers.dm
2017-10-10 03:18:43 -05:00
MoreRobustThanYou
b05a4ebb29 Makes the santa event properly poll ghosts (#31437)
* Makes the santa event properly poll ghosts

* Update xmas.dm

* Update xmas.dm

* Create event.dm

* Update tgstation.dme

* Update xmas.dm

* Update event.dm

* Update event.dm

* Update event.dm

* Update event.dm

* Update event.dm

* Update event.dm
2017-10-10 03:16:23 -05:00
oranges
494bb0222c Makes cameras work on shuttles 2017-10-10 03:15:13 -05:00
oranges
5d3a805d30 Merge pull request #31416 from Armhulen/patch-2
Clockwork Golems will not slip on glass
2017-10-10 03:14:01 -05:00
kevinz000
a6ac800db0 Allows you to choose how much to insert into protolathe/exofab/circuitprinter/dronedispenser (#31399)
* precision

* precision

* sanity checks

* itt kevinz doesn't know how cyberboss procs work

* fixes

* allows user cancellation

* im dumb

* itt: im still dumb

* fixes stuff, makes it set on init

* refactors reagentgrinder code

* more fixes, prevents melee attacks from going anyways

* ...? wtf is with usetopic

* Finally found out what's wrongw ith this thing.

* fixes a mistake
2017-10-10 03:11:50 -05:00
Tad Hardesty
01ecdff51a Improve extended examination text for many objects (#31381)
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 03:07:38 -05:00
LetterJay
e0f9167153 Merge pull request #3248 from Citadel-Station-13/upstream-merge-31066
[MIRROR] Refactors virus spreading
2017-10-10 02:46:04 -04:00
LetterJay
7edd104159 Merge pull request #3260 from Citadel-Station-13/upstream-merge-31439
[MIRROR] Fixes invalid arg runtime with drop_if_replaced
2017-10-10 01:05:59 -04:00
LetterJay
e6fad0965d Merge pull request #3258 from Citadel-Station-13/upstream-merge-31451
[MIRROR] Update server tools API to 3.1.0.2
2017-10-10 01:05:35 -04:00
LetterJay
94d36578e1 Merge pull request #3257 from Citadel-Station-13/upstream-merge-31468
[MIRROR] Gets rid of spawns in buttons
2017-10-10 01:05:21 -04:00
LetterJay
e232520705 Merge pull request #3256 from Citadel-Station-13/upstream-merge-31469
[MIRROR] Fixes Teslas always doing the same movement pattern
2017-10-10 01:05:03 -04:00
LetterJay
11abb49d12 Merge pull request #3254 from Citadel-Station-13/upstream-merge-31463
[MIRROR] Stops check antags message if round has not started yet.
2017-10-09 23:02:06 -04:00
LetterJay
8c0ecb3c5c Merge pull request #3253 from Citadel-Station-13/upstream-merge-31470
[MIRROR] Uses the proper list for xeno landmarks/nightmare spawning
2017-10-09 23:01:59 -04:00
LetterJay
3232f0a2a0 Update flightsuit.dm 2017-10-09 21:27:59 -05:00
kevinz000
cee28e27fe Fixes invalid arg runtime with drop_if_replaced (#31439)
* Update augments_eyes.dm

* Update eyes.dm
2017-10-09 19:05:18 -05:00
Jordan Brown
4b2d7b702a Update server tools API to 3.1.0.2 (#31451) 2017-10-09 19:02:47 -05:00
MoreRobustThanYou
6578ae1f5c Gets rid of spawns in buttons (#31468)
* Gets rid of spawns in buttons

* Update doorcontrol.dm
2017-10-09 19:01:37 -05:00
Robustin
c40b82c07d Fixes Teslas always doing the same movement pattern (#31469)
* Random tesla movement

* Parenthesis
2017-10-09 19:01:31 -05:00
Leo
afec2b7abc Merge pull request #31463 from AnturK/nobodycanknowofmymistakes
Stops check antags message if round has not started yet.
2017-10-09 16:02:37 -05:00
KorPhaeron
e7800a2235 Uses the proper list for xeno landmarks/nightmare spawning (#31470) 2017-10-09 16:00:24 -05:00
jughu
1cb06f855e Update uplink_item.dm (#31448) 2017-10-09 14:25:30 -05:00
XDTM
7a0ce217db Refactors virus spreading 2017-10-09 08:55:57 -05:00
LetterJay
ea41c07221 white 2017-10-08 22:47:42 -05:00
LetterJay
4f033a7137 Merge pull request #3244 from Citadel-Station-13/upstream-merge-31422
[MIRROR] Internals set to 0 pressure will properly prevent breathing environment air
2017-10-08 23:35:56 -04:00
LetterJay
7d4b0961f0 Merge pull request #3243 from Citadel-Station-13/upstream-merge-31358
[MIRROR] Basilisks are now gold core spawnable: Cyberboss likes me this time edition
2017-10-08 23:35:43 -04:00
LetterJay
b796fdb31e Merge pull request #3238 from Citadel-Station-13/upstream-merge-31379
[MIRROR] Layers pAIs under mobs to stop bodyblocking
2017-10-08 23:32:22 -04:00
XDTM
a49441b1e2 Internals set to 0 pressure will prevent breathing environment air (#31422) 2017-10-08 19:09:34 -05:00
Armhulen
62a6867f2e Makes Basilisks gold slime spawnable. (#31358) 2017-10-08 18:30:45 -05:00
kevinz000
687b329b7b Update pai.dm (#31379) 2017-10-08 15:47:32 -05:00
FrozenGuy5
3e6fcaec28 Fixes c20r damage (#31425)
* Fixes c20r damage

* minor pointless documentation
2017-10-08 15:36:04 -05:00
LetterJay
1f349aeccc Merge pull request #3233 from Citadel-Station-13/upstream-merge-31419
[MIRROR] Makes the noop turf less eyerapey
2017-10-08 16:24:41 -04:00
LetterJay
5e2deeff84 Merge pull request #3232 from Citadel-Station-13/upstream-merge-31411
[MIRROR] Dedicated equipment removal proc
2017-10-08 16:24:20 -04:00
LetterJay
56f05a8476 Merge pull request #3230 from Citadel-Station-13/upstream-merge-31414
[MIRROR] Fixes mob swap on tables.
2017-10-08 16:23:43 -04:00
LetterJay
f046f4f15b Merge pull request #3225 from Citadel-Station-13/upstream-merge-31413
[MIRROR] Removes useless commented-out what-if code from the 1970s
2017-10-08 16:22:10 -04:00
LetterJay
71cec9faad Merge pull request #3223 from Citadel-Station-13/upstream-merge-31409
[MIRROR] Buckled mobs rotation fix
2017-10-08 16:21:24 -04:00
LetterJay
8ea93639ca Merge pull request #3222 from Citadel-Station-13/upstream-merge-31405
[MIRROR] Gives ghosts direction is their meaningless existence
2017-10-08 16:21:06 -04:00
LetterJay
23eddf5a3c Merge pull request #3218 from Citadel-Station-13/upstream-merge-31306
[MIRROR] Fixes being able to sell camera mobs to CentCom
2017-10-08 16:20:11 -04:00