Mloc-Argent
7ac43fa871
Merge branch 'master' into dev
2013-08-13 22:21:37 +01:00
Mloc-Argent
e2e747fa0a
Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev
2013-08-13 22:21:09 +01:00
meyar
e74782bbdb
Unfucks pepper spray. IT ACTUALLY DOES THINGS NOW. KO spray replaced with stun/weaken.
2013-08-13 16:51:15 -04:00
Segrain
3ba5c3e450
Compile fix.
2013-08-13 13:47:22 +03:00
Segrain
6122d50ce0
Reverting to as advertised.
2013-08-13 09:25:28 +03:00
Erthilo
1228ba8a25
Allows autoinjectors to be refilled.
2013-08-12 21:17:16 +01:00
Zuhayr
375437a6cf
Changelog merge. I hate the changelog.
2013-08-12 11:20:41 -07:00
Zuhayr
2ce91a3fbc
Commented out gold slime core reactions.
2013-08-10 18:19:41 -07:00
Zuhayr
520d1b34d2
Merge resolution.
2013-08-05 08:00:03 -07:00
Zuhayr
98798ea5fc
Compile fixes for organ/reagent code.
2013-08-04 11:25:40 -07:00
Zuhayr
b34effdc4b
Merge pull request #3420 from comma/medtweaks
...
Liver's delight
2013-08-03 17:39:21 -07:00
comma
747c71096e
Fixed monkeys not getting space rabies via syringes.
2013-08-04 00:32:37 +04:00
Zuhayr
b875ff021b
Vast array of changes to replace mutantrace with species datum
2013-08-03 15:08:54 -07:00
comma
019e8aa0d4
Alcohol causes liver damage and some toxic damage, at the stage where you pass out.
2013-08-02 18:41:07 +04:00
comma
95f00d0523
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into medtweaks
2013-08-01 10:03:46 +04:00
comma
c8f5b98a95
Autoinjectors.
...
Now they are one-use, as they were intended.
You can still change their contents with syringes before they are used.
To mitigate their one-use nature, box of them is added to medical closets and supply pack.
2013-08-01 08:12:56 +04:00
Zuhayr
08ff3df905
Vox gear tweaks. Dartgun buff, removal of tank sounds, addition of multitools.
2013-07-29 06:43:37 -07:00
Mloc-Argent
e7f38be3b4
Beakers and other glass containers now hide their contents, only showing the amount.
...
Additionally, they can be labeled with a pen, up to a max of 10 characters.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-22 17:38:34 +01:00
Mloc-Argent
adc3c14779
Revert #3316 from BEF due to compile errors and (assumed) missing files.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-20 18:38:00 +01:00
Mloc-Argent
f29cd5946f
Merge branch 'master' into bleeding-edge-freeze
2013-07-19 14:48:40 +01:00
LordBraindead
08d2e22220
fire update
...
enabled fire to destroy floors and objects
also tweaked the behaviour of glass to enable glasslocks against fire
also made fire extingiushers stop being useless
2013-07-14 21:20:45 +02:00
Spamcat
aa1310a44f
Fixed a potential runtime and removed buggy mobs from gold slime's spawn list as per raven's request.
2013-07-09 13:40:04 +04:00
comma
50f94ddd93
Merge branch 'bleeding-edge-freeze' into viro
2013-07-01 17:33:24 +04:00
comma
da884f4ddc
Merge branch 'bleeding-edge-freeze' of https://github.com/comma/Baystation12 into viro
2013-07-01 17:23:09 +04:00
Zuhayr
1d28bb7cb3
Message tweaks.
2013-06-28 15:55:41 -07:00
Zuhayr
f5abc3e041
Syringes now have an increased delay when injecting through a hardsuit.
2013-06-27 17:59:37 -07:00
Zuhayr
3c7bd1f527
Dartgun tweaks and vox raider spawn equipment changes.
2013-06-26 00:00:55 -07:00
Zuhayr
722a336e2a
Attempted fix to non-refreshing window.
2013-06-25 23:30:13 -07:00
Zuhayr
7a9b501bc0
Dartgun tweaks, vials.
2013-06-24 02:04:44 -07:00
meyar
6f84917a58
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-06-23 00:17:13 -04:00
Chinsky
2a9be1a2aa
Commented out blood/virus food reaction, that was about tg virus system.
2013-06-22 12:08:37 +04:00
Segrain
618da8a7c4
Alcohol bugfixes.
2013-06-22 07:33:33 +03:00
Zuhayr
f38865f0de
Added a dart gun and sprites.
2013-06-21 06:01:39 -07:00
jack-fractal
4045df96a5
- renaming existing "tea" icon to hot_coco
...
- adding "teacup" icon
- revising icon-state for hot coco and tea
2013-06-19 00:47:12 -04:00
Chinsky
a3587dc81d
Adds new virology machine - centrifuge.
...
Used for extracting virus samples or antibodies.
Accepts only vials.
2013-06-19 02:33:32 +04:00
Chinsky
960a22ee43
Changes way viruses are stored in mobs.
...
Now it's an associative list:
uniqueID - virus datum
Updated most instances to match it.
2013-06-19 02:28:53 +04:00
Chinsky
fd13ff0d64
Merge branch 'vials' into viro
2013-06-16 11:22:15 +04:00
Chinsky
ca4c3869b9
Merge branch 'bleeding-edge-freeze' into vials
2013-06-16 11:20:45 +04:00
Chinsky
a76b87635e
It only holds 15 units.
2013-06-15 15:54:43 +04:00
Jamini
89766706fe
Alien Monkeys - Farwa, Stok, Aenera
...
Signed-off-by: Jamini <mobiousjami@gmail.com >
2013-06-14 02:22:27 -04:00
Mordeth221
91bd0d453b
Cyborg Medical Hypo Changing Doctors Delight to Tricordrazine
...
Changing because they have the same effect, yet Doctors Delight causes people to get drunk/slurr words.
2013-06-12 21:55:07 +02:00
Chinsky
6dc2d9d2dc
Merge pull request #3015 from comma/master
...
Fix
2013-06-10 11:50:50 -07:00
Chinsky
b50216cec6
Fixes #3017
...
Looks like will have to put speshul check back...
2013-06-09 19:54:43 +04:00
Chinsky
7a8a822a92
Made it possible for mob to be infected with several viruses at once.
2013-06-09 13:31:16 +04:00
Chinsky
59834d2ed9
Added new reagent container - vial.
...
basically 15u beaker.
2013-06-08 12:39:03 +04:00
Zuhayr
9e71180e1b
Merge conflict resolution, using BEF.
2013-06-05 14:22:04 +09:30
Asanadas
3be319a555
Merge pull request #2967 from comma/master
...
Drugs and Surgery fixes
2013-06-04 10:19:59 -07:00
Spamcat
c5a57ccdc4
Runtime fixes, tweaks.
2013-06-04 16:25:41 +04:00
Chinsky
0ad08b13cc
Fixes #2954
...
Winners do no use Space Drugs to escape from cuffs.
2013-06-04 13:14:51 +04:00
Chinsky
40e8d9b792
Fixes radium not producing cures for virus2.
2013-06-02 23:58:29 +04:00
