Commit Graph

482 Commits

Author SHA1 Message Date
LetterJay
1f88a8d866 Merge pull request #475 from Citadel-Station-13/upstream-merge-26334
[MIRROR] Fixes ghosts not hearing whispers with the toggle on
2017-04-19 18:33:56 -05:00
LetterJay
95ec46d54b Merge pull request #489 from Citadel-Station-13/upstream-merge-26319
[MIRROR] Moves simple animal automation from SSmob to SSnpc
2017-04-19 18:33:18 -05:00
LetterJay
8bc8295a08 Merge pull request #487 from Citadel-Station-13/upstream-merge-26324
[MIRROR] Adds defines for evenly splitting up a subsystem's time to fire
2017-04-19 18:33:00 -05:00
LetterJay
b926fd3c8f Merge pull request #486 from Citadel-Station-13/upstream-merge-26366
[MIRROR] Fixes support holoparasites
2017-04-19 18:32:46 -05:00
LetterJay
a590ea300e Merge pull request #485 from Citadel-Station-13/upstream-merge-26339
[MIRROR] Updates travis and the config to require byond 511
2017-04-19 18:32:33 -05:00
LetterJay
ab21c62f2f Merge pull request #484 from Citadel-Station-13/upstream-merge-26355
[MIRROR] Fixes showcases not initializing
2017-04-19 18:32:18 -05:00
LetterJay
367c2cf5eb Merge pull request #483 from Citadel-Station-13/upstream-merge-26356
[MIRROR] Fixes action transfer
2017-04-19 18:32:08 -05:00
LetterJay
97e6297a00 Merge pull request #482 from Citadel-Station-13/upstream-merge-26360
[MIRROR] Fixes a nullrod runtime
2017-04-19 18:31:55 -05:00
LetterJay
ce4c2428a8 Merge pull request #480 from Citadel-Station-13/upstream-merge-26353
[MIRROR] Removes a colon
2017-04-19 18:31:16 -05:00
LetterJay
5e0fd179bb Merge pull request #477 from Citadel-Station-13/upstream-merge-26285
[MIRROR] Cult stuff now initializes
2017-04-19 18:29:35 -05:00
LetterJay
6a415b20a7 Merge pull request #476 from Citadel-Station-13/upstream-merge-26321
[MIRROR] Fixes flashlight eyes
2017-04-19 18:29:25 -05:00
LetterJay
2c5d64cec2 Merge pull request #474 from Citadel-Station-13/upstream-merge-26327
[MIRROR] Makes the monkey-to-human effect spawn in the correct position
2017-04-19 18:29:12 -05:00
LetterJay
c81c6edf24 Merge pull request #473 from Citadel-Station-13/upstream-merge-26318
[MIRROR] Prevents mutation toxin from working on nonhumans, removes a spawn
2017-04-19 18:28:59 -05:00
CitadelStationBot
dbd0af6b5c Moves simple animal automation from SSmob to SSnpc 2017-04-19 16:48:45 -05:00
CitadelStationBot
fa17a7680b Adds defines for evenly splitting up a subsystem's time to fire 2017-04-19 16:47:37 -05:00
CitadelStationBot
a7cd9335da Fixes support holoparasites 2017-04-19 16:45:31 -05:00
CitadelStationBot
849dd5cb76 Updates travis and the config to require byond 511 2017-04-19 16:42:24 -05:00
CitadelStationBot
0d4a7f2888 Fixes showcases not initializing 2017-04-19 14:08:56 -05:00
CitadelStationBot
02b1e41ec3 Fixes action transfer 2017-04-19 14:07:49 -05:00
CitadelStationBot
0b9ed09965 Fixes a nullrod runtime 2017-04-19 14:06:44 -05:00
CitadelStationBot
77df269541 Removes a colon 2017-04-19 09:30:58 -05:00
CitadelStationBot
73d4469db5 Cult stuff now initializes 2017-04-19 04:40:07 -05:00
CitadelStationBot
aa95a64a92 Fixes flashlight eyes 2017-04-19 04:34:58 -05:00
CitadelStationBot
81ad880f54 Fixes ghosts not hearing whispers with the toggle on 2017-04-19 04:33:54 -05:00
CitadelStationBot
23d140abb9 Makes the monkey-to-human effect spawn in the correct position 2017-04-19 04:33:50 -05:00
CitadelStationBot
7c83a27610 Prevents mutation toxin from working on nonhumans, removes a spawn 2017-04-19 04:33:47 -05:00
CitadelStationBot
80ec92c9bd Gives wirecutters origin tech 2017-04-19 04:32:43 -05:00
Poojawa
ce577dc22c Citadel sprite file cleanups (#429)
* Special folder cleanup

moved mam_body_markings and mam_taur to regular mob list for easier
locating. moved tail.dmi and wing.dmi to special

* oh

* this too.

* ports #423

alphabetatizes sprites because it was messy

* tweak special folder name to be clearer

* Travis appeasement
2017-04-18 23:05:17 -05:00
LetterJay
98463ad892 Merge pull request #469 from Citadel-Station-13/upstream-merge-26320
[MIRROR] [s] Fixed ORM exploit
2017-04-18 20:34:04 -05:00
LetterJay
58d2d4230f Merge pull request #468 from Citadel-Station-13/upstream-merge-26315
[MIRROR] Micro optimization for handle_breathing
2017-04-18 20:33:44 -05:00
LetterJay
799c642ecd Merge pull request #467 from Citadel-Station-13/upstream-merge-26317
[MIRROR] Makes malf-hacked APCs vulnerable to aliens
2017-04-18 20:33:34 -05:00
LetterJay
bf9b06ee8b Merge pull request #466 from Citadel-Station-13/upstream-merge-26283
[MIRROR] Stethoscope fixes
2017-04-18 20:32:09 -05:00
LetterJay
0735c6f59a Merge pull request #465 from Citadel-Station-13/upstream-merge-26277
[MIRROR] Adds feedback for photocopier on something specific.
2017-04-18 20:31:57 -05:00
LetterJay
950752b1f9 Merge pull request #463 from Citadel-Station-13/upstream-merge-26298
[MIRROR] Revert unrelated change from #24878
2017-04-18 20:31:36 -05:00
LetterJay
65dd63b710 Merge pull request #462 from Citadel-Station-13/upstream-merge-26300
[MIRROR] Arbitary code cleaning
2017-04-18 20:28:20 -05:00
LetterJay
ec88717fe7 Merge pull request #461 from Citadel-Station-13/upstream-merge-26287
[MIRROR] Removes 7 seconds from world init
2017-04-18 20:26:54 -05:00
LetterJay
97016b0872 Merge pull request #460 from Citadel-Station-13/upstream-merge-26323
[MIRROR] Speeds up lighting initialization
2017-04-18 20:23:41 -05:00
LetterJay
405b71335e Merge pull request #459 from Citadel-Station-13/upstream-merge-26322
[MIRROR] Normalizes how some lighting things GC
2017-04-18 20:21:42 -05:00
LetterJay
67d76fd560 Merge pull request #457 from Citadel-Station-13/upstream-merge-26313
[MIRROR] Fixes proximity monitor runtimes
2017-04-18 20:12:18 -05:00
LetterJay
8fe7567163 Merge pull request #451 from Citadel-Station-13/upstream-merge-26281
[MIRROR] Moves a temp file to the data tree
2017-04-18 20:10:46 -05:00
CitadelStationBot
bc6c48d009 [s] Fixed ORM exploit 2017-04-18 18:15:09 -05:00
CitadelStationBot
e0b1c95b79 Micro optimization for handle_breathing 2017-04-18 18:14:03 -05:00
CitadelStationBot
ee2581bd76 Makes malf-hacked APCs vulnerable to aliens 2017-04-18 18:13:58 -05:00
CitadelStationBot
68a67c703c Stethoscope fixes 2017-04-18 18:09:51 -05:00
CitadelStationBot
47b83e746e Adds feedback for photocopier on something specific. 2017-04-18 18:07:45 -05:00
CitadelStationBot
b32105d315 Revert unrelated change from #24878 2017-04-18 18:05:37 -05:00
CitadelStationBot
0c19ba163e Arbitary code cleaning 2017-04-18 18:05:33 -05:00
CitadelStationBot
15636e175a Removes 7 seconds from world init 2017-04-18 18:04:29 -05:00
CitadelStationBot
d19efeba8b Speeds up lighting initialization 2017-04-18 18:02:23 -05:00
CitadelStationBot
53ac3bcb82 Normalizes how some lighting things GC 2017-04-18 18:02:20 -05:00