Commit Graph

13557 Commits

Author SHA1 Message Date
Crazy Lemon
35261c8e58 Merge pull request #7119 from Krausus/TheyreBiggerOnTheInside
Fixes missing storage limitations on matchboxes
2017-04-17 20:01:23 -07:00
Krausus
4572ad6af4 Fixes matchboxes lacking storage limitations 2017-04-16 22:53:03 -04:00
KasparoVy
dfeee91420 GEMK Injector Fix
I forgot to include this in the PR I wrote that added the 6 new UI
blocks. Woops!

Anyway, this fixes the GEMK injector.
This also fixes a bug where injecting yourself with a UI that affects
eye colour (i.e. GEMK) wouldn't actually change your eye colour unless
you injected yourself twice (to proc UpdateAppearance a second time,
when really all you needed was update_eyes to be called).
2017-04-16 19:56:19 -04:00
Fox McCloud
84885f1efa Merge pull request #7007 from uraniummeltdown/glass
Heat Proofing Glass Airlocks
2017-04-16 17:55:10 -04:00
Fox McCloud
071b187268 Merge pull request #7097 from KasparoVy/sechaircol_genefix
Adds Secondary (Facial) Hair Colours to Genome
2017-04-16 17:50:07 -04:00
Mieszko Jędrzejczak
22a753957d Conflicts! 2017-04-16 19:21:20 +02:00
Crazy Lemon
c04e0634f8 Merge pull request #6867 from FalseIncarnate/potato
Collaborators are no longer clueless about Syndicate
2017-04-16 10:12:15 -07:00
FlattestGuitar
8978f1e530 Fluffpocalypse 2017-04-15 22:05:15 +02:00
KasparoVy
fa2d5fc3f3 Adds Secondary (Facial) Hair Colours to Genome 2017-04-13 23:09:09 -04:00
Fox McCloud
e9156ef71b Merge pull request #7036 from FlattestGuitar/desolate-fluff
Adds a fluff item for DesolateG 👌
2017-04-11 19:52:14 -04:00
Fox McCloud
0edc5400b3 Merge pull request #7080 from SamHPurp/loyalty-to-mindshield
Refactors any remaining Loyalty references to Mindshield
2017-04-11 19:50:59 -04:00
Fox McCloud
be2ceef4ab Merge pull request #7068 from FalseIncarnate/bugfix
[s] Shadowling "Extend Shuttle" prevents recall
2017-04-11 18:53:37 -04:00
FlattestGuitar
c73eb10c1b Adds a fluff item for DesolateG 2017-04-12 00:41:20 +02:00
Sam
e291a7ec6f Fixes 7082 2017-04-10 01:10:20 +01:00
Crazy Lemon
ff271f7b29 Merge pull request #7061 from Fox-McCloud/damn-cells
Damn cells
2017-04-09 13:55:30 -07:00
Crazy Lemon
cc649db525 Merge pull request #6894 from Fox-McCloud/abductor-hearts
Abductor Gland Rework and Abductor Updates
2017-04-09 13:40:01 -07:00
Sam
932cae0224 Loyalty implant -> Mindshield Implant 2017-04-09 16:50:51 +01:00
FalseIncarnate
971cc07d04 Shadowling "Extend Shuttle" prevents recall
The Shadowling ability "Extend Shuttle" now prevents the shuttle from
being recalled.
- The announcement when the ability is successful now also informs the
crew of this inability to recall.

