Commit Graph

581 Commits

Author SHA1 Message Date
oranges
744b722a12 Merge pull request #18241 from phil235/BloodRefactor
Blood refactor stuff
2016-06-07 10:09:35 +12:00
phil235
bd20c313b9 Merge branch 'master' of https://github.com/tgstation/-tg-station into BloodRefactor
Conflicts:
	code/__DEFINES/genetics.dm
	code/modules/mob/living/carbon/human/species_types.dm
2016-06-04 17:41:43 +02:00
phil235
b482764a19 - I made human/handle_blood() less shitty.
- We no longer leave a blood trail if blood_volume is below a certain level which depends on the brute damage received. This way dragging a wounded player does have a bad effect.
- We no longer give humans a second reagents var containing blood, and we don't put exotic blood in the mob's reagents. Now we don't store any blood substance inside the mob, we only have a blood_volume var. When we draw blood with syringe we create the reagent that match the type (blood reagent, or an exotic blood reagent)
- can't draw blood from mob if it's low on blood, so we can't empty a mob of its blood entirely.
- Removed the blood type preference appearing in character setting.
- blood pack automatically show blood type, unless manually labeled.
- removed bloody_hands_mob human var and same name glove var.
- Some animals now have blood (pets, goat, cows)
- hitting and dragging mobs with actual blood in their veins leaves blood on you and a trail on the floor.
- probably other stuff that I'll mention in the PR.
2016-06-04 17:33:16 +02:00
Jack Edge
eb8907cefe Adds laughter demon bottle to wizard's spellbook
🆑 coiax
rscadd: Wizards have been experimenting with summoning the slightly less
lethal "laughter demon". Please be aware that these demons appear to be
as dangerous as their slaughter cousins. But adorable, nonetheless.
/🆑

