hornygranny
a5a7b590d3
Merge pull request #7866 from phil235/PullBuckleFix
...
Fixes being able to break free from a pull while handcuffed if the puller is buckled.
2015-02-22 20:18:54 -08:00
hornygranny
c0c8a739e2
Merge pull request #7721 from paprka/miening
...
Mining & mine-related chem changes
2015-02-22 20:17:24 -08:00
Jordie0608
edcfae62d3
spellfix
2015-02-22 21:32:39 +11:00
phil235
e9a943218c
Fixes being able to break free from a pull while handcuffed if the puller is buckled.
...
Add the incapacitated proc to mobs to check for stat, stun, weakened, paralysis, restrained. And replacing those checks by that new proc in some places.
2015-02-21 14:49:47 +01:00
Cheridan
6d78f9b77d
Merge pull request #7828 from Incoming5643/let_us_never_speak_of_this_again
...
Removes the unintended ability to have sex with cats
2015-02-20 13:18:46 -06:00
hornygranny
383e4e7111
Merge pull request #7792 from Menshin/regen_statis_tweaks
...
Regenerative statis tweaks
2015-02-19 13:07:24 -08:00
phil235
66720a5ce9
Merge pull request #7834 from Menshin/telexploit_fix
...
Deactivates the Hidden Syndicate Teleportation Device
2015-02-19 16:39:49 +01:00
Menshin
0d0ef9e02a
Deactivates the Hidden Syndicate Teleportation Device
2015-02-19 16:34:49 +01:00
hornygranny
90e0a00298
Merge pull request #7786 from phil235/SiliconGrabFix
...
No more silicon grabbing.
2015-02-18 21:48:30 -08:00
Incoming
e94e94a5e2
fixes #7827
2015-02-19 00:23:56 -05:00
phil235
30eb4e342a
Merge pull request #7652 from Incoming5643/Circumstantial_Dickpixel
...
Tactical dickpixel™ removal
2015-02-18 21:07:08 +01:00
Cheridan
1ac0c26655
Merge pull request #7770 from phil235/AnimationsFix
...
Floating animation and life() fixes.
2015-02-18 02:27:28 -06:00
Menshin
89df7f351d
* Getting into regenerative statis now put the changeling into unconscious state
...
* Fixed reviving not working
2015-02-17 22:04:58 +01:00
phil235
dcd20969a7
Merge pull request #7730 from Incoming5643/mediborg_tools
...
Mediborg Improvement Drive: Tool Time
2015-02-17 19:11:28 +01:00
phil235
6ebd5976f5
Merge pull request #7729 from Incoming5643/mediborg_gauze
...
Mediborg Improvement Drive: The man in gauze
2015-02-17 18:17:59 +01:00
phil235
e09dd08054
Remove aliens grabbing silicons.
2015-02-17 18:03:24 +01:00
phil235
df107499d1
No more silicon grabbing.
2015-02-17 14:59:12 +01:00
phil235
05e3c305ef
Fixes floating animation not updating correctly.
...
Makes life() procs more object oriented.
2015-02-16 18:56:57 +01:00
Incoming
c2c015a91a
Fixes conflicts, fixes casually worn uniforms looking weird
2015-02-15 13:07:06 -05:00
Cheridan
85ff51b3f7
Merge pull request #7753 from Cheridan/master
...
Manual Merge of #7724
2015-02-15 10:34:26 -06:00
Cheridan
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
Cheridan
9c53764675
Merge pull request #7680 from Deantwo/ReadySpam
...
Fixes ready spam
2015-02-14 22:21:06 -06:00
paprka
b2071bfdbf
borg updates
2015-02-14 17:38:17 -08:00
paprka
066b2762d3
lots of crap
2015-02-14 17:25:45 -08:00
paprka
b67f9cec72
Merge branch 'master' of https://github.com/tgstation/-tg-station into miening
2015-02-14 17:08:39 -08:00
Cheridan
6de520bbb2
Merge pull request #7710 from phil235/JitterFix
...
Add a do_jitter_animation proc
2015-02-14 16:23:18 -06:00
Incoming
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
Incoming
711d306048
missed a bit of the commit. You know what they say, measure once, commit twice.
2015-02-14 13:52:36 -05:00
Incoming
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
phil235
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
paprka
88760896ad
initial commit
2015-02-13 20:59:39 -08:00
phil235
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
phil235
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
Cheridan
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
Deantwo
bdf077b4d8
Fixes ready spam
2015-02-12 15:40:26 +01:00
Cheridan
216630f1db
Merge pull request #7572 from phil235/CookingOverhaul
...
Cooking overhaul
2015-02-12 08:01:17 -06:00
MrStonedOne
84ec44d5c4
Revert "remove some duplicate code"
2015-02-11 20:47:41 -08:00
hornygranny
6e2fe375f7
Merge pull request #7650 from dannno/slurring
...
PROPER SLURRING
2015-02-11 17:40:32 -08:00
dannno
012837a4f5
appease my own 'tism
...
even numbers are nice
2015-02-11 20:03:54 -05:00
dannno
7d4fb341df
no more alternating letters in slurring
2015-02-11 20:01:23 -05:00
hornygranny
8f1603b3e4
Merge pull request #7658 from Menshin/viruses_fix
...
Viruses related fixes
2015-02-11 12:25:57 -08:00
Menshin
295fdf0e85
Fixes admin healing not giving blood back.
2015-02-11 20:39:16 +01:00
Menshin
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
phil235
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
Cheridan
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
Incoming
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
dannno
54f1d333d7
Adds a slurring filter, replaces stutter filter where appropriate
2015-02-10 16:39:17 -05:00
Swag McYolosteinen
e971a1af29
Merge pull request #7592 from psykzz/patch-8
...
remove some duplicate code
2015-02-10 18:04:43 +01:00
Swag McYolosteinen
cfacd3bf9f
Merge pull request #7589 from Menshin/reagents_warnings_fix
...
Fixes warnings related to add_reagent
2015-02-10 17:55:32 +01:00
Swag McYolosteinen
f48f254513
Merge pull request #7611 from Incoming5643/youjelly
...
Exotic Blood
2015-02-10 17:43:44 +01:00
