Commit Graph

248 Commits

Author SHA1 Message Date
Cheridan
ffb14ed84d Merge pull request #15788 from Shadowlight213/Oldcultredo
Remake of #15690. Replaces newcult with oldcult.
2016-03-01 22:37:58 -06:00
phil235
563ef0cca8 Renamed remove_spell() to RemoveSpell() for consistency with AddSpell(). 2016-02-29 23:21:33 +01:00
phil235
3c8a9274bf Fixes spell action button not being updated correctly regarding zlevel and clothes requirements. The buttons are now always not red in these cases but clicking them give the proper fail message.
Fixes blind AI (lack of power) staying blind if transfered to a mech or a card.
Fixes magboots action button icon not updating when toggling the boots on.
Fixes Area teleport spells not having a cancel button when choosing the destination area.
Fixes spell action button not being removed when the spell is refunded.
Fixes revenant spell action button icons not being updated when the revenant is inhibited by a null rod.
2016-02-29 16:30:54 +01:00
Shadowlight213
f79b7bafcb Various fixes. 2016-02-27 18:30:32 -08:00
Shadowlight213
642321b5cd Removes newcult and readds oldcult 2016-02-27 00:53:14 -08:00
phil235
0ec876d9fe Refactored the item's action system. Items can now hold multiple actions.
The "set internals" button of tank items now turn green when it's used as internals.
Removed research scanner from drones (since cyborgs don't have it, it's more consistent)
Removed the ignore_madkadjust mask var.
The sechailer mask now has an adjust mask action button, so I removed the adjust verb that it was using.
The item's action are now created on item/New() instead of trying to create it every time someone picks the item up.
I split hud/action.dm, the datum/action stuff is now in the datum folder (/datum/action.dm), whereas the code for action buttons is kept in the hud folder under action_button.dm. Also I moved some /datum/action code that was in some files back into datum/action.dm where it belongs.
2016-02-23 19:37:42 +01:00
Firecage
d2bd6871d5 Merge Conflict Fix 2016-01-20 14:07:14 +02:00
Bjorn Neergaard
1c34479376 Fix uplink code once and for all
Fixes #14733
2016-01-19 16:42:57 -06:00
duncathan salt
75755a12b8 Merge pull request #14710 from KorPhaeron/AI_fix
Fixes AI not recieving malf powers and cyborgs not recieving 0 law
2016-01-19 07:27:16 -06:00
Firecage
d1327d4076 Merge conflict fix 2016-01-19 10:02:50 +02:00
Bjorn Neergaard
ff5d6292c8 tgui uplinks; repath uplinks 2016-01-18 14:22:00 -06:00
KorPhaeron
76ac836350 Law Fix 2016-01-17 22:17:38 -06:00
Firecage
0cb6814c18 Merge conflict fix 2016-01-17 19:15:30 +02:00
Firecage
332bde0f4f Does the rest of the if()'s/ else's 2016-01-17 19:03:12 +02:00
Tkdrg
5589ac7559 Revert "Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework"
This reverts commit 52a45b6292, reversing
changes made to 19b43ba668.

Conflicts:
	code/datums/mind.dm
2016-01-07 23:15:35 -03:00
Aranclanos
3108162f1d Merge pull request #14308 from tgstation/duncathan-patch-1
Cancelling while adding a custom objective no longer adds a free objective
2016-01-05 04:39:09 -03:00
Shadowlight213
5662676e5e Makes attacks also log to the mob's mind.dm
Shows gibbed antags in the check antags panel.
2016-01-02 17:20:19 -08:00
duncathan salt
f1783bceca fix #14307 2016-01-02 17:45:30 -06:00
Bjorn Neergaard
a2bb279164 NanoUI is now 'tgui' 2016-01-01 17:47:44 -06:00
AndrewJacksonThe2nd
0121f6691f fixes 2015-12-30 13:14:28 -08:00
AndrewJacksonThe2nd
629863fbae fixes 2015-12-28 23:10:28 -08:00
AndrewJacksonThe2nd
081aa7099e Removes Frame, fixes 2015-12-28 16:31:30 -08:00
AndrewJacksonThe2nd
799a406af4 New Frame Objective, compile fixes 2015-12-28 15:23:42 -08:00
AndrewJacksonThe2nd
dca91323a4 Merge branch 'master' of https://github.com/tgstation/-tg-station into objectives_rework
Conflicts:
	code/datums/mind.dm
	code/game/gamemodes/antag_spawner.dm
	code/game/gamemodes/objective.dm
	data/mode.txt
