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
7571189a35
More vines for the god of vines
...
Added bluespace vines that are able to grow through walls, glass and
anything and everything
Added space-protective vines that change the space into "vineturfs"
which are basically resprited floors
Made vines be able to spread into space
Changed some vinecontroller vars, now you can adjust the speed of
spreading both by capping the max vines per tick and new-vines to
existing-vines spread ratio
Made the chance to mutate per spread be dependant on the potency of the
seed
Made the spreading speed be dependant on productivity of the seed(can be
both slower and faster then current one)
Fixed some potential runtimes with calling destroy() instead of qdel()
where needed
Removed the colon added by carn, its all checked in Enter call few lines
later anyway
I like vines
2015-02-13 01:13:13 +03:00
d3a439a0a1
Changes the sec hardsuit to be slightly more armored and HoS exclusive, armory hardsuits are now slimmer
2015-02-12 15:53:37 -05:00
897618d42f
Fixed some recipes in chef recipes book. Fixed jelly sandwich recipes. Remove unused milk/soymilk carton sprites from drinks.dmi
2015-02-12 21:39:20 +01:00
db0fd07f0f
fixes blowing your brains out without a gun
2015-02-12 15:05:45 -05:00
bc8c8cdcbd
Adds a new toy to the arcade machine
...
Adds a pig mask which changes your speech to pigspeak, can be turned on
and off.
2015-02-12 19:09:05 +00:00
940601bcfa
Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
...
Conflicts:
icons/obj/guns/energy.dmi
2015-02-13 01:14:52 +08:00
0b0737b292
Merge remote-tracking branch 'remotes/origin/master' into IonCarbinesFor-k-ommandos
...
Conflicts:
icons/mob/belt.dmi
icons/obj/guns/energy.dmi
2015-02-12 09:08:31 -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
566fd07593
Merge pull request #7651 from paprka/tacticalfleshlight
...
makes flashlight attaching more modular
2015-02-12 07:55:26 -06:00
bbdcec0841
adds parent poison mob to gold core exclusion list
2015-02-12 23:41:21 +11:00
25b2cb0296
Merge pull request #7672 from MrStonedOne/revert-7592-patch-8
...
Revert #7592 for breaking ai objection interaction. fixes #7671 - ai can not interact with most topic based interfaces
2015-02-12 12:26:44 +01:00
6613851028
Merge pull request #7593 from Cheridan/pin_fix
...
Pin fixes, additions
2015-02-12 06:43:11 +00:00
84ec44d5c4
Revert "remove some duplicate code"
2015-02-11 20:47:41 -08:00
b34c5180ae
modifies and fixes suicide messages for guns and bananas
2015-02-11 22:39:11 -05:00
9e8029e64d
Merge pull request #7645 from TZK13/Purple-Plasma
...
Makes liquid plasma purple
2015-02-11 21:03:53 -06: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
0db4c09326
Merge pull request #7573 from xxalpha/schizo
...
Hear the voice of the chosen deity in your head.
2015-02-11 09:52:05 -06:00
7c360499be
Merge pull request #7644 from TZK13/Novaflowers-and-Watermelons
...
Novaflower and watermelon improvements
2015-02-11 09:14:16 -06: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
65e8a4ce31
Merge pull request #7624 from paprka/defibfuckupv2
...
Defib changes
2015-02-11 08:37:28 -06:00
8ec97cdaa1
Merge pull request #7632 from GunHog/ExperimentorChanges
...
E.X.P.E.R.I-MENTOR changes
2015-02-11 08:18:57 -06:00
8ae7a739dd
Lowered maximum amount of possible fire stacks even more.
2015-02-11 06:51:23 -06:00
2e919da8ab
Lowered maximum amount of possible fire stacks.
2015-02-11 06:23:44 -06:00
575b117a70
Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
...
Conflicts:
icons/obj/drinks.dmi
2015-02-10 21:37:49 -08:00
5786626c87
Introducing the Ion Carbine!
...
- Adds the Ion Carbine, a compact version of the Ion Rifle that users
can carry on their belt or in a regular backpack.
- Adds the Ion Carbine to R&D, replacing the Ion Rifle.
- Ion Rifle now starts with a pin installed as it can no longer be made
in Science.
- The Ion Rifle and Ion Carbine can now accept Seclites as an
attachment.
2015-02-10 18:03:30 -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
eabbd88858
makes flashlight attaching more modular
2015-02-10 14:17:57 -08:00
3861126c2c
Reverts drunkenness changes per #7439
...
Fixes a typo
Makes players drink full shot no matter how much is in glass
2015-02-10 15:54:15 -06:00
54f1d333d7
Adds a slurring filter, replaces stutter filter where appropriate
2015-02-10 16:39:17 -05:00
5cc6371217
Merge branch 'master' of https://github.com/tgstation/-tg-station into shotglasseshowdotheywork
2015-02-10 12:06:04 -06:00
2b346676c1
Moved shotglasses back to drinkingglass.dm. Again.
...
Added a bunch more iconstates for each drink in the booze-o-mat. Any drink the shot doesn't recognize comes up as a "shot of... what?"
2015-02-10 11:50:28 -06:00
e971a1af29
Merge pull request #7592 from psykzz/patch-8
...
remove some duplicate code
2015-02-10 18:04:43 +01:00
748341131c
Merge pull request #7588 from Deantwo/ChemicalAnalyzing
...
Analyze Upgrade
2015-02-10 18:03:37 +01:00
811a65f932
Merge pull request #7566 from Delimusca/chemheating
...
reagent temperature enhancements
2015-02-10 18:02:37 +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
a62cbb77e5
Merge pull request #7501 from Iamgoofball/patch-28
...
makes epipens more powerful at stopping losebreath
2015-02-10 17:50:47 +01:00
f130872f4e
Merge pull request #7517 from RemieRichards/MovableUIElements
...
Movable UI Elements!
2015-02-10 17:50:33 +01:00
bc64407000
Merge pull request #7582 from GunHog/FreePointsForHumanMiners
...
Lets Silicons and Drones use the Ore Redemption Machine
2015-02-10 17:46:03 +01:00
f48f254513
Merge pull request #7611 from Incoming5643/youjelly
...
Exotic Blood
2015-02-10 17:43:44 +01:00
7882b3898b
Merge pull request #7631 from phil235/SinguloInvestigateLogFix
...
Fix singularity investigate log
2015-02-10 17:41:06 +01:00
e5e8b27790
Merge pull request #7491 from paprka/simplyepicbuff
...
Removes range from ebow bolts + price revert + bugfix
2015-02-10 17:15:44 +01:00
80ce37a611
Makes liquid plasma purple.
2015-02-10 07:24:18 -06:00
Cheridan
Razharas
dannno
phil235
Sometinyprick
Steelpoint
GunHog
Deantwo
Jordie0608
Remie Richards
MrStonedOne
hornygranny
Menshin
phil235
TZK13
Iamgoofball
Incoming
paprka
TheVekter
Swag McYolosteinen