3860981936
Merge pull request #13025 from tkdrg/imdumb
...
Improves antag_hud transfer_to() logic
2015-11-15 15:59:51 -06:00
31e30ab768
Merge pull request #12955 from CosmicScientist/FixingThePast
...
Makes the dehydrated carp less ambiguous and decreases its TC cost
2015-11-14 23:42:58 -06:00
459619594f
Improves antag_hud transfer_to() logic
...
Fixes #13019
Fixes #11996
2015-11-14 16:06:01 -03:00
a6eaf76d72
Fixes merge conflicts, adds new sprites, hopefully fixes weird helmet sprite bug.
2015-11-12 21:54:08 -05:00
e0df93d2b8
Fixes #12970
2015-11-11 15:43:51 -05:00
d5fd4440ea
Merge pull request #12067 from AnturK/resequencing
...
Changes to DNA Injectors
2015-11-11 10:50:30 -06:00
0769ba5c00
Merge pull request #12945 from torger597/master
...
Adds a Syringe to the Uplink Poison/Chemical kit
2015-11-11 10:47:40 -06:00
40cf13e575
Merge pull request #12942 from AnturK/mindfu
...
Fixes mind swap kicking out the victim client
2015-11-11 10:46:38 -06:00
d82010caf3
Makes injectors timed
...
Update
Lowers the scanner buffer transfer radiation.
Makes injector duration scale with upgrades.
Time coefficent values
2015-11-11 17:27:55 +01:00
1369b84782
That may find a place in this world.
2015-11-11 01:02:39 +00:00
d0e5bf65a7
And hope that something stronger grows there.
2015-11-11 00:02:40 +00:00
af74475cad
Because I cannot bear it.
2015-11-10 23:41:59 +00:00
cbdc72272b
Edit
...
Changed description of the kit itself to comment on the fact it now
comes with a syringe, added a change log entry for the change itself.
2015-11-09 20:55:01 -06:00
6e32dd4197
Fixes mind swap kicking out the victim client
2015-11-09 22:03:47 +01:00
97697bcac4
Makes the lich beam dark green, and thus much more spooky.
2015-11-08 20:31:54 -05:00
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
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
6517a1450a
Merge pull request #12865 from Incoming5643/wow_rational_thinking_at_not_3_am_is_powerful
...
Adds a few checks in beam code to make it compatible with turfs
2015-11-07 06:36:07 +03:00
25f36bd158
Merge pull request #12869 from Menshin/clean_ghost_hud
...
Made new_player mobs use the base Login() proc
2015-11-07 06:35:52 +03:00
5b1a2836fa
Merge pull request #12772 from Xhuis/shadowling_update_5
...
Shadowling Update V
2015-11-07 06:11:39 +03:00
d1337fa009
New_player mob now uses generic Login() proc
2015-11-05 23:50:42 +01:00
522731c977
Adds a few checks in beam code to make it compatible with turfs.
...
Also acts a little check to see if both points of the beam are turfs, and if so, to not bother checking to see if the turfs are moving.
2015-11-04 22:12:13 -05:00
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
150c25b810
Shapeshift Spell
2015-11-02 00:28:58 +01:00
7d2eb5ddf2
Changes spell sound mechanics
2015-10-31 23:27:27 -04:00
55021fc27d
Conflicts 2/2
2015-10-31 11:32:12 -04:00
f2291a1194
Shadowling update 5
2015-10-31 11:30:29 -04:00
75b5b4b362
Merge pull request #12751 from Incoming5643/ok_it_was_OP_I_admit_it
...
Lichmode lukewarm fix
2015-10-31 15:07:38 +03:00
a07c40c262
Swaps the last bit of the lichmode Beam() relying on something other than a turf for a turf.
...
I was being dumb and tied an atom defined proc to a body set to be dusted instead of a turf that will surely exist in some form.
2015-10-30 01:59:27 -04:00
e2ba9d4e5b
Swaps the last bit of the lichmode Beam() relying on something other than a turf for a turf.
...
I was being dumb and tied an atom defined proc to a body set to be dusted instead of a turf that will surely exist in some form.
2015-10-30 01:52:53 -04:00
fc0ea9311b
Merge pull request #12614 from GunHog/Diag_Huds
...
Diagnostic HUDs
2015-10-30 06:25:48 +03:00
3f3794763a
Merge pull request #12629 from Incoming5643/Im_all_for_fun_xenobio_endtier_rewards_but_this_is_ridiculous
...
Removes self linging
2015-10-29 04:46:41 +03:00
1e71f344a0
Merge pull request #12680 from Incoming5643/ok_it_was_OP_I_admit_it
...
Lichmode nerf fixes
2015-10-28 19:30:09 +03:00
c2094e01c4
Merge pull request #12691 from Robustin/master
...
Timestop Cooldown increased by 33.33333333333%
2015-10-28 19:29:52 +03:00
e63f6e0c58
Let's be really careful about this
2015-10-27 13:39:39 -04:00
401b34c36c
Timestop Cooldown increased by 33.33333333333%
2015-10-27 11:37:24 -04:00
222b4962e7
Depreciated an else if without noticing
2015-10-27 01:42:52 -04:00
7b762ca83e
Fixes some errors relating to z-level checks to deal with liches hiding their item in other things.
2015-10-27 01:34:11 -04:00
1691675e9a
Fixes wizarditis runtime
2015-10-25 23:50:07 -07:00
e71bc1f214
Merge pull request #12598 from Incoming5643/ok_it_was_OP_I_admit_it
...
Lichmode nerfs
2015-10-26 03:47:15 +03:00
145a2dd9e9
Merge pull request #12631 from AnturK/beam
...
Beam Code Cleanup
2015-10-26 03:02:41 +03:00
f116ba5c32
Merge branch 'master' of https://github.com/tgstation/-tg-station
2015-10-25 15:39:42 -04:00
ed9b0c35c6
Merge pull request #12612 from phil235/BugFixBoogalooI
...
bugfixes: bloodcrawl, losebreath, wintercoat, and more
2015-10-25 14:19:11 -05:00
1a199fa567
Sets up a catch for the lich spell's needed immunity to instantly ending the round on wizard death so it will still end the round once the wizard's body is properly disposed of.
2015-10-25 14:23:30 -04:00
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
a172ad841b
Beam Code Cleanup
2015-10-24 14:03:30 +02:00
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
b10850718a
Merge remote-tracking branch 'remotes/upstream/master' into Diag_Huds
...
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
2015-10-23 18:53:30 -05:00
438babc197
HUD fixes
...
- Data HUDs that apply only to humans (medical, security) are now
prepared only for humans, preventing errors.
- The RD's hardsuit helmet now deactivates its own HUD if a diagnostic
HUD item is worn.
- HUDs on newly spawned entities now update properly.
2015-10-23 18:47:58 -05:00
da84fcd8d2
- Fixes shadowling receiving burn messages even when dead. I've also fixed the same bug for other species and made certain spec_life() procs not run when the mob is dead. I also made slime species a subtype of jelly species since they had a lot of code in common thus reducing duplicate code.
...
- Fixes odd behavior with emagging airlock and windoor animation.
- Fixes being able to bloodcrawl in oil decal.
- Fixes being deaf after bloodcrawling.
- Fixes wintercoat hood appearing below the mask.
- Fixes being able to attack another mob before the game has started (and other things which used a gamestart check that no longer works).
- Ghosts can no longer become drones before the game has started.
- Removed "bhunger" and "ajourn" mob vars, they are unused.
- Fixes admin-revived morph being invisible.
- Fixes heart attack stacking losebreath very high. Also now losebreath is reset to 0 when the mob dies.
- All mobs no longer have a default strip menu showing two hands.
2015-10-23 20:00:52 +02:00
duncathan salt
Tkdrg
as334
francinum
AnturK
CosmicScientist
CosmicScientist
Torger597
Nerd Lord
Razharas
Menshin
Incoming
Xhuis
Incoming5643
Robustin
Shadowlight213
Cheridan
GunHog
phil235