Commit Graph

490 Commits

Author SHA1 Message Date
oranges 134a76cc8f Line ending apocalypse 2015-12-17 14:12:37 +13:00
Razharas a349a15469 Merge pull request #13552 from tkdrg/newnewnewnewnewnewnewnewnewnewcult
[Ready?] Cult Overhaul. Yep.
2015-12-16 06:07:20 +03:00
Tkdrg 8ead3e8628 Cult Overhaul
Cult is awful, so let's try to improve it. Idea by KorPhaeron. I also
took some inspiration from adrix89's sacrifice cult, so credits to him.
Also thanks a lot specially to MrPerson and Iamgoofball for helping
me brainstorm this, and Joan for the sprites for the summoning orb,
the large nar-sie shell, and the new cult antag hud.

Basically, we remove conversion, and turn cult into a magic version of
nuke, with a small team of stealth elite cultists that have to build a
base in the station and sacrifice people in order to build an army of
constructs and get materials to eventually summon Nar-Sie.

Stun talismans and conversion are gone. Nar-Sie is now the only
objective. Sacrifice runes now provide summoning orbs, which you can use
to drop a large shell. Insert enough orbs in the shell and you trigger a
Delta. Defend the shell for 3 minutes and Nar-sie will arise. This shell
is bombproof and singularityproof. It may be summoned up to three times
if destroyed, but you will have to start from the beginning sac-wise.

Runes are now RNG. Each cultist only gets 50% of the runes. Inspiration
is basically The Binding of Isaac here (thank you MrPerson for this!).
Furthermore, many old runes were merged/removed and other new ones were
added. Almost all were massively rebalanced. Cult now also has a
stealthy ritual dagger with high bleeding and throw effects.
2015-12-15 04:59:31 -03:00
KorPhaeron d8a37204e7 Makes burn_state use defines 2015-12-13 05:36:55 -06:00
Razharas 7929c027fa Merge pull request #13550 from Incoming5643/new_wizard_meta_just_look_for_the_people_who_arent_fucked_up
Apprentice clean up / bugfixes
2015-12-11 22:50:46 +03:00
Incoming 6a64864805 formally defines apprentices as a kind of antag instead of as "traitors".
Wizard events that spare the wizard should now properly spare apprentices too.

Moves renaming as an apprentice to the end of the spawn proc because the input prompt stops various important things (including the sound meant to inform people they got apprentice) from happening until after it's dealt with.

Restores the "+" for positive quality items in RPG loot. The reason this was changed was already fixed, it just was mistakenly never put back.
2015-12-10 12:08:49 -05:00
Cheridan 3c98d1f8cf Merge pull request #13505 from Incoming5643/hud_buds
Fixes a few team hud issues
2015-12-09 10:20:26 -06:00
Incoming c9cb9a1520 whooooooops 2015-12-08 02:42:39 -05:00
Incoming 675bfdc781 Shuffle up and deal 2015-12-08 01:29:10 -05:00
Incoming ebec6f5775 Fixes midround head revs not getting their hud updated to show their new status.
Fixes wizard modes with hud icons not using hud icons
2015-12-08 01:22:22 -05:00
Nerd Lord a0b2b0a721 Couple of small fixes.
thou shalt not flee the will of nar-sie
2015-12-05 19:09:21 -05:00
Nerd Lord 58a3f742c6 Spawnable hostile constructs, for away missions and adminfuckery. 2015-12-05 10:48:52 -05:00
AnturK b14e9133d2 Academy Update 2015-11-28 12:35:41 +01:00
Razharas e3a78d1be3 Merge pull request #13175 from Incoming5643/stop_meming_on_wizbiz
Removes the most ridiculous of the new wizard weapons
2015-11-25 20:44:04 +03:00
Incoming 9126bbfaf6 Removes supermatter sword from wizards: It is not balanced, shouldn't be balanced, and won't be balanced.
Removes veil render from wizards: Singularities at round start isn't fair to anyone. People who want to go meme wizard get options to meme with but this is just ridiculous.

Folds Mjolnir and Singularity hammer into the offensive category to remove the weapons category.

