5efd05ec00
Changelog and vineturf sanity checks
...
Added changelog and disabled most of floor procs for vines
2015-02-19 01:48:12 +03:00
a85099ac5a
Merge branch 'master' of https://github.com/tgstation/-tg-station into FUCKGIT
2015-02-18 01:30:47 +03:00
d775291bdf
Made vines cultivatable
...
Added special proc to all seeds that give plant anazyler special
information if needed in form of list of strings that will be displayed
to user one by one
Added special proc to seeds that make them have some special chem
interactions on growth if needed
Made vine mutations have quality of either good, bad or neutral
Made some chems remove the mutations of certain quality from growing
seeds
Made some chems tweak potency and production of the growing vine seeds
both ways so you can make unmutatable slowly growing vines if needed
Vine seeds now show mutations on the plant analyzing
Cut some copypaste in analyzer proc
2015-02-18 01:27:52 +03:00
dcd20969a7
Merge pull request #7730 from Incoming5643/mediborg_tools
...
Mediborg Improvement Drive: Tool Time
2015-02-17 19:11:28 +01:00
5d0e800c3d
Merge branch 'master' of https://github.com/tgstation/-tg-station into FUCKGIT
...
Conflicts:
icons/turf/floors.dmi
Fixing merge conflicts
2015-02-17 20:33:52 +03: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
7a40b51d4a
Merge pull request #7731 from Incoming5643/mediborg_drugs
...
Mediborg Improvement Drive: Reefer Madness
2015-02-17 15:37:39 +01:00
ce1ae70d1a
Merge pull request #7723 from Miauw62/welpwelp
...
Fixes walls becoming nondense due to adminteleport.
2015-02-17 14:28:03 +01:00
f95dd77509
Merge pull request #7740 from Menshin/nano_solars
...
NanoUIzed Solar Control Computers
2015-02-17 13:53:37 +01:00
18a344e66b
Update adminjump.dm
2015-02-17 13:44:21 +01:00
a62c0333d6
Merge pull request #7685 from optimumtact/destructnuke
...
Nuclear self destruct option with added centcomm fun
2015-02-16 23:09:29 +01:00
6914fb0ecc
Merge pull request #7756 from dannno/ohnoimlate
...
Oh no! I'm running late!
2015-02-16 20:43:42 +01:00
bef844fb89
i hope senpai isnt mad at me
2015-02-15 14:15:02 -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
71dd648fc1
Merge pull request #7749 from Cheridan/master
...
Manual Merge of #7057
2015-02-14 23:21:12 -06:00
1ad51c8201
Merge branch 'qoladv' of git://github.com/tkdrg/-tg-station into tkdrg-qoladv
...
Conflicts:
code/modules/admin/admin_verbs.dm
2015-02-14 23:16:02 -06:00
287a0147a4
Merge pull request #7744 from Cheridan/master
...
Manual Merge of #7005
2015-02-14 22:48:40 -06:00
c0d286ca72
Merge branch 'chem_synth' of git://github.com/lolnon/-tg-station into lolnon-chem_synth
...
Conflicts:
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm
2015-02-14 22:42:42 -06:00
9c53764675
Merge pull request #7680 from Deantwo/ReadySpam
...
Fixes ready spam
2015-02-14 22:21:06 -06:00
a264b85cb3
Sneaky scroll bars
2015-02-15 02:57:27 +01:00
26213d59aa
* Converted solar control computers interfaces to NanoUI
...
* Removed some now unused code
2015-02-15 02:39:48 +01:00
2817785936
Merge pull request #7718 from TheVekter/shotglasseshowdotheywork
...
Re-adds Toxins Special and B-52 to glasses.
2015-02-14 18:33:00 -06:00
bae27bc40b
Allow station self destruct with captains identity card
2015-02-15 12:09:09 +13:00
d3df7d6240
Merge pull request #7708 from phil235/GrabProcessorAdjacencyFix
...
Fixes being able to stuff slime/monkey in processors even through closed windoors.
2015-02-14 17:00: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
b046d73772
Merge pull request #7702 from Sometinyprick/adminthing
...
Allows admins to back out of blanking tcomms and reloading admins.
2015-02-14 16:14:25 -06:00
cc46590ed7
Merge pull request #7712 from Menshin/R&D_search_screen_fix
...
R&D search function minor fix
2015-02-14 16:08:15 -06:00
47a631b1c7
Merge pull request #7713 from paprka/wotdefuk
...
fixes improvised shotgun back slot invisible shit
2015-02-14 16:01:39 -06:00
6064f34b68
Merge pull request #7683 from phil235/CookFix
...
Small Cooking fix
2015-02-14 15:48:34 -06:00
ddd86a5655
oh no i'm running late
2015-02-14 16:23:02 -05:00
022bd22a61
Removes omnizine from mediborgs for having a hidiously deadly overdose mechanic that was making asimov borgs cry and replaces them with the "big three" injectible healers of goonchem. Between them all four typs of vanilla damage are covered.
2015-02-14 14:13:20 -05: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
e0f82d960a
removes incorporealmove things
2015-02-14 18:39:16 +01:00
2e7479c998
Adding cake batter, pie dough and raw pastry base recipes to tablecrafting in case people struggle to add milk to the dough.
...
Adding opencontainer flag to dough, doughslice and flat dough so you can transfer reagent to them using a beaker.
Renaming sandwich without a top to "toast".
2015-02-14 15:27:08 +01: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
1aa7f423e9
Merge pull request #7720 from Iamgoofball/patch-32
...
fixes #7719
2015-02-14 12:14:17 +01:00
b2d6ce5481
Merge pull request #7668 from dannno/suicidefix
...
Fixes #7647
2015-02-14 12:12:38 +01:00
f9b962fd47
Fixed #7594 , walls becoming nondense due to adminteleport.
2015-02-14 12:00:04 +01:00
a51ffe8cd4
fixes #7719
...
welp
2015-02-13 20:08:01 -08:00
cd916eb1d9
Re-adds Toxins Special and B-52 to glasses. Oops.
2015-02-13 18:34:58 -06:00
14c9abaaee
Merge pull request #7539 from Iamgoofball/kinetic
...
Ports the kinetic accelerator changes from NT
2015-02-13 17:56:03 -06:00
cff73d83c6
fixes improvised shotgun back slot invisible shit
2015-02-13 14:04:23 -08: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
04aea90f86
* Building an item from the protolathe/imprinter now correctly returns to the previous screen (categories or search)
...
* A typo fixed
2015-02-13 22:33:58 +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
d9a435bdf7
Fixes being able to stuff slime/monkey in processors even through closed windoors.
2015-02-13 20:24:56 +01:00
50e1ac9b99
Merge pull request #7679 from Jordie0608/allthatglittersisnotinvisible
...
Adds parent poison mob to gold core exclusion list
2015-02-13 12:14:49 -06:00
Razharas
phil235
Swag McYolosteinen
dannno
Cheridan
Menshin
oranges
Incoming
phil235
Iamgoofball
TheVekter
paprka