Commit Graph

350 Commits

Author SHA1 Message Date
LetterJay
f3839fc13b Merge pull request #512 from Citadel-Station-13/upstream-merge-26418
[MIRROR] Secrets panel logging is better
2017-04-22 14:39:17 -05:00
LetterJay
691d973871 Merge pull request #506 from Citadel-Station-13/upstream-merge-26402
[MIRROR] Prevents fultons from transporting items out of inventories
2017-04-22 14:37:01 -05:00
LetterJay
0db0c55ade Merge pull request #507 from Citadel-Station-13/upstream-merge-26408
[MIRROR] Conveyor movement refactor/fix
2017-04-22 14:36:22 -05:00
LetterJay
05ff3f2ce8 Merge pull request #505 from Citadel-Station-13/upstream-merge-26403
[MIRROR] Fixes languages being understood over radio
2017-04-22 14:36:01 -05:00
CitadelStationBot
a50d9e9860 Secrets panel logging is better 2017-04-22 07:08:28 -05:00
LetterJay
3fd98abb56 Merge pull request #503 from Citadel-Station-13/upstream-merge-26409
[MIRROR] Fixes proximity checkers being moved by shuttles
2017-04-21 23:58:23 -05:00
LetterJay
0a16209a15 Merge pull request #502 from Citadel-Station-13/upstream-merge-26411
[MIRROR] Fixes supermatter not spawning teslas
2017-04-21 23:58:07 -05:00
CitadelStationBot
1a93abc66e Conveyor movement refactor/fix 2017-04-21 17:28:09 -05:00
CitadelStationBot
01f99160ad Prevents fultons from transporting items out of inventories 2017-04-21 17:26:04 -05:00
CitadelStationBot
a975a35f92 Fixes languages being understood over radio 2017-04-21 17:24:59 -05:00
CitadelStationBot
7b52afcb85 Fixes proximity checkers being moved by shuttles 2017-04-21 17:22:50 -05:00
CitadelStationBot
7fd1d66310 Fixes supermatter not spawning teslas 2017-04-21 17:20:46 -05:00
CitadelStationBot
d89b67a9e2 Fixes gold and light pink slime extracts 2017-04-21 17:19:42 -05:00
Squi-RL
fc1fd4b72b Acorn hologram & bug fix for eevee tails (#471)
* Edited Eevee wag code

fixes the issue where the tail tip color disappears while wagging

* Adds an acorn hologram

as the title says, adds an acorn hologram... it's animated too!

* Adds code to support the Acorn

allows an AI to select "acorn" from the unique hologram catagory
2017-04-20 22:05:17 -05:00
CitadelStationBot
19f06b5114 Fixes armlasers breaking on retract (#498) 2017-04-20 22:03:30 -05:00
CitadelStationBot
e832d79be9 Fixes some closets populating in New() (#497) 2017-04-20 22:03:09 -05:00
CitadelStationBot
afdabc97ec Fixes loading ammo for the L6-SAW (#496) 2017-04-20 22:02:26 -05:00
CitadelStationBot
032baebb85 Adds badmin abuse limits to petsplosions (#492) 2017-04-20 22:01:48 -05:00
CitadelStationBot
a7f6c44681 Fixes DVIEW runtimes in preferences. (#490) 2017-04-20 22:01:29 -05:00
Poojawa
f866139c52 Admin ticket tgstyle (#493)
* some porting

* other changes
2017-04-20 22:00:47 -05:00
Poojawa
03ed17649c Tweaked belly sounds 2017-04-20 13:34:27 -05:00
Poojawa
e760a8a472 Vore sound tweaks (#491)
* sound overhaul

* renaming folders correctly

* sound code and compile fixes

* sounds working

testing prey-induced loop, as well

* loops should stop upon ejections
2017-04-20 09:08:26 -05:00
LetterJay
de2d0985c4 Merge pull request #440 from Citadel-Station-13/upstream-merge-26134
[MIRROR] Refactors dbcon into a subsystem
2017-04-19 20:46:02 -05:00
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
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
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
CitadelStationBot
dbd0af6b5c Moves simple animal automation from SSmob to SSnpc 2017-04-19 16:48:45 -05:00
CitadelStationBot
a7cd9335da Fixes support holoparasites 2017-04-19 16:45:31 -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
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
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
CitadelStationBot
bc6c48d009 [s] Fixed ORM exploit 2017-04-18 18:15:09 -05:00