Commit Graph

327 Commits

Author SHA1 Message Date
Joan Lung
22aff568c6 but with conflictless sprites 2016-06-06 19:59:37 -04:00
oranges
ccbc302876 Merge pull request #18282 from coiax/removing-spawn
Removes spawn() from some things
2016-06-07 10:21:54 +12:00
oranges
744b722a12 Merge pull request #18241 from phil235/BloodRefactor
Blood refactor stuff
2016-06-07 10:09:35 +12:00
Joan Lung
f64e687250 Adds the Clockwork Obelisk, Mania Motor, and Vitality Matrix 2016-06-05 18:45:32 -04:00
Jack Edge
a01b48aa48 Removes spawn() from some things
Yay, refactoring.
2016-06-05 20:08:36 +01:00
oranges
c09046e3f1 Merge pull request #18201 from PKPenguin321/cmo-implanter
Refines autoimplanter code, gives CMO single use autoimplanter for HUD augment
2016-06-06 01:25:52 +12:00
Joan Lung
d81db92008 Merge pull request #18214 from coiax/follow-link-define
Refactors all (F) links into using a define
2016-06-04 14:36:31 -04: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
MMMiracles
7c8603a0a8 important features (#18195) 2016-06-03 14:48:12 -05:00
Jack Edge
e13725b179 Refactors all (F) links into using a define
🆑
bugfix: Clicking the (F) link when an AI talks in binary chat will
follow its camera eye, the same as when (F) is clicked for its radio
chat.
/🆑

FOLLOW_LINK is a define that creates the clickable (F) link, so it
doesn't have to be typed painstakingly out every time we want to give
that link to an observer.
2016-06-03 15:29:28 +01:00
PKPenguin321
01281044a1 refines autoimplanter code, replaces CMO eye HUD augment in locker with single use eye HUD augment autoimplanter 2016-06-02 23:23:52 -07:00
LatD
d89eb178c6 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-30 18:33:55 +03:00
LatD
65a0027979 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-28 01:37:55 +03:00
Shadowlight213
ce01058e7c Fixes merge conflicts 2016-05-27 15:36:56 -07:00
Joan Lung
2cfb2d8eed Layers are now defines (#17949)
* Layers are now defines

* this looks better

* GAS_phil_LAYER

* no message

* remove the three unneeded defines

* no message
2016-05-27 22:16:21 +02:00
LatD
67190cb762 Fixes things found in testing 2016-05-26 23:30:42 +03:00
LatD
a6680b9f06 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-26 19:02:46 +03:00
Jordie
91e7bd52ac Merge pull request #17909 from KorPhaeron/brain
Fix for fiery dismemberment
2016-05-26 10:13:35 +10:00
LatD
f36237a67d Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-25 18:45:31 +03:00
LatD
e7d5be221e Small fixes and changes 2016-05-24 23:04:00 +03:00
LatD
907fc36e5c Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-24 22:17:44 +03:00
KorPhaeron
7d51772b39 Fix for fiery dismemberment 2016-05-24 10:52:42 -05:00
Jack Edge
7f49175967 Renames files under code/ with naughty characters
Like seriously, don't use spaces in file names, this is a codebase,
they're annoying. Hopefully Github will show these renames correctly.
2016-05-24 12:16:19 +01:00
oranges
ccf693ae44 Merge pull request #17819 from Core0verload/toolbox_arm
[#17310 Re-Open] "Toolbox Arm" printable at exosuit fabricators and protolathes
2016-05-23 20:06:34 +12:00
LatD
7d6b3e6847 origin and req lvl changes 2016-05-21 17:17:20 +03:00
oranges
5a800f970b Merge pull request #17623 from RemieRichards/ItsAlive!ITSALIVE!
Enables Frankensteins
2016-05-22 01:54:02 +12: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
c0
fb2a0961ff "Toolbox Arm" printable at exosuit fabricators and protolathes 2016-05-21 06:35:32 +03:00
Shadowlight213
86cbe14d15 Conflict fixes 2016-05-19 20:42:26 -07:00
Jack Edge
592cc8983f Made description more american
FREEDOM etc.
2016-05-19 16:39:10 +01:00
LatD
502249831d Syndicate origin tech changes 2016-05-18 20:12:01 +03:00
c0
3c55ec5645 Fixes anything location-dependend not working as cavity implants 2016-05-18 11:36:33 +03:00
LatD
fe76e64641 Origin tech changes and some fixes 2016-05-17 20:57:01 +03:00
Jack Edge
d688dbc1ea Fun description messages for severed limbs 2016-05-16 21:39:21 +01:00
Incoming5643
01ce91bf6d Specflag'd Dismemberment (#17469)
* Adds NODISMEMBER to the species specflags to remove the var. It's not DISMEMBER because that's the default expectation and specflags need to be manually set for every race.

Merges RESISTHEAT and RESISTCOLD into RESISTTEMP. Every situation where one occurred the other did as well. It also doesn't make thermodynamic sense that something good at one wouldn't be good at the other anyways.

* T H E S E  A R E  N O T  B I T F L A G S
2016-05-15 22:05:42 +02:00
Jack Edge
752de6d34d Fixes #17651; missing limbs needed for message
Fleshmend now only produces a visible message if there are actually
limbs missing, where before it always triggered.
2016-05-14 11:31:55 +01:00
Joan Lung
b0a0063a86 Merge pull request #17425 from coiax/voiced-skeletons
Some talking toys now audibly chatter
2016-05-13 14:45:12 -04:00
Razharas
b46de70537 Makes dismemberment more adjustable (#17587)
* Makes dismemberment more adjustable

Makes dismemberment more adjustable
Items now return chance for dismemberment
Bodyparts now decide if they are dismemberable or not by the specific
item
Items now decide what sound to play on dismemberment
No balance changes here

* Owner into H

Owner into H
2016-05-13 20:27:06 +02:00
Jack Edge
889c7240f0 Merge branch 'master' into voiced-skeletons 2016-05-13 18:37:23 +01:00
Remie Richards
b41ebae149 Allows you to frankenstein organic limbs onto people (including from different species!), dealing an appropriate amount of tox damage 2016-05-12 23:05:19 +01:00
Shadowlight213
320bb39eba Removes abductor ability to use guns. (#17515)
* Removes abductor ability to use guns.
Removes agent starting out with an alien blaster

* removes comment

* Makes Abductors able to use alien pistol

Alien pistol now has ALLOW_ALL trigger guard to overcome abductor's
natural NOGUN.

Pistol now starts in the backpack, and the wondertool on the belt.

In addition:
 - Replace multiple copies of IsAbductor() with a single isabductor()
   proc in code/__HELPERS/mobs.dm
 - Adds icon for alien firing pin
 - Adds abductor span for ayylien communication
2016-05-11 20:28:52 +01:00
Jack Edge
a30736e983 Bug fixes and griffin noises 2016-05-10 10:16:11 +01:00
Cheridan
8f6a5f7f1f Merge pull request #17508 from KorPhaeron/cutandtake
Continues to inch dismemberment threshhold downwards
2016-05-10 02:26:21 -05:00
coiax
d563246022 Added the bone tongue to skeletons (#17479) 2016-05-09 18:23:15 +02:00
KorPhaeron
31c03c7360 Dismemberment 2016-05-09 01:48:34 -05:00
Shadowlight213
6191cf0add Merge conflict fix 2016-05-08 16:43:51 -07:00
Shadowlight213
9573fdec0e Speed in nograv works correctly now
Dismemberment support added as well as a way to use the limbs of another species for dismemberment for visually identical species
Flying var changed to species flag
2016-05-08 16:39:54 -07:00
KorPhaeron
024df00cd9 Dismemberment tweaks (#17453)
* Dismemberment tweaks

* Lowers some AP to address remies concerns

* Lowers the dualsaber AP again to prevent nonsense from occuring

* Adds HF blade

* Honk Dagger typo fix

* Lowers chaplain AP again
2016-05-08 20:55:44 +01:00
phil235
53c5b7f5d5 Fixes lizard body markings appearing behind the bodypart layer.
Fixes tail sprite when missing a leg and facing south.
Adds an admin option in human VV to remove a body part.
Fixes typos.
Fixes being able to toggle hardsuit and wintercoat helmet despite having no head.
Changes the dismemberment chance from explosion: bomb armor helps against it, and the maximum number of limbs that you can lose in one explosion is capped depending on the explosion severity.
Missing 1 or 2 legs makes you significantly slower. If without legs, missing an arm makes you slower. You can no longer move when missing all four limbs.
Bodyparts have now force 3 and throwforce 3
Tongues are now properly put in decapitated heads.
Shaking a legless person no longer gives weird results.
2016-05-07 01:00:00 +02:00