90e0a00298
Merge pull request #7786 from phil235/SiliconGrabFix
...
No more silicon grabbing.
2015-02-18 21:48:30 -08:00
30eb4e342a
Merge pull request #7652 from Incoming5643/Circumstantial_Dickpixel
...
Tactical dickpixel™ removal
2015-02-18 21:07:08 +01:00
1ac0c26655
Merge pull request #7770 from phil235/AnimationsFix
...
Floating animation and life() fixes.
2015-02-18 02:27:28 -06:00
dcd20969a7
Merge pull request #7730 from Incoming5643/mediborg_tools
...
Mediborg Improvement Drive: Tool Time
2015-02-17 19:11:28 +01:00
6ebd5976f5
Merge pull request #7729 from Incoming5643/mediborg_gauze
...
Mediborg Improvement Drive: The man in gauze
2015-02-17 18:17:59 +01:00
e09dd08054
Remove aliens grabbing silicons.
2015-02-17 18:03:24 +01:00
df107499d1
No more silicon grabbing.
2015-02-17 14:59:12 +01:00
05e3c305ef
Fixes floating animation not updating correctly.
...
Makes life() procs more object oriented.
2015-02-16 18:56:57 +01:00
c2c015a91a
Fixes conflicts, fixes casually worn uniforms looking weird
2015-02-15 13:07:06 -05:00
85ff51b3f7
Merge pull request #7753 from Cheridan/master
...
Manual Merge of #7724
2015-02-15 10:34:26 -06:00
15439b8c4e
Merge branch 'ObjProcessingFix' of git://github.com/phil235/-tg-station into phil235-ObjProcessingFix
...
Conflicts:
code/game/gamemodes/wizard/artefact.dm
2015-02-15 10:27:50 -06:00
9c53764675
Merge pull request #7680 from Deantwo/ReadySpam
...
Fixes ready spam
2015-02-14 22:21:06 -06:00
6de520bbb2
Merge pull request #7710 from phil235/JitterFix
...
Add a do_jitter_animation proc
2015-02-14 16:23:18 -06:00
bc2c692825
Adds a full assortment of surgery tools to the mediborg
...
Mediborgs won't accidentally slice up people if they use the wrong tool
Mediborgs won't fail surgery steps
2015-02-14 14:04:26 -05:00
711d306048
missed a bit of the commit. You know what they say, measure once, commit twice.
2015-02-14 13:52:36 -05:00
2885470c50
Adds gauze to Mediborgs, it can be regenerated in chargers much the same as the engiborgs materials
2015-02-14 13:45:23 -05:00
135293bedf
Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.
...
Fixes Alien embryo processing that was processed twice.
2015-02-14 14:18:49 +01:00
5b7a0b0358
Fixed the jitter effect of the taser (it was broken). Hulks now don't jitter when stunned but scream. Humans and monkeys jitter immediately after getting tazed and only fall after 2 seconds.
2015-02-13 22:53:47 +01:00
281f42b1fe
Add a do_jitter_animation proc to do the jitter animation immediately w/o having to wait for life.dm().
2015-02-13 20:49:41 +01:00
0d211471b8
Merge pull request #7662 from Menshin/admin_blood_healing
...
Fixes admin healing not giving blood back.
2015-02-12 16:13:22 -06:00
bdf077b4d8
Fixes ready spam
2015-02-12 15:40:26 +01:00
216630f1db
Merge pull request #7572 from phil235/CookingOverhaul
...
Cooking overhaul
2015-02-12 08:01:17 -06:00
84ec44d5c4
Revert "remove some duplicate code"
2015-02-11 20:47:41 -08:00
6e2fe375f7
Merge pull request #7650 from dannno/slurring
...
PROPER SLURRING
2015-02-11 17:40:32 -08:00
012837a4f5
appease my own 'tism
...
even numbers are nice
2015-02-11 20:03:54 -05:00
7d4fb341df
no more alternating letters in slurring
2015-02-11 20:01:23 -05:00
8f1603b3e4
Merge pull request #7658 from Menshin/viruses_fix
...
Viruses related fixes
2015-02-11 12:25:57 -08:00
295fdf0e85
Fixes admin healing not giving blood back.
2015-02-11 20:39:16 +01:00
4be0d7940a
* Fixes exponentially growing number of diseases on iv_drip giving contaminated blood
...
* Reagents now reacts when given by iv_drip()
* Viruses now correctly transfer on blood transfusion
* Some code cleaning
2015-02-11 18:16:17 +01:00
549b71a487
Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul
...
Conflicts:
icons/obj/drinks.dmi
Fixing a couple typos. Making sure all eggs used in tablecraft recipes are boiled
2015-02-11 16:13:04 +01:00
ee75ba2acd
Merge pull request #7639 from GunHog/RollyPollyBorgies
...
Adds movement states for some cyborgs + overlay for miner jetpack
2015-02-11 09:02:09 -06:00
6811835f41
Modifies the fitted var to allow for clothing that looks good with female uniform generation save for the dickpixel(tm), FEMALE_UNIFORM_TOP.
...
Reclassified uniforms as needed. Most uniforms can now get some sort of variation without any sort of visual weirdness.
Uniforms with "enhanced" chests continue to be excluded for that very reason, ironically.
2015-02-10 17:56:55 -05:00
54f1d333d7
Adds a slurring filter, replaces stutter filter where appropriate
2015-02-10 16:39:17 -05:00
e971a1af29
Merge pull request #7592 from psykzz/patch-8
...
remove some duplicate code
2015-02-10 18:04:43 +01:00
cfacd3bf9f
Merge pull request #7589 from Menshin/reagents_warnings_fix
...
Fixes warnings related to add_reagent
2015-02-10 17:55:32 +01:00
f48f254513
Merge pull request #7611 from Incoming5643/youjelly
...
Exotic Blood
2015-02-10 17:43:44 +01:00
8465c965c0
Adds movement states for some cyborgs
...
Mining and Mediborgs get new movement states.
Janiborg scubbers will only move when the borg does.
Made mining borg jetpack an overlay.
2015-02-10 00:44:38 -06:00
50632ce59b
Fix singularity investigate log showing "X has consumed" instead of "X has been consumed by the singularity."
2015-02-09 17:29:54 +01:00
6e55479a8d
Merge pull request #7583 from GunHog/AI_Stat_bugfix
...
AI status screen now properly reports AFK cyborgs
2015-02-08 21:59:06 +01:00
732a54fe63
Making all meat subtypes of snacks/meat
...
Adding specific cutlets and raw cutlets for a lot of types of meat.
Enabling reagent transfer from ingredients to resulting dish for foodtablecrafting
Adjusting tablecraft food recipes reagents accordingly.
Adding raw pastry base and pastry base food and including it into certain recipes.
2015-02-08 21:36:54 +01:00
54c40ee0ad
Adds a new species var, exotic_blood, that can be used with species that don't have traditional blood so you can still draw something from them if such a thing logically makes sense.
...
It's used here to allow slime jelly to be drawn from slimepeople (and the far less seen jellypeople)
In both cases slime jelly is produced from nutrition, and will always do so unless you've got either extremely low nutrition or extremely high slime jelly.
Practical effects of this:
*You can kill slimepeople in a few special ways, you can syrigne all the jelly out and once they run out of nutrition to replace it they'll stop breathing, chems that help clear toxins also screw them over BADLY in this way.
*slimepeople get free access to a semipotent toxin whenever they want provided they have a syringe on hand, but have to manage their nutrition if they rely on it.
*Other chems can be syringed wholesale out of slimepeople as well provided they haven't been metabolized yet.
2015-02-08 03:18:50 -05:00
5610b46a0f
Merge pull request #7528 from paprka/clothessec
...
Some clothing changes
2015-02-07 17:00:36 -06:00
b2ad540f78
needed the key,
...
I dont like this whole function and am kinda feeling to kill it all.
2015-02-07 20:52:45 +00:00
1246f14dd1
incorrect proc name
2015-02-07 20:37:49 +00:00
ae0b1cf606
remove some duplicate code
2015-02-07 15:52:11 +00:00
e154d69b0b
* Fixes warnings related to add_reagent when trying to inject blood containing reagents
...
* Fixes sleepers showing reagent id instead of name
* Some formatting adjustments to the mass spectrometer output
* Make the "Saline-Glucose Solution" name fit in one line.
2015-02-07 16:32:25 +01:00
fa9cadfb09
AI's tracker now properly reports AFK borgs
...
- Adds borg client check to the Status screen for the AI
2015-02-06 16:15:28 -06:00
ea3bb2e80b
Merge branch 'master' of https://github.com/tgstation/-tg-station into SecBorgDisabler
...
Conflicts:
code/modules/research/designs/mechfabricator_designs.dm
2015-02-06 13:19:15 +08:00
c527491f41
Merge branch 'master' of https://github.com/tgstation/-tg-station into clothessec
...
Conflicts:
icons/mob/uniform.dmi
icons/obj/clothing/uniforms.dmi
2015-02-05 17:44:22 -08:00
bb188da5bf
Merge pull request #7490 from Miauw62/sayfix
...
Fixes saycode breaking when the ckey of a ghost was set to null.
2015-02-05 11:54:23 -08:00
hornygranny
phil235
Cheridan
phil235
Incoming
Deantwo
MrStonedOne
dannno
Menshin
Swag McYolosteinen
GunHog
Matt Smith
Steelpoint
paprka