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
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
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
TalkingCactus
6f0aa809df
Patches for 4/18/17 ( #454 )
...
* fixes modular receiver sprites
* fixes legs rendering for taurs
* fixes shoes not rendering in UI for nagas
* typo fix in preferences.dm
* crewsimov
* Revert "fixes legs rendering for taurs"
This reverts commit 8a64c0c80af8a6798639bb151d1448eeb454ac5d.
* fixes looc logging
* fixes gamemode voting
* admin respawn bypass
* thanks GitHub Desktop
totally wanted to omit the very important if()
* proc tweak
* savefile sanitizing
2017-04-18 18:38:23 -04:00
CitadelStationBot
3f6d0f2647
Fixes proximity monitor runtimes
2017-04-18 11:07:54 -05:00
CitadelStationBot
152c0ffdd0
Moves a temp file to the data tree
2017-04-18 03:47:11 -05:00
LetterJay
cfd79eb7b7
Merge pull request #449 from Citadel-Station-13/upstream-merge-26296
...
[MIRROR] Slight shotgun tweak to lose a spawn
2017-04-18 01:16:08 -05:00
LetterJay
228cf30ca0
Merge pull request #448 from Citadel-Station-13/upstream-merge-26288
...
[MIRROR] Adds suppression to the foam pistol, smg, and c20r, fixes #26248
2017-04-18 01:15:53 -05:00
LetterJay
9050099156
Merge pull request #446 from Citadel-Station-13/upstream-merge-26291
...
[MIRROR] >Can't stop fucking up spacevine PRs
2017-04-18 01:15:29 -05:00
LetterJay
85f2f651d3
Merge pull request #444 from Citadel-Station-13/upstream-merge-26301
...
[MIRROR] Removed commented code from ties.dm
2017-04-18 01:15:19 -05:00
LetterJay
2761f60e8c
Merge pull request #443 from Citadel-Station-13/upstream-merge-26331
...
[MIRROR] fixes the garbage subsystem not working, at all.
2017-04-18 01:15:04 -05:00
LetterJay
06a3a12172
Merge pull request #441 from Citadel-Station-13/upstream-merge-26231
...
[MIRROR] Adds investigative logging for shooting the SM
2017-04-18 01:14:54 -05:00
LetterJay
dade9c18d9
Merge pull request #439 from Citadel-Station-13/upstream-merge-26228
...
[MIRROR] Standardizes subsystem Shutdown order
2017-04-18 01:13:53 -05:00
LetterJay
27a585f173
Merge pull request #434 from Citadel-Station-13/upstream-merge-26270
...
[MIRROR] Makes radio keys table more compact and easy to change
2017-04-18 01:12:35 -05:00
LetterJay
6e54eb217c
Merge pull request #433 from Citadel-Station-13/upstream-merge-26276
...
[MIRROR] Removes rogue GLOB from message
2017-04-18 01:12:11 -05:00