By popular demand.
Cheaper than a slaughter demon because it's not going to kill the crew,
it might even end up healing a bunch of people.
2016-06-04 10:56:10 +01:00
Cheridan
9013648696 Merge pull request #18126 from coiax/no-shade-army
Makes chaplain soulshard non-reusable
2016-06-02 10:45:15 -05:00
Jack Edge
2ea09684ec Makes chaplain soulshard non-reusable
🆑 coiax
rscdel: The Chaplain soulshard can only turn a body into a shade once.
A released shade can still be reabsorbed by the stone to heal it.
/🆑
2016-06-01 13:41:02 +01:00
LatD
d89eb178c6 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-30 18:33:55 +03:00
TechnoAlchemist
d352ef7a21 New multiverse sword sprites. (#18007) 2016-05-28 16:02:40 -05:00
LatD
907fc36e5c Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-24 22:17:44 +03:00
AnturK
c2e3a4d2b6 Merge pull request #17703 from coiax/eight-chamber-heart
Lungs and hearts for mutant species
2016-05-21 11:08:05 +02:00
Cheridan
1ba09d4b16 Merge pull request #17714 from KorPhaeron/construct
New sprite for construct shell
2016-05-19 04:27:36 -05:00
coiax
09e7c2fc60 Makes chaplain soulshard its own path (#17737)
- Changes the name to "mysterious old shard"
- No other changes.

This is mostly so if the chaplain soulstone is nerfed later it'll be
already possible to do so without nerfing all other universal
soulstones.
2016-05-18 02:26:41 -05:00
LatD
fe76e64641 Origin tech changes and some fixes 2016-05-17 20:57:01 +03:00
Jack Edge
1f59248224 Adds warnings about lich+cursed heart 2016-05-16 21:39:21 +01:00
KorPhaeron
ff13c30b82 New sprite for construct shell 2016-05-16 10:32:12 -05:00
phil235
524a55a757 Merge branch 'master' of https://github.com/tgstation/-tg-station into Dismemberment
Conflicts:
	code/datums/martial.dm
	code/game/gamemodes/changeling/powers/fleshmend.dm
	code/modules/mob/living/carbon/carbon.dm
2016-05-05 21:57:10 +02:00
phil235
68da092009 Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior. 2016-05-05 18:17:51 +02:00
Nerd Lord
0897f3bc20 Cult communication is now innate and has an action button 2016-05-02 09:11:06 -04:00
Joan Lung
3eeb0cb8e9 Robust Cult changes
* Robust Cult changes

* just cache the turf ffs

* if you see something say nothing and drink to forget

* if you see something, say nothing and drink to forget

* messagefix

* if you see something say nothing, and drink to forget

* if you see something say nothing and drink to forget

* if you see something say nothing and drink to forget

* if you see something say nothing, and drink to forget
2016-05-01 21:37:02 -05:00
Cheridan
d662b0e455 Merge pull request #17218 from phil235/FixTalkingInPipes
No longer deaf while inside pipes
2016-04-29 20:34:03 -05:00
phil235
750eaa4a57 invisibility = 100 and 101 now use defines. 2016-04-29 01:00:05 +02:00
Robustin
b5952c94cc Merge branch 'master' of https://github.com/tgstation/-tg-station into commitcommoncult
# Conflicts:
#	icons/obj/items.dmi
2016-04-27 22:04:06 -04:00
Robustin
45de806acf Joan correction 2016-04-25 10:23:24 -04:00
Robustin
ecce6436d1 Requested Changes 2016-04-24 20:46:27 -04:00
phil235
0caa59b21a First commit of this big PR
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
2016-04-24 20:26:24 +02:00
Robustin
1538dc6cd2 Update soulstone.dm 2016-04-23 16:53:37 -04:00
Robustin
105c1a785a Prevents noncultists/wizards from making construct 2016-04-23 16:23:40 -04:00
KorPhaeron
cfec4218fb Wizard 2016-03-18 21:45:57 -05:00
Cheridan
ffb14ed84d Merge pull request #15788 from Shadowlight213/Oldcultredo
Remake of #15690. Replaces newcult with oldcult.
2016-03-01 22:37:58 -06:00
tkdrg
799e923eff Merge pull request #15840 from phil235/RobotAttackSelfFix
Cyborgs can no longer activate the object in their active module when incapacitated
2016-03-01 21:14:55 -03:00
phil235
4d2c6b8e24 Cyborgs can no longer activate the object in their active module when incapacitated. They also can't change their sensor mode (sechud, etc...) while incapacitated.
Fixes Wizard apprentice not being able to use soulstones.
2016-02-29 23:09:13 +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
642321b5cd Removes newcult and readds oldcult 2016-02-27 00:53:14 -08:00
Remie Richards
abf466e9bc Merge conflict fixes, Uses newly refactor actions, All cursed hearts can now be inserted by hand, not just wizard ones. Fixes organ actions trying to be granted to the object, not the user.
Merge branch 'master' of https://github.com/tgstation/-tg-station into cursed_heart

Conflicts:
	code/modules/surgery/organs/organ_internal.dm
2016-02-24 02:33:22 +00:00
phil235
57203430fd Merge branch 'master' of https://github.com/tgstation/-tg-station into ActionButtonUpdateRefactor
Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/mob/living/carbon/inventory.dm
	code/modules/mob/living/carbon/life.dm
	icons/mob/actions.dmi
2016-02-23 19:49:38 +01:00
KorPhaeron
03e205b7b1 Missing parantheses 2016-02-21 23:04:05 -06:00
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
91839f5f70 Action buttons will now only update when needed instead of every Life().
The action buttons now update their icon instantly.
Fixes versions of pickup(),equipped() and dropped not calling the parent.
Fixes drone not being able to remove a defib from their storage.
You can now cycle the mime mask by clicking it in your hand.
The action buttons for hardsuit and hooded suits now only appears when you're wearing the suit.
Created two mob helper procs getBeltSlot() and getBackSlot().
Created /datum/species/proc/on_species_loss() to handle stuff when our race change, currently only used by jelly and slime race to remove their exotic blood from our reagents and to remove slime people's action buttons.
2016-02-22 00:34:59 +01:00
KorPhaeron
0acaebb844 Cursed Revolver 2016-02-20 15:20:12 -06:00
Cheridan
cfcecba389 Merge pull request #15575 from phil235/ReviveFix1
Fixes mob revival
2016-02-17 20:42:10 -06:00
phil235
7e1efca13a Created two new procs to handle reviving mobs more easily:
- can_be_revived(), used so we don't revive a mob who would immediately die again (lack of brain organ for carbons).
- fully_heal(), called by revive when we want to completely heal a mob before trying to ressuscitate it.

I gave some arguments to revive() so the proc can be used by more than just the admin healing code (ai revived by the AI fixer console, drone revived by another drone clicking it, strange reagent ressuscitating you, borg revived by restart circuitboard, changeling using his revive ability, etc)

This fixes borg revival not updating its vision correctly and not updating the diagnostic HUD. Same fix for changeling revival.
2016-02-16 23:27:08 +01:00
phil235
5a96cf86ad Merge branch 'master' of https://github.com/tgstation/-tg-station into HatMaskFacialHairFixes
Conflicts:
	icons/mob/suit.dmi
2016-02-14 00:22:53 +01: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
Shadowlight213
2db18233d4 Makes shade poll respect prefs and cultist bans 2016-02-11 19:41:06 -08: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
16d0154d9f Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor 2016-02-04 17:04:10 +01:00