DJSnapshot
231131c1f5
Merge pull request #3814 from Baystation12/dev-freeze
...
0.1.5 merge.
2013-11-03 14:02:16 -08:00
DJSnapshot
11f0b1ef92
Fixed delay so anyone with R_SERVER can use it.
2013-11-03 13:31:54 -08:00
DJSnapshot
2f4812c183
Merge pull request #3861 from Iamgoofball/boozetaketwo
...
Three booze dispenser bug tangos down. You couldn't put drinking glasses in, and Whiskey wasn't in the reagents list.
2013-11-02 16:05:10 -07:00
Iamgoofball
2c30455b10
Grammar tango, spotted and eliminated.
2013-11-02 15:33:22 -07:00
Iamgoofball
ca741fbdd7
Two booze dispenser bug tangos down. You couldn't put drinking glasses in, and Whiskey wasn't in the reagents list.
2013-11-02 15:09:04 -07:00
jack-fractal
b9f9e8a16f
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2013-11-02 16:57:48 -04:00
Mloc
73e6311612
Merge pull request #3859 from comma/dev
...
Made robolimbs into overlays instead of grayscaling limb icon.
2013-11-02 12:54:57 -07:00
Chinsky
d779253ba1
Made robolimbs into overlays instead of grayscaling limb icon.
2013-11-02 23:53:23 +04:00
DJSnapshot
63fb3f29ea
mecha fixes
2013-11-02 12:26:34 -07:00
Iamgoofball
74b5a003cc
Fixed Copypasta!
...
Fixed Copypasta!
2013-11-02 11:17:17 -07:00
Iamgoofball
a75492d26b
Startoad's plasma windows commit, I'm doing the github stuff for it.
...
3677121b51
2013-11-01 18:53:45 -07:00
Kilakk
9b540474f3
Changed the embed check to use its own var instead of checking damagetype
...
* var/embed = 0
* The bullets the detective's revoler uses (weakbullet) will no longer embed into anything.
2013-10-31 22:05:58 -04:00
Nanai
7b5d08e48f
Small fix for head reattachment surgery.
2013-10-30 17:20:18 -04:00
Nanai
31a4c61f0f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2013-10-30 17:15:31 -04:00
Nanai
81632df611
Paincrit rebalance. Adjusted all of the damage types, particularly burn, to more reasonable levels while buffing halloss. Made paincrit incredibly less blackscreen and replaced it with weaken procs in order to make it a bit more roleplay friendly. Increased shock levels will now also affect your aim.
2013-10-30 17:12:42 -04:00
Cael Aislinn
4988c6f7e5
resolves issues with artifact location
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2013-10-30 15:36:56 +10:00
DJSnapshot
39387fa3bb
Merge pull request #3840 from MDReckless/dev
...
Grape Soda addition
2013-10-29 17:06:16 -07:00
DJSnapshot
8bb22f7e18
Merge pull request #3846 from Iamgoofball/boozetaketwo
...
Fixed a CATASTROPHIC GAME-CHANGING BUG with the Soda Dispenser that resulted in much immersuhan breaking: Grape Soda wasn't in the Soda Dispenser dispensable reagents list.
2013-10-29 17:03:54 -07:00
Iamgoofball
a4737f3b22
Added GRAPE DRANK to the Soda Dispenser.
2013-10-29 16:56:50 -07:00
Cael Aislinn
d19b9bc3b7
fixes the issue with coolant being ineffective
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2013-10-29 22:27:23 +10:00
DJSnapshot
730c406015
Merge pull request #3839 from caelaislinn/xenoarchaeology
...
Xenoarchaeology updates
2013-10-28 22:36:08 -07:00
Nanai
ff6c2767b8
Paincrit rebalance. Adjusted all of the damage types, particularly burn, to more reasonable levels while buffing halloss. Made paincrit incredibly less blackscreen and replaced it with weaken procs in order to make it a bit more roleplay friendly. Increased shock levels will now also affect your aim.
2013-10-29 01:02:35 -04:00
DJSnapshot
fe6fda9e46
Merge pull request #3837 from Nanai/dev
...
Decapitation Fixes, Head Reattachment Surgery
2013-10-28 14:01:04 -07:00
MDReckless
5a8a629df7
Update drinkingglass.dm
2013-10-28 15:55:54 -04:00
Cael Aislinn
c419717255
tweaks and reworks much of xenoarch including new content and streamlining/cutting down on old content, removes much unused and old content, slight remap of research outpost (see changelog for more details)
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2013-10-29 05:33:23 +10:00
Cael Aislinn
a4e5bad409
fixes an overwritten fusion reaction, fixes typo on id computer, makes transit tubes traversible, makes conveyor switches access protected
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2013-10-29 05:10:17 +10:00
MDReckless
e6d42432ff
Changed grape soda description
2013-10-28 15:03:30 -04:00
MDReckless
152d83d47c
Update drinkingglass.dm
2013-10-28 15:02:14 -04:00
MDReckless
39d312e69d
Removed grape juice from unneeded area
2013-10-28 15:00:21 -04:00
MDReckless
811a4b1aa9
Adds Grape Soda as a reagent
...
Allows grape soda in a beaker and gives it color
2013-10-28 14:57:08 -04:00
MDReckless
809a7faf58
Adding Grapes to the Juicer allow list
...
Grapes grown from hydroponics can now be juiced
2013-10-28 14:45:36 -04:00
MDReckless
67fcd2e6e4
Grape Soda
...
Adds grape soda as a recipe
2013-10-28 11:24:45 -04:00
Nanai
504e49ffb2
Added a new surgery- Head reattachment, for the decapitationally challenged. Performed via retractor, fix-o-vein, hemostat, cautery, head. Fixed logs and messages for decapitated brain removal - No longer shows as the head cutting the head open, and no longer shows the debrainee as the debrainer to admins.
2013-10-28 07:57:24 -04:00
Kilakk
15f3e063ab
Added a new destination tagger sprite
2013-10-27 22:57:40 -04:00
DJSnapshot
f020959710
Merge pull request #3833 from Nanai/dev
...
Cyborg Alt Titles
2013-10-27 17:34:35 -07:00
Nanai
87ac3c28f0
Added "Android" and "Robot" alt titles to cyborgs- They spawn with posibrains. Robot alt title waiting on an alt MMI/brain type from Ravensdale, but functions with posibrain right now.
2013-10-27 20:23:01 -04:00
DJSnapshot
6eedc4eb3f
Merge pull request #3832 from Nanai/dev
...
Custom item fixes, Supermatter Crates.
2013-10-27 16:21:10 -07:00
Nanai
e4e1c66d4a
Added a supermatter crate and supermatter shard crate, with appropriate CE-only open access for cargo.
2013-10-27 19:17:45 -04:00
DJSnapshot
a2ed948ae4
Merge pull request #3831 from Nanai/dev
...
Guide/Manual addition, sprite fix!
2013-10-27 15:35:33 -07:00
Mloc
979cf24ed7
Merge pull request #3823 from Iamgoofball/boozetaketwo
...
Added the Booze Dispenser, the Soda Dispenser, the Bluespace Beaker, and the Cryostasis Beaker.
2013-10-27 15:29:52 -07:00
Nanai
ba15537f6b
Added two new manuals by MagmaRam to the default engineering manual bookcase.
2013-10-27 18:25:25 -04:00
Iamgoofball
3fa88bb7ff
Fixed beakers not going into DNA scannners.
2013-10-27 13:13:26 -07:00
Iamgoofball
e58438cae8
Fixed the Glass.dm can_be_placed_into list.
2013-10-27 13:09:12 -07:00
Segrain
7ffafb657e
Fix for acid pouring.
2013-10-27 21:56:08 +03:00
Segrain
93cfba21a7
Fix for #3826 .
2013-10-27 21:55:08 +03:00
Iamgoofball
7b1dd38d06
Removed a useless variable, and changed the lists modifications to use += and -=
2013-10-26 22:39:41 -07:00
Iamgoofball
f7ad7cbddb
Actually added the new beakers. Yay for git.
2013-10-26 21:57:26 -07:00
Iamgoofball
cfbe1c6ad1
Added the Booze Dispenser, the Soda Dispenser, the Bluespace Beaker, and the Cryostasis Beaker.
2013-10-26 21:52:13 -07:00
Kilakk
aee7286e6f
Merge remote-tracking branch 'upstream/master' into dev
2013-10-27 00:43:57 -04:00
Kilakk
91e440e26c
Fixes #3801 , C4 will no longer destroy the analyzer it's inside of
...
Committed to dev-freeze because the fix doesn't work with the click code on master
2013-10-27 00:42:11 -04:00
