Commit Graph

388 Commits

Author SHA1 Message Date
KorPhaeron 5170693100 Removed extra line, thanks Incoming 2015-06-25 03:37:48 -05:00
KorPhaeron 91556b65fa Wizards have no sense of right and wrong 2015-06-25 02:10:52 -05:00
Thunder12345 1c83cc6d45 Pray pray pray 2015-06-18 18:07:57 +01:00
Thunder12345 bfb2345726 Moved combat shotguns to shotgun/automatic/combat
- shotgun/automatic/ will pump itself automatically on firing
 - combat shotgun capacity nerfed to 6 rounds
 - replaced all instances of the old path with the new one
2015-06-17 15:25:59 +01:00
Remie Richards 9361c5efcd Merge pull request #9973 from KorPhaeron/thirdtimesthecharm
Slaughter Demon
2015-06-15 17:25:01 +01:00
KorPhaeron ce933a1a97 Slaughter Demon (again)
Had to recreate because I couldn't resolve the merge conflict.

New side event/antagonist. Simple animal that can use pools of blood as
portals to move around the station. Spooky scary.

-CtrlClick on an adjacent blood pool (or turf with blood on it) to
"enter" (start an infinite duration jaunt
-CtrlClick on a blood pool while jaunted to exit at that pool
-If you're pulling a mob while you enter a pool, the mob gets pulled in
with you, and you devour them, healing yourself
-Night vision

Adds an event (admin only) that spawns one.

Adds wizard item for summoning it. Has objective to kill the wizard (and
everyone else).

Also fixes typo/filepath for the scrying orb in the new wizard datum
thing.

If someone could help me with mind stuff so I can track how many people
it eats that'd be great.

Webm

http://www.singulo.io/tg/src/1433549232359.webm
2015-06-15 09:41:03 -05:00
kingofkosmos c8d79e7034 Removed unnecessary spaces in these situations:
"span class = '" changed to "span class='"
"'> " changed to "'>"
2015-06-14 12:13:19 +03:00
Incoming 1f0097a74a Adds the bind soul spell for wizards. It turns them into a lich (skeleton) and gives them access to a long cooldown ressurection spell (starts at 3 minutes).
The ressurection spell can only be used while dead/dying and charges at all times. When used the lich gains a new body at the site of their phylactery and is stunned for a short while. Meanwhile the old wizard body crumbles to dust leaving all the wizards worldly possessions on the ground. Anyone who sees the corpse crumble will also get a cardinal direction pointing towards the wizard.

Every time the wizard dies this way, the time between ressurections is increased by a minute. To take a lich out of the game for good, either destroy the body before the lich can cast the spell again, or destory the phylactery and kill the wizard one last time.

Liches spawn with robes and spells intact, but nothing else, everything collected on their original body stays there.

As a balance issue, this spell can't be used in the den, the item must be bound after arriving at the station.

Adds a nice black wizard robe ensemble for liches.

Magic mirrors (save for a special badmin only one) can no longer skeletonize people.

Adds a hopeful mulligan fix to wizard rounds problems. Also corrects an adminlog message.
2015-06-10 03:40:14 -04:00
AnturK a4fbd97528 Adds summon sounds back 2015-06-03 16:32:56 +02:00
AnturK d9d5b99724 Just in case 2015-06-03 16:30:03 +02:00
AnturK e18a39da47 Splits the Spells into Offensive/Utility
Moves Uses to fake tab
Drops js implementation
2015-06-03 16:30:03 +02:00
AnturK 68509859c6 Spellbook refactor 2015-06-03 16:30:02 +02:00
Cheridan 2d998452db Merge pull request #9715 from Firecage/datumspaths
Changes alot of datum/ to /datum/, also includes other path types such as /obj/
2015-06-02 23:04:51 -05:00
Cheridan 2aa0247b00 Merge pull request #9701 from Cuboos/SoundsEp2_WizardBoogaloo
Wizard Sounds has the update. Been a bit since i've done a commit, so…
2015-05-31 15:51:59 -05:00
Firecage f79e0fc1aa Updates more paths, for example obj/stuff to /obj/stuff 2015-05-31 17:48:33 +02:00
Cuboos fcc18020a9 Wizard Sounds has the update. Been a bit since i've done a commit, so forgive me if i did this wrong. Also added the third title song, there a lot of agreement on what to do so i'll just add it as is, if a change needs to be made i'll do it later. 2015-05-29 20:29:37 -07:00
Incoming 69f8f6575b Antagonists Will No Longer Show Up as MODE in round end reports.
Instances where the game would give special treatment to MODE players will instead check to see if a player's assigned_role (job) matches their special_role (antag status). All antags that start off station (as well as ninjas for some weird reason) were affected.

Fixes #8743
2015-05-25 15:58:32 -04:00
phil235 aec94cecfb Merge pull request #9450 from Incoming5643/youdhavetobestoned
Mild Necromantic Stone Rework/Fix
2015-05-23 16:17:30 +02:00
Incoming5643 73b11ace3d Update artefact.dm
fixes a mild exploit
2015-05-17 19:49:45 -04:00
Jordie0608 8496b7958e veil renderer improvements 2015-05-12 19:07:31 +10:00
Incoming 83c5bc88b0 Mild Necromantic Stone Rework
Skeleton Thralls lose explicit antag status in favor of implicit "you can wreck shit if the guy who made you can" status, same as adamantium golems. Two reasons:

1. Ressurecting antags played fresh hell with mulligan chances on wizards
2. Every time the skeleton was reraised it'd get a new protection objective, meaning they could theoretically have dozens of the same objective

The roman armor gimmick is now a surefire thing.

The necromantic stone is moved from the normal summon magic pool to the special "only one of these spawned" pool due to what I believe are buffs.

Buffs the "serve the guy who raised you!" messages from notice all the way to userdanger, because people were just offering to skeleton people for free antag status and cool swords and ignoring what they were acutally supposed to be doing.
2015-05-10 21:35:48 -04:00
Jordie0608 f36d6bec08 fixes false rwalls not smooting, actually fixes barnyard improving 2015-05-10 21:17:46 +10:00
Jordie0608 0bb858001e fixes barnyward typo 2015-05-10 18:08:04 +10:00
Cheridan bd2a60495a Merge pull request #9367 from Incoming5643/ettuwizards
That damn wizard life check again
2015-05-09 14:01:21 -05:00
Incoming d38bb6ed72 Fixes a bug in wizard mulligans where dead wizards wouldn't trigger mulligans. I've stolen the malf version of the check to be sure it works decently enough (also I tested it, of course I did). 2015-05-06 02:56:07 -04:00
Incoming 23cc8c7db0 All modes now choose their antagonists before they choose jobs. A new mind attached list, restricted_roles, will keep incompatible jobs out of rotation.
Players who would otherwise qualify to play as an implanted job will spawn as the most wanted not implanted job they qualify for if they are an onstation antagonist. If they don't qualify for any job in this way depending on preferences they will either spawn as an assistant or a random job (which also makes sure they don't end up in an incompatible job).