Doesn't touch multiverse sword war, which is pretty damn silly, but at least a unique experience.
2015-11-23 00:51:22 -05:00
Incoming edb9830efa Merge branch 'hey_thanks_for_reading_the_branch_name' of https://github.com/Incoming5643/-tg-station into hey_thanks_for_reading_the_branch_name 2015-11-21 00:07:51 -05:00
Incoming 494dd50ff6 Merge branch 'master' of https://github.com/tgstation/-tg-station into hey_thanks_for_reading_the_branch_name
Conflicts:
	code/game/gamemodes/wizard/spellbook.dm
2015-11-21 00:06:47 -05:00
Razharas 52ce383102 Merge pull request #13053 from AnturK/doors
Makes staff of doors create random mineral doors.
2015-11-20 06:54:28 +03:00
Incoming5643 4a2b1e0e4e implying implicitness 2015-11-18 22:39:48 -05:00
Incoming a7a6a599d8 Makes my oldcode mindswap book work like my slightly less oldcode summon events mass mindswap event to remove some copypasta and fix #13054 2015-11-17 15:33:54 -05:00
AnturK b1bf6acab0 Changes spellbook description
Picks types from list
2015-11-17 15:17:46 +01:00
Incoming 1f9f0dfc40 Adds subtypesof(). It's shorthand for typesof(path) - path.
Replaces typesof(path) - path with subtypesof(path) in obvious places. I was a bit conservative, there's probably a few more places that could use this.
2015-11-16 18:55:57 -05:00
duncathan salt 509c2da46f Merge pull request #13011 from KorPhaeron/really_bad_ideas
Veil Render Fix + spellbook balance
2015-11-14 22:08:48 -06:00
KorPhaeron 1cad6716b7 Fixes 2015-11-13 05:22:57 -06:00
duncathan salt 8bb0043ec7 Merge pull request #12939 from KorPhaeron/really_bad_ideas
Adds a series of ridiculous weapons to the wizard spellbook
2015-11-11 10:47:04 -06:00
KorPhaeron 780dfe8db1 Ridiculous weapons 2015-11-09 07:17:10 -06:00
Tkdrg 88f64c607e Ghost HUD tweaks
Removes links in tooltips. Makes alerts work as clicks when applicable.

Fixes #12843
Fixes #12844
2015-11-08 22:53:41 -03:00
Tkdrg 8fce742d0a Merge remote-tracking branch 'upstream/master' into fuk
Conflicts:
	data/mode.txt
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/gloves.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
2015-11-07 15:56:39 -03:00
AnturK d977085883 Proper category for shapeshift 2015-11-04 12:54:24 +01:00
Tkdrg e2187614fd Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts
Conflicts:
	code/__DEFINES/hud.dm
	code/__HELPERS/game.dm
	code/_onclick/hud/_defines.dm
	code/_onclick/hud/hud.dm
	code/game/gamemodes/antag_spawner.dm
	code/game/gamemodes/game_mode.dm
	code/game/machinery/turrets.dm
	code/modules/client/preferences_toggles.dm
	code/modules/events/alien_infestation.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/special/alien_embryo.dm
	code/modules/mob/living/simple_animal/revenant/revenant.dm
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/items.dmi
	icons/obj/projectiles.dmi
	icons/obj/storage.dmi
