Commit Graph

161 Commits

Author SHA1 Message Date
Remie Richards 9401eb6b7d Added a wizard version of the heart, it heals the user every pump and only requires pumping every 6 seconds (vs 3)
Pumping successfully now returns half of the blood lost from a missing pump (anymore and I doubt you'd die)
You can no longer spam the pumping (healing made this a requirement)
2016-02-22 02:25:04 +00:00
phil235 fd16e02cdb Fixes most (non hardsuit) helmets hiding the glasses when they shouldn't.
Fixes not seeing glasses through the riot helmet.
Fixes gas mask protruding from the abductor helmet.
Fixed radiation hood not hiding your hair, earpiece, mask.
Fixes colored justice hats not having an on-mob icon_stat.
Removed BLOCKHAIR bit from var/flags , moved it to flags_inv and renamed to HIDEHAIR
Added HIDEFACIALHAIR bitflag so certain hat/helmet can show just the beard.
Fixed human/update_inv_glasses not checking if our mask hides our glasses.
Fixed check_obscured_slots() not checking if our masj obscur our glasses.
Fixes some bits of flags_inv having the same value.
Fixes crusader hood and other headgear not hiding your identity when they should.
Fixes drone mask icon not appearing.
2016-02-14 00:03:07 +01:00
duncathan salt a27a0a1e33 Merge pull request #15303 from KorPhaeron/Lesser
Nerfs lesser summon guns
2016-02-10 21:36:30 -06:00
phil235 0291f450d2 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdatesChanges
Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/login.dm
	code/modules/mob/mob.dm
2016-02-10 22:35:19 +01:00
Incoming 6ef82fd642 Merge branch 'master' of https://github.com/tgstation/-tg-station into animorphs_speedrun 2016-02-08 22:26:00 -05:00
KorPhaeron aecf08655d Nerf LSG 2016-02-07 22:41:08 -06:00
phil235 83633edfed - I renamed some of the new adjust procs and create new ones for eye_blind,eye_blurry and eye_stat so they get three procs just like weakened/sleeping/etc.. (Sleeping, AdjustSleeping, SetSleeping)
- renamed the eye_stat var to eye_damage.
- mob/on_varedit() added. Manually var editing a mob's eye_blind var properly updates his vision.
- I removed update_vision_overlays(), we now just update the relevant fullscreens instead of all fullscreens whenever one needs to be updated.
- fixed climbing into mecha not giving you mecha sight.
- simplified and removed copypasta from update_tinttotal() (now update_tint() )
2016-02-07 18:50:18 +01:00
phil235 8b11d87b1d Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
Conflicts:
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/_onclick/hud/alert.dm
	code/_onclick/hud/hud.dm
	code/datums/mutations.dm
	code/datums/wires/robot.dm
	code/game/atoms.dm
	code/game/gamemodes/blob/overmind.dm
	code/game/machinery/alarm.dm
	code/game/machinery/machinery.dm
	code/game/machinery/suit_storage_unit.dm
	code/game/objects/items/weapons/tanks/tanks.dm
	code/game/objects/items/weapons/tools.dm
	code/game/objects/structures/morgue.dm
	code/modules/admin/verbs/adminjump.dm
	code/modules/atmospherics/machinery/atmosmachinery.dm
	code/modules/mob/inventory.dm
	code/modules/mob/living/carbon/alien/humanoid/death.dm
	code/modules/mob/living/carbon/alien/larva/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/human/species_types.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/ai/death.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/pai/death.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/mob/living/silicon/robot/death.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	code/modules/mob/login.dm
	code/modules/mob/mob.dm
	code/modules/projectiles/gun.dm
	code/modules/reagents/chemistry/reagents/blob_reagents.dm
	tgstation.dme
2016-02-04 14:34:45 +01:00
phil235 81ce777ec2 - you now only see turfs when inside gas pipes.
- I renamed some vars of datum/hud to be more selfexplanatory
- Moved all datum/hud mob code into the hud folder.
- fixed alien's zone selection button not using the correct sprites.
- I removed the update_hud() proc (that needed to be removed).
- Fixed a typo in /mob/living/carbon/ContractDisease , using "internals" instead of "internal" (very different things)
- Fixed doTeleport() calling Entered() twice on the destination area.
- To reference a mob's selected zone, you now use a direct mob var ("H.zone_selected" instead of "H.zone_sel.selecting")
- mobs lose certain screen objects var ("healths", "zone_sel", "internals", etc) which are now vars of the mob's datum/hud instead.
- the Blind spell is now done via the blind mutation instead of the blind disabilities.
- Give to mobs a version of forceMove(), so the mob is always properly unbuckled, his pull stopped, his vision updated, etc.
- The "user" var of mob/camera/aiEye/remote is renamed to "eye_user" to avoid confusion.
- reset_view() is replaced by reset_perspective(). Now all changes to client.eye and client.perspective are done with this proc.
- I reworked /obj/machinery/computer/security code, changing camera is instantaneous now, as well as cancelling.
- I reworked /obj/machinery/computer/camera_advanced code as well.
- I changed /obj/item/mecha_parts/mecha_equipment/mining_scanner's meson view to be constant instead of by intermittent.
- Fixes not being able to use /obj/item/device/camera_bug while buckled.
- removed admin_forcemove() proc, admin force moving now uses forceMove() simply.
- Removed the client var "adminobs"
- Added var/vision_correction to glasses.
- Added a thermal_overload() proc for glasses, to remove copypasta in emp_act code.
- Remove the hal_crit mob var
- We no longer delete the mob's hud everytime he logs in.
- Added a stat == dead check in mob's metabolize() so we immediately stop metabolizing if one of the chem kills the mob.
- Being inside disposal bin lowers your vision, like wearing a welding helmet.
- removed the remote_view mob var.
- I changed advanced camera EYE, some fixes, removed unnecessary code when the eye moves, now the mob client eye properly follows the camera mob.
- fixes mob var "machine" not being nullified on logout.
- larva/death() was calling two "living_mob_list -= src"
- I made the Blind screen objects into a global_hud instead of giving one to each mob (like damage overlay).
- I untied tint and eye_blind, TINT_BLIND doesn't give you eye_blind=1.
- gave a visual overlay when inside locker (vimpaired)
- when inside disposal/gas pipes you get sight |= (BLIND|SEE_TURFS)
- glasses toggling updates (atmos meson toggle): DONE
- The new adjust procs serve to properly change eye_blind etc and call vision update procs when needed.
- I added an on_unset_machine() proc to handle perspective reset for camera consoles.
- I moved consequences of eye_check fail inside eye_check() procs themselves.
- I fixed vision updates being fucked by forceMove, especially pipe vision.
- I decided that damage overlay not appearing when dead.
- mob's hud_used is no longer deleted on each login()
- I refactored mob huds a bit, creating subtypes for each mob (/datum/hud/human)
- f12's hud toggling is now available to all mobs
- gave borgs a low_power_mode var so unpowered borg do not use stat= UNCONSCIOUS (which made things weird since you were unconscious but not blind)
- Fixed double Area entering when forced teleporting.
- I fixed larva pulling not being broken when cuffing them, and larva not seeing handcuff alert (and they can resist by clicking it)
- I removed pull updates from life() since it onyl checked for puller's incapacitation.
- I renamed camera/deactivate() to toggle_cam() to be more accurate.
- I fixed mmi brain being immortal (by removing the brain and putting it back)
- I simplified mmi brain emp damage.
2016-02-04 00:33:16 +01:00
Incoming 902f0ab492 Makes the wild shapeshift spell slightly less terrible.
You can choose your form (once) now instead of getting random corgi-d. The forms themselves have been shuffled a bit for usefulnessL
* Mouse (small hitbox and vent crawling
* Chaos Magicarp (a riskier chaos staff)
* Ed209 (STUNS FOR DAYS YO)
* Juggernaut (Walling, wallpunching)
* Corgi (Meme, hats)
2016-01-31 00:48:53 -05:00
Lzimann 6c483a0fd4 Remove multiverse from wizard 2016-01-25 01:04:33 -02:00
KorPhaeron ff09481e5e LSG 2016-01-07 01:48:50 -06:00
KorPhaeron 9bcca100ca Lesser Summon Guns 2015-12-29 10:58:27 -06: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
KorPhaeron 1cad6716b7 Fixes 2015-11-13 05:22:57 -06:00
KorPhaeron 780dfe8db1 Ridiculous weapons 2015-11-09 07:17:10 -06:00
AnturK d977085883 Proper category for shapeshift 2015-11-04 12:54:24 +01:00
AnturK 150c25b810 Shapeshift Spell 2015-11-02 00:28:58 +01: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
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
AnturK 2ddddc1cdb Fixes spellbook refund issue 2015-09-17 15:14:34 +02:00
bear1ake f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
Firecage bf13763e3b Merge branch 'master' of https://github.com/tgstation/-tg-station.git into del2qdel 2015-08-16 23:34:03 +02:00
Firecage dfae1e0b53 Changes a lot of del() to qdel() 2015-08-16 23:33:22 +02:00
phil235 5539689f3a Merge pull request #11043 from KorPhaeron/moreweebshit
Timestop for Wizards
2015-08-16 11:04:47 +02:00
KorPhaeron 6a71cd2f57 Toki Wo Tomare
ZA WARUDO
2015-08-05 15:54:41 -05:00
KorPhaeron 880a8dfa03 Removes Multisword from Spellbook 2015-08-05 02:37:22 -05:00
Cheridan 740199f408 Merge pull request #10583 from Incoming5643/fingerbang
[ready] Disintegrate/Flesh to Stone as actual touch attacks
2015-07-24 00:11:44 -05:00
Cheridan bcaefd28a2 Merge pull request #10675 from phil235/SlaughterDemonFixes
Slaughter demon fixes and Summoning limit
2015-07-19 23:24:51 -05:00
Swag McYolosteinen 687bfb2f71 Merge pull request #10094 from KorPhaeron/multiverse
Multiverse Sword Artefact/"There Can Be Only Me" admin verb (Ready to Merge)
2015-07-19 19:19:05 +02:00
KorPhaeron 1ba58674c7 Multiverse fixes, objective tweaks, no traitor status for clones 2015-07-19 08:55:05 -05:00
phil235 76ee0a3e1a Fixes typo in a slaughter demon message.
Fixes slaughter demon icon upon being admin healed/revived.
Add the limit var to datum/spellbook_entry to limit the amount of times it can be bought by the wizard. It's currently only used to limit wizard from summoning more than 3 slaughter demons.
2015-07-17 21:36:58 +02:00
Firecage 4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
Incoming dcf3c3d9de When disintegrate was added it was certainly intended to be a touch attack, but there was no in game mechanics to properly have someone explode when you touch them. But now thanks to things like nodrop and abstract items, I could totally code an item that a wizard summons to his hand that represents a touch attack. So I did.
Disintergrate summons a glowing hand (gesture up in the air [pointing? Hand flat? Fist?]) nodrop abstract item. It has a noticeable on mob sprite and (obviously) requires a free hand to use. It removes that shitty drop down menu UI and requires that a wizard be robust enough to actually smack someone with his hand to work. Spell doesn't recharge until the hand actually connects, reusing the spell with the hand out just refunds the charge and puts the hand away. Spell still gibs.

Nerfs:
*Requires a modicum of robustness in clicking a guy
*Offers a tell to spessman that the wizard is going for it
*Can't be used on the floor or while cuffed
*Takes up a hand slot during use

Buffs:
*Don't have to fiddle with a shitty drop down if you use it in a crowded area.
2015-07-12 19:39:39 -04:00
AnturK a273e87179 Fixes Summon spells in Raging Mages 2015-07-08 11:22:36 +02:00
AnturK 4a97658730 Spellbook fixes 2015-07-08 11:16:29 +02:00
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