Note this doesn't impact late join antagonists or mulligan antagonists. Roundstart only.
2015-05-05 23:29:03 -04:00
Jordie 0c08ffb95e Merge pull request #9183 from GoonOnMoon/ARG1
ARG Assault Rifle Addition
2015-04-28 23:49:33 +10:00
Jordie ba0f89b7f1 Merge pull request #9186 from phil235/AutoDrobeSupplyFix
Autodrobe and cult construct bugfixes
2015-04-28 23:49:20 +10:00
Cheridan 6938612555 Merge pull request #9149 from Incoming5643/generic_continuous
[new config options][the eternal playtest] Mulligans/Continuous for any roundtype
2015-04-27 08:45:52 -05:00
phil235 9e94f56103 Fixes Autodrobe not having any contraband/deluxe items in stock. Adding a warning to prevent future bug.
Fixes dropped resuply canisters having most charges go in a single canister (and going above the initial charge amount).
Fixes exploit with cult constructs creation.
2015-04-26 19:23:22 +02:00
GoonOnMoon e3ba2cce7d Fixes error in the summon guns spell that would have caused a runtime. 2015-04-26 10:09:37 -05:00
Incoming c4f6d85b44 Any roundtype can now take advantage of continuous/non-continuous settings as well as the mulligan antag system. (as a reminder at this point the mulligan system only creates lings and/or traitors)
A generic check for antags now exists in check_finished, and overrides a lot of checks in specific modes. Specific checks are still needed if you have special means of determining antag viability (blob cores), or things to do when specific antags die (summon events).

In situations where mulligans are on but fail, the round will usually lurch on as "extended" but in wizard/malf/blob/ragin mages the round will end then and there. This mirrors current behavior.

Config settings are fully customizable and for the most part defaults mirror existing behaviors:

Revolution, Shadowling, Gang, Ragin Mages and Monkey are noncontinuous and will end with the death of all antagonists.

* There is a change here in shadowling in that rounds with living thralls but no living shadowlings will continue until the thralls are delt with, as they can still raise their dead master.

* Abductors not ending with the death of all ayyliens if there are still probe victims around is likewise a change. If the dev of abduction would rather have it default the other way, we can do that.

* Monkey being noncontinuous is a change, but given how monkey mode works, it really only makes sense.