Additionally, attempts to recall a shuttle which cannot be recalled due
to the canRecall var will no longer be logged since they don't succeed.
2017-04-07 02:43:01 -04:00
Fox-McCloud
d07f49433a oh, this is what you meant.... 2017-04-06 06:38:28 -04:00
Fox-McCloud
ec223e040e fixes 2017-04-06 06:37:18 -04:00
Crazy Lemon
23180656c0 Merge pull request #7050 from Fox-McCloud/autopsy-fix
Fixes+Refactors Autopsy Scanner Printing
2017-04-06 00:04:28 -07:00
Crazy Lemon
f9ee33a797 Merge pull request #7054 from Fox-McCloud/destroy-qdelnull
Converts Most Destroys to use QDEL_NULL
2017-04-05 23:49:19 -07:00
Fox-McCloud
ab5cab5af7 tweak 2017-04-05 23:46:53 -04:00
Fox McCloud
f9aaeeed7d Merge pull request #6966 from SamHPurp/Photograph-blueprints
Enables Syndicate Paparazzi
2017-04-05 19:32:38 -04:00
Fox McCloud
4ad7cd17fd Merge pull request #7043 from SamHPurp/assorted-fixes
Fixes
2017-04-05 19:15:12 -04:00
Fox McCloud
61eff3aa1f Merge pull request #7051 from SamHPurp/light-cigs-with-fireballs
Enables lighting cigarettes with Wands of Fireball
2017-04-05 19:11:34 -04:00
Fox-McCloud
5631d36ff8 Converts Most Destroys to use QDEL_NULL 2017-04-04 23:08:41 -04:00
Sam
4fc96b7d21 Wizards always succeed
By request of Fox.
2017-04-05 00:59:04 +01:00
Sam
97925b227a I hate Github for Desktop sometimes. 2017-04-05 00:35:38 +01:00
Sam
86a0d5839c Fixes a few issues 2017-04-05 00:35:10 +01:00
Sam
89f10e834c boom 2017-04-04 23:46:55 +01:00
Fox-McCloud
2205c14b7d Fixes+Refactors Autopsy Scanner Printing 2017-04-04 18:13:35 -04:00
Sam
2432c16ab4 Adds missing antag objectives to cryo 2017-04-04 17:50:52 +01:00
Sam
3dd25683ec Fixes cryopod list 2017-04-04 17:06:15 +01:00
Sam
88ec05be4e Couple typos and a gramatically tweak 2017-04-04 14:27:22 +01:00
Sam
5aed0b3fa4 Fixes missing cult robe 2017-04-04 09:51:41 +01:00
Fox-McCloud
8fb17b2bee moarrr 2017-04-04 04:26:53 -04:00
Sam
ae6dac5c5a Fixes Recitence -> Reticence 2017-04-04 09:04:03 +01:00
Fox-McCloud
9a20311152 better QDEL_NULL 2017-04-04 00:35:42 -04:00
Fox-McCloud
21b1c091ad more things 2017-04-03 19:44:04 -04:00
Fox-McCloud
fb02933f30 For qdel and Destroy Fixes 2017-04-03 19:06:20 -04:00
Crazy Lemon
71f7ecc454 Merge pull request #7017 from Kyep/cult_manifest
Cult Manifest Bugfix / Tweaks
2017-04-03 01:16:10 -07:00
Crazy Lemon
de8c504a19 Merge pull request #6910 from SamHPurp/spawner-map-utilities
Adds tools for mappers
2017-04-03 01:14:16 -07:00
Kyep
85f2d4141b Fox requests 2017-04-02 02:58:27 -07:00
Fox-McCloud
0578dc56de More GC Fixes and Logging 2017-04-02 03:38:18 -04:00
Crazy Lemon
c6abe7822b Merge pull request #6961 from Fox-McCloud/garbage-collect-stuffs
Garbage Collection and Code Cleanup
2017-04-01 22:58:52 -07:00
Kyep
b1cdaeea35 and Cut() 2017-04-01 22:00:58 -07:00
Kyep
adf513b0bb CL request 2017-04-01 21:55:13 -07:00
Fox-McCloud
183702a36e fix up 2.0 2017-04-02 00:38:14 -04:00
Fox McCloud
c00d228fc7 Merge pull request #6987 from Kyep/cult_sac_fix
Fixes cults not getting new sac target when target cryos
2017-04-01 23:07:54 -04:00