2015-11-02 01:06:30 -03:00
AnturK 150c25b810 Shapeshift Spell 2015-11-02 00:28:58 +01:00
Razharas 3ec028fddd Merge pull request #12640 from Shadowlight213/sabrsummonfix
Fixes sabr path in summon guns
2015-10-26 12:39:13 +03:00
Cheridan 10b82ee45b Merge pull request #12304 from Incoming5643/utility_aint_gonna_cut_it
Adding Charge and Staff of Healing to the spellbook + category reshuffle
2015-10-25 05:23:03 -05:00
Shadowlight213 4b4a658352 Fixes sabr path in summon guns 2015-10-24 19:14:00 -07:00
phil235 d3ee910211 Makes effect system code more OOP.
obj/effect/effect is now renamed obj/effect/particle_effect for better usability.
datum/effect/system and /datum/effect/effect/system are now both /datum/effect_system.
Fixes a bug where wall mounted igniters (and other spark producing objects) didn't produce sparks sometimes.
Moved explosion_particles.dm into the effect_system folder, because it has effect_systems code.
2015-10-21 23:28:29 +02:00
Razharas d1df0bfeff Merge pull request #12485 from xxalpha/ultrarange
Added ultra_range() proc.
2015-10-20 00:17:09 +03:00
xxalpha e82a216447 Changed various instances of range() and orange() to ultra_range(). 2015-10-19 20:04:14 +01:00
phil235 79a814b434 Fixes some runtimes when picking candidates for certain simple_animals, especially sentience potion. If the player chose 'Yes' and then immediately disconnected, it would make the chosen client null. Same thing for xeno larva bursting (player disconnection mid bursting animation)
Fixes runtimes with chem grenade calling prime() after being GC'd.
Fixes some hardsuits having "unacidable = 1" twice.
Fixes runtime with alien whisper.
Fixes runtime with check_shields()
Fixes runtime with Venom, Formaldehyde, corn syrup and holy water.
Fixes cult sacrifice soulstoning not working (giving a dead shade).
2015-10-18 01:28:48 +02:00
Incoming d7713f21b9 The Staff of Healing is now selectable for a cost of 1 in the spellbook
The spell "Charge" is now selectable for a cost of 2 in the spellbook

The spellbook's category system has been reworked to help deal with the huge scroll bars it previously had and help identify to wizards what needs spells and items serve.

The new categories are:

Offensive:
Fireball
Disintegrate
Blind
Mutate
Flesh to Stone
Lightning Bolt
Curse of the Barnyard
Staff of Change
Staff of Chaos

Defensive:
Magic Missile
Disable Tech
Repulse
Stop Time
Smoke
Forcewall
Bind Soul
Staff of Healing
Scrying Orb
Wand Assortment
Armor Set

Mobility:
Mind Transfer
Blink
Teleport
Ethereal Jaunt
Knock
Staff of Door Creation

Assistance:
Instant Summons
Charge
Staff of Animation
Soul Stone Shards + Artificer
Necromantic Stone
Apprentice Contract
Bottle of Blood

Fixes an unreported bug where targeting your mouth with a staff of healing allowed self healing through suicide.

Adds an easter egg to clever wizards who try to charge the spellbook to get more charges.
2015-10-10 20:35:51 -04:00
Razharas 25b514081f Merge pull request #12258 from Iamgoofball/patch-132
improves VERY RAGIN' BULLSHIT MAGES
2015-10-10 08:35:10 +03:00
Iamgoofball 749d1ea8d2 improves VERY RAGIN' BULLSHIT MAGES
based on hornygranny and I's testing that one round

this is done with studies to prove this is how you meme it up

improves ragin' mages

makes admins get laid when they use it
2015-10-08 20:01:15 -07:00
Remie Richards 97de4b2ebe Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence
Conflicts:
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/storage.dmi
2015-10-07 22:24:53 +01:00
Remie Richards b9394257da About a million changes, but largely: Functional (Sort of) Antag Huds, Mind fixes, and Final glue to get the mode working. 2015-10-07 22:11:19 +01:00
Xhuis 815c7aa435 ACTUALLY removes cauterize 2015-10-06 20:18:53 -04:00
Xhuis 909849adc8 Tweaks 2015-10-06 10:33:14 -04:00
Xhuis 713c229935 Spell book refactor 2015-10-05 21:01:44 -04:00
Xhuis ae1e02013b New wizard spell: Cauterize 2015-10-05 17:49:43 -04:00
Iamgoofball cfa151d800 Adds time check var for admins to tweak time in between wizard spawns 2015-10-04 22:13:48 -07:00
Iamgoofball 6062a4d806 Adds Bullshit Mode var to RAGIN MAGES
This comes with a preset gamemode set to bullshit mode just for badmins who are 2lazy to fuck with the gamemode controller.

Infinity wizards are made.

They spawn in every 50 seconds instead of 150.

The round does not end until badmins end it.

Good luck!
2015-09-30 22:15:32 -07:00
Remie Richards 131b69474e Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence
Conflicts:
	code/__HELPERS/unsorted.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/modules/client/preferences.dm
	icons/mob/feet.dmi
	icons/mob/head.dmi
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/mob/mob.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/items.dmi
	icons/obj/projectiles.dmi
2015-09-27 17:15:01 +01:00