All modes that are continous use the mulligan system by default, remember that this will only come into effect if EVERY antagonist dies, so modes with many antagonists are very likely to only mulligan extremely rarely because if even one isn't slaughtered and is instead brigged or otherwise neutralized nonfatally the mulligan will never come. A nice little bonus for security not to kill everyone!

Fixes a bug where shuttle stranding could occur in continous rev modes (not something on by default)

Probably buggy as hell in initial commit. Please no quick merge
2015-04-24 15:40:42 -04:00
kingofkosmos e371dd9f35 more spans 2015-04-24 20:52:00 +03:00
GoonOnMoon a326594e0f Removes syndie tech origin from the ARG rifle. Adds it to summon guns. 2015-04-20 15:57:39 -05:00
Incoming f04d3a70d8 I thought mind.current was a safe thing to call without a check for its existence.
I thought wrong.

DEAD WRONG.

W2B - Round Code Standardization
2015-04-18 20:40:13 -04:00
Jordie 99d545d185 Merge pull request #8891 from Incoming5643/logic_who_needs_that
Fixes a few unreported logic goofs in my newest mulligan pull
2015-04-13 18:24:02 +10:00
AnturK e2c869bc77 - Adds generic action and action buttons system 2015-04-11 17:06:43 +02:00
Incoming 1ce1b5b67d Fixes a few unreported logic goofs in my newest mulligan pull 2015-04-11 03:41:17 -04:00
Incoming d1892cffbe Organizes the various continuous_round_x config options into one set of config options continuous. Functionality is only there for the same mode that already had that functionality, everything else is continuous always
Makes another set of config options for which rounds types, if any, use the midround antagonist (mulligan) system. Keep in mind this is by definition a subset of round with continuous set. Again this feature is only present for the roundtypes where I KNOW it works properly, other modes can't use midround antags.

The check antagonist screen will show how the game will behave when all the antagonists die, and it can be changed on the fly by admins, the four possible states are:

End on antagonist death (noncontinuous rounds)
Continue if antagonists die (unsupported continuous by default round)
Continue if antagonists die, creating replacement antagonists (continuous, using midround antags)
Continue if antagonists die, not creating new antagonists (continuous, not using midround antags)

When rounds prepare to mulligan admins will additionally get the option to just keep the round going without any automatically created antags in case they want to run their own shinanagans instead. They can also as before choose to end the round.
2015-04-09 16:03:11 -04:00
Jordie d78ca0c57a Merge pull request #8566 from Incoming5643/literal_fun_removal
Magic Mania NaN: The Fun Ends Here
2015-03-30 01:25:52 +11:00
Incoming 50ec2f3224 Makes the ability for wizards to use summon guns, summon magic, and summon events a config option 2015-03-27 01:32:28 -04:00
AnturK c7a93d2e6e Adds Lightning Bolt spell 2015-03-24 22:15:22 +01:00
Incoming c474035261 *Retires Departmental Uprising to the land of admin only access like its brother fake explosion before it *Changes the mechanics of recasting summon events to only reduce the upper limit of the time between event casts (-1 minute each additional cast) as opposed to touching the lower limit as well, which led to events every 15/30 seconds which, while certainly a scene, I admit was a bit much. Casting summon events 5, 6, or 7 times will now at worst result in an event every minute.
*If a wizard round mulligans, summon events will turn off if it was used. Remember that in wizard mulligans any apprentices will need to be dead too.
2015-03-20 21:04:33 -04:00
phil235 29609457f5 Makes the message when you're attacked slightly bigger for better visibility."
Changes two "for... show_message()" into "visible_message()".
2015-03-12 23:15:54 +01:00
Cheridan e846a6eeb4 Merge branch 'TheAnimalsTheyAttack!' of git://github.com/Sometinyprick/-tg-station into Sometinyprick-TheAnimalsTheyAttack!
Conflicts:
	code/game/gamemodes/wizard/spellbook.dm
	icons/mob/mask.dmi
2015-03-09 01:47:40 -05:00
Menshin e20f36d639 * Fixes runtimes with Summon Guns.
* Fixes some summoned guns uncorrectly instanciating pins
2015-03-07 04:03:40 +01:00
Cheridan 92a40fc470 Merge pull request #8126 from Iamgoofball/raginmages
fixes Ragin' Mages making only 1 mage
2015-03-06 13:04:48 -06:00
Remie Richards d36488e5a2 Merge branch 'master' of https://github.com/tgstation/-tg-station into NecromanticStone
Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	icons/obj/wizard.dmi
2015-03-03 20:58:38 +00:00
Razharas a07f6e6bfa Merge pull request #8103 from Ikarrus/antag_babbies
Age Restrictions for Antagonists
2015-03-03 09:02:52 +03:00
Iamgoofball 3422390c94 fixes Ragin' Mages making only 1 mage 2015-03-02 21:08:51 -08:00