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
DJSnapshot
751aaa21f4
Merge pull request #3836 from Nanai/dev
...
Miscellanities!
2013-10-27 22:56:48 -07:00
Nanai
b4ea0491c8
Miscellanities: Fixing more broken fluff clothing articles, secondary stamp DMI updated, hemostats added to autolathe to frolick with it's fellows.
2013-10-28 01:46:31 -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
a2ed948ae4
Merge pull request #3831 from Nanai/dev
...
Guide/Manual addition, sprite fix!
2013-10-27 15:35:33 -07:00
Nanai
adc563db05
Added in two new manuals by Magmaram for atmospherics and EVA.
2013-10-27 18:24:30 -04:00
Nanai
88ef9a3be2
Fixed the absent/removed sprite on experimental welding tools.
2013-10-27 18:24:04 -04:00
Kilakk
8b4e5d07e6
Added vending machine stocking
...
* Now with more del() than ever before
* Only works if you have the maintenance panel open
2013-10-27 01:49:19 -04:00
Chinsky
1488850ad1
Merge pull request #3803 from Nanai/dev
...
Drinks Pack/Spritefixes and Vending Machine Loadout
2013-10-21 04:30:15 -07:00
Nanai
219fac680d
Changes the vending machine to account for new drinks, adds grape juice to the juicer.
2013-10-21 07:09:46 -04:00
Chinsky
88f7a48434
Merge pull request #3800 from Segrain/dev
...
Dev update.
2013-10-21 03:04:27 -07:00
Segrain
6655ae9b11
Wallets and cards.
2013-10-21 05:10:33 +03:00
Segrain
8bd055357a
Same fix again.
2013-10-21 04:48:07 +03:00
Segrain
121b10b16c
Conflict fix.
2013-10-21 04:37:28 +03:00
Nanai
137cbba8e4
Cloning pod altered to hold 3 clones worth of biomass at roundstart.
2013-10-20 17:38:26 -04:00
Nanai
461794c662
Cloning pod altered to hold 3 clones worth of biomass at roundstart.
2013-10-20 17:07:02 -04:00
ZekeSulastin
28d546f2b1
Added dialysis volume. Also numbness message for entering.
2013-10-19 17:03:13 -04:00
ZekeSulastin
3455bf7cc1
Add/remove beaker from sleeper for dialysis
...
Redoes the sleeper attackby() prompt to match cryo's style. Also
removes the millionbeaker in favor of a standard large.
2013-10-19 17:03:13 -04:00
ZekeSulastin
0df64f898c
Added dialysis to sleepers
...
Rapidly removes reagents from patient at the cost of blood.
Ported from Jamini's NEV Unity codebase.
2013-10-19 17:03:13 -04:00
Mloc
98caca85f0
Merge pull request #3785 from comma/dev
...
Some fixes
2013-10-19 03:56:29 -07:00
Segrain
ace205b323
Code cleanup.
2013-10-18 08:40:45 +03:00
Segrain
183c44c4c8
Smallfix.
2013-10-18 08:38:14 +03:00
jack-fractal
3732a9c3b9
Adding the dispensers to the cargo lists.
...
Making a sub-type of the dispensers so that they spawn disconnected from the ground.
2013-10-17 19:48:57 -04:00
Segrain
cad425f2ca
Roundend declaration.
2013-10-17 04:07:29 +03:00
Chinsky
930a30cfd0
Moved stuff from /structure to /obj/structure because I am tired of accidently going inside of it for unused file and empty file
2013-10-16 12:51:30 +04:00
Chinsky
55ea60a785
Fixed derpy type of psych couch
2013-10-16 12:50:40 +04:00
Chinsky
f3028d3edd
Attempted fix #3769
...
Var is fine in one line, null in next one. Cannot feasibly prevent that without slapping nullcheck before EVERY mention on that var, so going to just add some sanity checks and call it a day
2013-10-16 11:28:41 +04:00
Segrain
21718c5bac
Fix for #3764 .
2013-10-13 03:44:43 +03:00
Segrain
da0716adb3
Merge remote-tracking branch 'upstream/master' into dev
2013-10-13 03:33:26 +03:00
Segrain
f2bbc60d51
Order fix.
2013-10-12 21:19:54 +03:00
Segrain
b39dfc5229
Smallfix.
2013-10-12 19:49:29 +03:00
Mloc
5e4f389e6f
Merge pull request #3725 from comma/lockdown
...
Lockdown
2013-10-12 06:46:36 -07:00
Segrain
77748f1116
Mecha weapons.
2013-10-12 14:41:24 +03:00
Segrain
34a6735ef8
ERT mecha beacons.
2013-10-12 14:31:12 +03:00
Chinsky
fb0fb4da6a
Merge pull request #3759 from Baystation12/dev-freeze
...
freeze -> dev
2013-10-11 11:41:06 -07:00
Mloc
1b9e5c81ea
Merge pull request #3756 from comma/tableflip
...
Tableflips & cover system
2013-10-11 11:36:31 -07:00
Chinsky
01512e571b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into lockdown
...
Conflicts:
code/game/machinery/doors/firedoor.dm
2013-10-11 22:29:59 +04:00
Chinsky
05bb07375e
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into coathanger
2013-10-11 22:22:08 +04:00
Chinsky
a18fbaac1d
Cover system.
...
Tables now give some cover from bullets and beams.
Standing behind the table gives you 20% chance of table taking the hit instead.
Flipped table gives +20%, but only if bullet comes from the side it faces. Otherwise no cover is provided at all.
Lying on the floor gives +20%.
Table takes half of damage human would, and breaks down after its health goes to zero.
Reinforced talbes have double the health, wooden ones - half.
2013-10-11 22:17:45 +04:00
jack-fractal
6ecab0bc36
- implementing Mloc's suggestions.
...
- fixing the changelog
2013-10-11 13:29:33 -04:00
jack-fractal
32c3f27675
* adding a 'rejuvinate' function to organs that fixes all types of damage
...
* adding a 'restore_all_organs' function to living creatures
* adding a 'restore_blood_loss' function to humans
* fixing changeling stasis power to heal organ and blood damage
* fixing adming rejuvinate verb to fix organ and blood damage
2013-10-11 12:39:54 -04:00
Segrain
eb9a337d07
Merge remote-tracking branch 'upstream/master' into dev
2013-10-11 12:44:44 +03:00
Segrain
7ea98f6d79
Examining fix.
2013-10-11 10:19:58 +03:00
Chinsky
fadc121dac
Can flip weakened reinforced table now too.
2013-10-11 10:52:24 +04:00
Chinsky
c30693dfcf
Flipped tables now have 20% chance to take damage instead of whatever is behind them.
2013-10-11 02:48:41 +04:00
Chinsky
daba423428
Tableflips!
...
You can now flip non-reinforced straight, 1-tile wide tables.
Complete with ugly codersprites for flipped tables.
2013-10-11 02:13:59 +04:00
Chinsky
e1d2dd4aa1
Coat racks. Can hold either labcoat or detective coat.
2013-10-10 15:33:02 +04:00
Chinsky
2cf2031dcd
Merge branch 'master' into coathanger
2013-10-10 14:58:13 +04:00
Chinsky
032d69742f
Derp
2013-10-10 14:46:22 +04:00
