phil235
a62c0333d6
Merge pull request #7685 from optimumtact/destructnuke
...
Nuclear self destruct option with added centcomm fun
2015-02-16 23:09:29 +01:00
Swag McYolosteinen
6914fb0ecc
Merge pull request #7756 from dannno/ohnoimlate
...
Oh no! I'm running late!
2015-02-16 20:43:42 +01:00
dannno
bef844fb89
i hope senpai isnt mad at me
2015-02-15 14:15:02 -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
71dd648fc1
Merge pull request #7749 from Cheridan/master
...
Manual Merge of #7057
2015-02-14 23:21:12 -06:00
Cheridan
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
Cheridan
287a0147a4
Merge pull request #7744 from Cheridan/master
...
Manual Merge of #7005
2015-02-14 22:48:40 -06:00
Cheridan
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
Cheridan
9c53764675
Merge pull request #7680 from Deantwo/ReadySpam
...
Fixes ready spam
2015-02-14 22:21:06 -06:00
Cheridan
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
oranges
bae27bc40b
Allow station self destruct with captains identity card
2015-02-15 12:09:09 +13:00
Cheridan
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
Cheridan
6de520bbb2
Merge pull request #7710 from phil235/JitterFix
...
Add a do_jitter_animation proc
2015-02-14 16:23:18 -06:00
Cheridan
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
Cheridan
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
Cheridan
47a631b1c7
Merge pull request #7713 from paprka/wotdefuk
...
fixes improvised shotgun back slot invisible shit
2015-02-14 16:01:39 -06:00
Cheridan
6064f34b68
Merge pull request #7683 from phil235/CookFix
...
Small Cooking fix
2015-02-14 15:48:34 -06:00
dannno
ddd86a5655
oh no i'm running late
2015-02-14 16:23:02 -05:00
phil235
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
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
Swag McYolosteinen
1aa7f423e9
Merge pull request #7720 from Iamgoofball/patch-32
...
fixes #7719
2015-02-14 12:14:17 +01:00
Swag McYolosteinen
b2d6ce5481
Merge pull request #7668 from dannno/suicidefix
...
Fixes #7647
2015-02-14 12:12:38 +01:00
Iamgoofball
a51ffe8cd4
fixes #7719
...
welp
2015-02-13 20:08:01 -08:00
TheVekter
cd916eb1d9
Re-adds Toxins Special and B-52 to glasses. Oops.
2015-02-13 18:34:58 -06:00
Cheridan
14c9abaaee
Merge pull request #7539 from Iamgoofball/kinetic
...
Ports the kinetic accelerator changes from NT
2015-02-13 17:56:03 -06:00
paprka
cff73d83c6
fixes improvised shotgun back slot invisible shit
2015-02-13 14:04:23 -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
Menshin
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
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
phil235
d9a435bdf7
Fixes being able to stuff slime/monkey in processors even through closed windoors.
2015-02-13 20:24:56 +01:00
Cheridan
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
Sometinyprick
ce8d3e32b6
Update diagnostics.dm
2015-02-13 17:30:52 +00:00
Sometinyprick
98edcffb7d
oops
2015-02-13 17:29:22 +00:00
Sometinyprick
7c8ce232cf
Revert "Adds a new toy to the arcade machine"
...
This reverts commit bc8c8cdcbd
2015-02-13 17:13:56 +00:00
Sometinyprick
2cbff9e2dd
admins are thing
...
thing of admins
2015-02-13 17:00:51 +00:00
WJohn
cf395f7da8
Merge pull request #7643 from TZK13/Plaid-Skirts
...
Adds plaid skirts and new schoolgirl uniform colours
2015-02-13 01:47:57 -05: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
phil235
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
dannno
db0fd07f0f
fixes blowing your brains out without a gun
2015-02-12 15:05:45 -05:00
Sometinyprick
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
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
Cheridan
566fd07593
Merge pull request #7651 from paprka/tacticalfleshlight
...
makes flashlight attaching more modular
2015-02-12 07:55:26 -06:00
Jordie0608
bbdcec0841
adds parent poison mob to gold core exclusion list
2015-02-12 23:41:21 +11:00
phil235
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
Remie Richards
6613851028
Merge pull request #7593 from Cheridan/pin_fix
...
Pin fixes, additions
2015-02-12 06:43:11 +00:00
MrStonedOne
84ec44d5c4
Revert "remove some duplicate code"
2015-02-11 20:47:41 -08:00
dannno
b34c5180ae
modifies and fixes suicide messages for guns and bananas
2015-02-11 22:39:11 -05:00
Cheridan
9e8029e64d
Merge pull request #7645 from TZK13/Purple-Plasma
...
Makes liquid plasma purple
2015-02-11 21:03:53 -06:00