2015-12-28 12:40:51 -08:00
Bjorn Neergaard
a173cc01f6 Fix NanoUIs not transfering when the owner ghosts (or reenters) 2015-12-27 10:56:48 -06:00
tkdrg
bab0d21e5a Merge pull request #13759 from KorPhaeron/copyofacopyofacopyofacopyofacopy
Merges Malf AI and traitor AI into a single antag type, no longer has its own mode
2015-12-20 16:18:37 -03:00
tkdrg
a7ccd084e8 Merge pull request #13734 from KorPhaeron/reinforcements
Allows nuke ops to purchase reinforcements
2015-12-18 21:47:01 -03:00
KorPhaeron
57d29d11d4 Replaces malf with traitor AI 2015-12-18 00:05:30 -06:00
Bjorn Neergaard
332cc5af71 Re-organize NanoUI procs 2015-12-17 10:18:00 -06:00
KorPhaeron
c2bc05a799 Reinforcements for nuke ops 2015-12-17 06:54:21 -06:00
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
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
duncathan
eecb657deb finishes up mind.dm 2015-12-08 20:17:41 -06:00
Nerd Lord
58a3f742c6 Spawnable hostile constructs, for away missions and adminfuckery. 2015-12-05 10:48:52 -05:00
duncathan
c0d06a3f20 next commit, goof, I swear 2015-12-04 21:48:14 -06:00
Menshin
bbbd4360d0 Fixes login runtimes for observers.
Some failsafes for new_player login.
2015-11-23 00:19:35 +01:00
Tkdrg
459619594f Improves antag_hud transfer_to() logic
Fixes #13019
Fixes #11996
2015-11-14 16:06:01 -03:00
AndrewJacksonThe2nd
eaa1d11af4 On stun_nerf: objectives 2015-11-08 21:10:21 -08: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
Tkdrg
d966c37c6a Hand of God Fixes/Tweaks
Fixes healing fountain construction sprite.
Nexus are now destroyed properly.
Borged cultists will now lose antag status properly.
Round end message fixed.
Feedback messages improved to be clearer, and lots of typos fixed.
Smite no longer uses up faith if there is no valid target in the turf.
Adds an atom/attack_god() proc.
Fixes the greeting messages for prophets and followers, improves god msg.
Fixes nexus being spawned on dense turf after 2min, and general sanity.
Fixes attacking structures with abstract items.
Adds click delay and attack animation for attacking structures.
Fixes a lot more typos.
Fixes defense pylon friendly fire.
Makes defense pylon togglable on its god's click.
Cleans up gun_turret code a little in general.
Adds deconversion by loyalty implant or holy water (basically rev+cult).
Gods will now die when they have no followers left.
Adds the HoG gods to the traitor panel.
2015-11-07 15:25:28 -03: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
Xhuis
f2291a1194 Shadowling update 5 2015-10-31 11:30:29 -04:00
Incoming
711cac68a8 Fixes an oversight where the traitor panel would show a station aligned changeling as a traitor no matter if it actually was an antag or not. It will still admit the ling is a ling, but at the very least it will say they aren't an antag. 2015-10-24 03:32:10 -04:00
Razharas
84a5511836 Merge pull request #12283 from KorPhaeron/inworld
Removes a bunch of in world
2015-10-12 12:12:35 +03:00
KorPhaeron
31836a5deb Removes in world 2015-10-09 22:37:53 -05:00
Razharas
28c9a70ace Fixes spell list clearing
Fixes spell list clearing
2015-10-10 02:55:51 +03:00
Razharas
32fd0da9f2 Merge branch 'patch-1' of https://github.com/whitefox08/-tg-station into whitefox08-patch-1 2015-10-10 02:38:43 +03:00