Commit Graph

14079 Commits

Author SHA1 Message Date
FalseIncarnate
8d15e683a6 WOLOLO cleanup
Cleans up those nasty trailing returns, colons, and other clutter. Also
went ahead and removed the colons from the original mindslave code I
copied.

Converting loyalty implanted crew now results in a shorter zealot
duration. Previously, all crew was a zealot for 10 minutes, now crew
that is loyalty implanted AT THE TIME OF CONVERSION remains a zealot for
only 5 minutes before deconverting.
2016-08-12 21:29:18 -04:00
FalseIncarnate
8028695077 WOLOLO AEOOEO 2016-08-10 23:40:02 -04:00
FalseIncarnate
20b33bcb1f WOLOLO
New traitor chaplain items: Missionary Robe and Missionary Staff.

They look like ordinary chaplain hoodies, but the Missionary Robes
actually are armored and can be linked to a single Missionary Staff to
recharge "faith" while wearing the robes.

The Missionary Staff looks like either the red or blue godstaff
nullrods, and is also a nullrod (can't be reskinned). However, the true
power comes when linked to a set of Missionary Robes, charging the staff
with "faith" that can be used to perform ranged conversions on
individual targets within sight of the missionary.

Conversions mimic the effects of a mindslave implant, except that it
only last for 10 minutes before the victim returns to normal. The victim
is specifically told when they deconvert that they forget their actions
and master. Conversion is able to overcome loyalty implants sometimes,
but if successful it will take longer than normal to recharge. Likewise,
the more "educated" crew members (psychiatrist and librarian) are more
resistant to conversion, though much less so than the loyalty implanted
crew (these resistances do not stack). Civilians, on the other hand,
have a chance to only use half the "faith" of a normal conversion,
meaning you can attempt another conversion much sooner. Crew that is
already mindslaved (whether by a staff or implant) cannot be converted,
as they are already mentally dominated, so this can also potentially
help you make a new traitor friend if you play your cards right.

Successfully converting a crew member mindslaves them to you for 10
minutes, and recolors their worn jumpsuit to match the color of your
staff (red or blue, chosen randomly when the staff is spawned). Failure
to convert a target expends 25-75 "faith" (based on circumstances),
while a successful conversion typically uses 100 "faith" but can use
more or less in special cases. As long as you wear the Missionary Robes
and keep your Missionary Staff close by, the "faith" recharges passively
and will notify you when you are able to attempt another conversion.

Times, chances, and values are subject to change.

TODO: Upon conversion, play "WOLOLO" to the missionary and new zealot,
to inform them both of the good news. Also, testing.
2016-08-10 06:39:13 -04:00
Ronald T. Mullins III
13eaf6eac6 Fix for #5386
Also includes mix_messages for synthignon and synth n' soda because neither of them are BLUE
2016-08-09 16:14:58 -05:00
Fox McCloud
a8ecd38ed9 Merge pull request #5387 from Alexshreds/paifix
When the Copy Pasta Monster Fails...
2016-08-09 16:43:34 -04:00
Fox McCloud
0226259095 Merge pull request #5376 from FlattestGuitar/stumpy-fluff
Fluff item - Stumpy's hat.
2016-08-09 04:36:47 -04:00
Krausus
2bec576fdc Adds qdels for some temporary humans 2016-08-09 02:58:36 -04:00
Chakirski
5123e47c21 Holy fuck batman look at all those tabs! 2016-08-09 01:19:37 -05:00
Fox McCloud
607642d4ef Revert "Refactors Markings, Adds Tail (some body and head) markings, Adds Alt heads, Secondary (F)Hair Themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more..." 2016-08-08 23:26:51 -04:00
Fox McCloud
86d0c0b2b9 Merge pull request #5147 from KasparoVy/tail-markings
Refactors Markings, Adds Tail (some body and head) markings, Adds Alt heads, Secondary (F)Hair Themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more...
2016-08-08 21:58:45 -04:00
TheDZD
f7b6928a9f Merge pull request #5355 from Fox-McCloud/malf-ai-update
Malf AI Powers Update
2016-08-08 21:30:12 -04:00
TheDZD
a1448a10d8 Merge pull request #5367 from Fox-McCloud/fix-copies
Illusion Simple Animals Have Attack Sounds
2016-08-08 20:37:56 -04:00
TheDZD
4c3db67479 Merge pull request #5369 from Fox-McCloud/portal-fix
Wormhole Event Fix, Portal GC Fix
2016-08-08 20:37:27 -04:00
TheDZD
acbbccb774 Merge pull request #5359 from Fox-McCloud/accessory-armor
Allows Accessories to Have Armor
2016-08-08 20:37:08 -04:00
Mieszko Jędrzejczak
5320bed0af *sigh* 2016-08-09 02:05:52 +02:00
Mieszko Jędrzejczak
859608be54 Let's get drunk. 2016-08-09 01:42:49 +02:00
Mieszko Jędrzejczak
76b4ca307c Stumpy's hat. 2016-08-09 01:33:10 +02:00
Fox-McCloud
340d397382 Wormhole Event Fix, Portal GC Fix 2016-08-08 09:03:30 -04:00
Fox McCloud
b1c87f319d Merge pull request #5316 from Crazylemon64/map_writer
Adds a "Save" buildmode
2016-08-08 02:34:02 -04:00
Fox-McCloud
aa1e0407d4 Illusion Simple Animals Have Attack Sounds 2016-08-08 00:20:13 -04:00
Fox McCloud
63fa330885 Merge pull request #5314 from Chakirski/AIholopets
Adds AI Holopets
2016-08-07 23:06:59 -04:00
Fox McCloud
bf52aec722 Merge pull request #5348 from LittleBigKid2000/aesthetic-sunglasses
Adds cosmetic sunglasses
2016-08-07 23:06:20 -04:00
LittleBigKid2000
0eed28cdba Corgi Gender Equality (#5330)
* Corgi Gender Equality

* I'd prefer to die on my own terms, thanks
2016-08-07 23:06:07 -04:00
TheDZD
bc2ce6a7b0 Merge pull request #5349 from Fox-McCloud/headphones
Adds in Headphones
2016-08-07 22:58:35 -04:00
TheDZD
6d449de47a Merge pull request #5344 from Fox-McCloud/atom-say
Atom Say Refactor
2016-08-07 22:57:32 -04:00
Crazylemon64
342fcad5d5 All is ablaze 2016-08-07 13:43:15 -07:00
Crazylemon64
360f073609 Removes buffer_line, makes model saving for cluttered tiles quick 2016-08-07 13:36:18 -07:00
Crazylemon64
ffd47933e5 Map writer is now legible in DM, saves 19x faster 2016-08-07 12:02:43 -07:00
Fox-McCloud
40bbf6a788 Allows Accessories to Have Armor 2016-08-07 11:06:37 -04:00
Fox-McCloud
35557881ab Malf AI Powers Update 2016-08-07 04:48:21 -04:00
Crazylemon64
a9f3d0464e Makes the json-maploader legible in DM 2016-08-06 17:40:33 -07:00
Fox-McCloud
f5826a0c2b Adds in Headphones 2016-08-06 19:55:08 -04:00
Isaac Erwin
4b46c2cf6b Adds cosmetic sunglasses 2016-08-06 19:43:55 -04:00
chopchop1614
fe242bcee0 Update bscrystal.dm 2016-08-07 00:33:52 +01:00
chopchop1614
692754c81a fox's changes 2016-08-07 00:31:36 +01:00
chopchop1614
8d26c41cb1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into keta 2016-08-07 00:16:03 +01:00
chopchop1614
c4756e39e1 fox's suggestion 2016-08-07 00:11:00 +01:00
Fox-McCloud
03eb9be741 Atom Say Refactor 2016-08-06 06:45:20 -04:00
Fox McCloud
e4756ba621 Merge pull request #5342 from Earthdivine/Secrets-Rename
Strike Team Clarity
2016-08-05 19:59:44 -04:00
Fox McCloud
38206e5b61 Merge pull request #5334 from FlattestGuitar/holy
Nerfs holy water.
2016-08-05 19:33:40 -04:00
Earthdivine
bd4fa6de04 Changed "Send in a strike team" to "Send in the Deathsquad." for more clarity. 2016-08-05 18:19:11 -05:00
Isaac Erwin
f5c0455de5 Oh 2016-08-05 18:58:38 -04:00
Isaac Erwin
f2c1c7406d Various grammar/spelling fixes 2016-08-05 18:43:33 -04:00
Mieszko Jędrzejczak
3888bcb1f1 Makes holy water stutters non-op 2016-08-05 00:38:31 +02:00
Fox McCloud
7476da1c49 Merge pull request #5294 from yurivw/shuttleoptions
Removed unused options in secrets menu
2016-08-04 17:48:41 -04:00
Fox McCloud
2b467d50c8 Merge pull request #5318 from Chakirski/SpritFixes
Fixes Sprite Voodoo and Hoodies
2016-08-04 17:47:26 -04:00
Krausus
e9886d05fc Human overlay caching and minor overlay fixes 2016-08-04 11:14:56 -04:00
Chakirski
1f703104e4 Less stealth more sprite. 2016-08-03 22:54:00 -05:00
TheDZD
44ae3a4a68 Merge pull request #5309 from Fox-McCloud/field-generators
Field Generator Cleanup, Singularity Fixes,
2016-08-03 23:29:09 -04:00
Crazylemon64
40fe120067 Whoops 2016-08-03 20:04:14 -07:00