Commit Graph

4338 Commits

Author SHA1 Message Date
Cael_Aislinn
21e00aa5dc some tweaks 2012-12-05 04:55:50 +10:00
Cael_Aislinn
defcbdc0ac Merge branch 'test_branch' into work_in_progress 2012-12-05 04:48:10 +10:00
Cael_Aislinn
bc3b0757fc added functional bunsen burner (with placeholder sprite), added capability for heated chem recipes, added preservation of data across chemical reactions for xenoarch (not sure if it actually works, seemed a bit buggy), added tungsten as a dispensable reagent for xenoarch
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-05 04:47:48 +10:00
Cael_Aislinn
3257a529ba fixed up the core sampler + gave it a placeholder sprite, made geo data actually persist across turfs and ores, cleaned up some new xenoarch stuff
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-05 04:44:42 +10:00
Cael_Aislinn
f7d41058ed Merge branch 'work_in_progress' of github.com:caelaislinn/Baystation12 into features 2012-12-03 18:56:16 +10:00
Cael_Aislinn
39f07d50bf Merge https://github.com/Baystation12/Baystation12 into features 2012-12-03 18:54:21 +10:00
Cael_Aislinn
cc2771d4d5 thrown facehuggers only have a 25% chance of hitting now, and they have a chance to miss when leaping normally
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-03 13:58:58 +10:00
Cael_Aislinn
ee04fd9f1e significantly reduced alien disarm-stun time (from 10-15 seconds to 0.5-3 seconds), reduced stun chance, added a 25% chance to stun the alien, reduced alien heal rate on weeds from 5 to 1 (they still heal toxin damage at a rate of 5)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-03 13:54:29 +10:00
Cael_Aislinn
d09d7bf313 changed alien neurotoxin to bio type projectile (which means it's stopped by protective gear like biosuits), fixed a runtime
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-03 13:50:57 +10:00
Cael_Aislinn
6d1ea0548d Merge branch 'master' of https://github.com/Baystation12/Baystation12 into work_in_progress
Conflicts:
	code/modules/customitems/item_defines.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-03 13:08:47 +10:00
Cael_Aislinn
d55170ab97 fixed an extra line added
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-03 01:04:14 +10:00
Chinsky
ab440fbf7d Fixed compile error in custom items.
Made rigs protect against radiation again.
2012-12-01 18:35:27 +04:00
Cael_Aislinn
3b6c00eae5 made space ninja a toggleable client option
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-01 18:07:18 +10:00
Cael_Aislinn
c8f603cebd WIP stuff for skin styles sprite accessory
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-01 18:07:02 +10:00
Cael_Aislinn
7e3f58cea2 CPR optimisations, made hypospray visible on the map
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-01 18:06:19 +10:00
Cael_Aislinn
9391d55e6e compile fix
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-01 18:05:05 +10:00
MrYeti
1c3d72e471 Added My own Custom item and Misterbook's pipe spawning in his backpack.
Also deleted some stuff that were requested for deletion.
2012-11-28 16:38:40 -05:00
MrYeti
69992184d3 Deleted the items! 2012-11-27 14:16:21 -05:00
MrYeti
f1b328f1fb Finished up Roaper's Custom item
Now ready to push!
2012-11-26 18:55:54 -05:00
MrYeti
ded839e0f7 Added Custom Item: Monogrammed Handkerchief 2012-11-26 17:15:03 -05:00
MrYeti
fda5be14de Added Roaper's Custom Item
Deleted some unwanted custom item stuff as well
2012-11-26 16:40:19 -05:00
Mloc
1923260b5e Merge pull request #2012 from comma/master
Fixes for surgery
2012-11-26 08:59:20 -08:00
MrYeti
8d0ab6b56c Added Custom Item: Etched Beaker 2012-11-24 23:28:52 -05:00
MrYeti
10b42cc1b3 Fixed my mistake,
Thanks to Sheep for catching it!
2012-11-24 23:01:14 -05:00
MrYeti
de83a09f50 Added Custom Item Left Hand Glove 2012-11-24 15:33:46 -05:00
MrYeti
d63b1b232e Added Custom Item: Scanning Goggles 2012-11-24 14:22:14 -05:00
MrYeti
c92f831811 Added Engraved Zippo Lighter 2012-11-24 08:34:21 -05:00
Hawk-v3
ebc31cfeb2 Merge pull request #2002 from SniperYeti/master
Added Custom Item- Fountain Pen and Lithium Flask
2012-11-23 17:53:52 -08:00
Hawk-v3
74ed33360b Merge pull request #1975 from RavingManiac/master
Wrapping paper fixes and improvements
2012-11-23 17:52:52 -08:00
MrYeti
314911e458 Added Custom item: Lithium Flask 2012-11-23 12:57:58 -05:00
RavingManiac
f4fe11fc4c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-24 01:26:19 +08:00
cib
300219813d Fix for cryo stopping bleeding.
Forgot that internal bleeding doesn't use drip()
2012-11-23 16:04:16 +01:00
cib
d52d0c2c88 Cryo now stops bleeding temporarily.
To be exact, low body temperature in general does.
2012-11-23 15:59:43 +01:00
cib
657ede67c0 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-11-23 15:46:03 +01:00
cib
1d7ade2e64 Fixes issue #2001
Robots with mesons or x-ray now don't see the lighting gradients anymore.
2012-11-22 22:14:30 +01:00
MrYeti
77a2672a6e Added Custom Item: Fountain Pen 2012-11-22 15:48:15 -05:00
Mloc
33aa4f8ae4 Merge pull request #1997 from CIB/master
Go fixes
2012-11-22 12:14:25 -08:00
RavingManiac
e252c47a51 removes the floating code 2012-11-23 02:02:45 +08:00
Chinsky
8e716d12f1 Stuffing mobs in disposals was logged only when you did it via grab.
Now from dragging too.
2012-11-22 21:25:19 +04:00
cib
6fbff77163 Re-nerf lung capacity due to problems with internals. 2012-11-21 22:41:35 +01:00
Mloc
2f3b3f84c3 Merge pull request #1995 from CIB/master
Fixes and stuff
2012-11-21 13:30:32 -08:00
cib
966f78f1ab Fixes #1993
Bleeders now stay dead after being killed by blood loss..
2012-11-21 20:51:57 +01:00
cib
a6c1b5356c Lungs now can only be damaged when breathing from a turf. 2012-11-21 20:41:50 +01:00
cib
e6af3afd42 Fix to breathing inside objects. 2012-11-21 20:33:24 +01:00
Chinsky
15abc757d3 Nullchecks. And one zero division. 2012-11-21 20:55:53 +04:00
Chinsky
c686245263 Fixes issue #1981
Only secborgs are THE LAW.
2012-11-21 20:54:50 +04:00
RavingManiac
e31e117315 Package wrappers can now be put inside backpacks or other storage containers if the container is being held or worn. 2012-11-21 00:48:03 +08:00
SkyMarshal
0644ac9af0 Merge pull request #1974 from CIB/master
Medical fixes and balancing
2012-11-19 11:19:10 -08:00
SkyMarshal
ae3cd42c76 Merge pull request #1973 from comma/master
Runtimes
2012-11-18 17:07:39 -08:00
Ispil
a4074de7b0 Adds a /The to the holstering and drawing a firearm messages, for when the name of the user is improper or not capitalized. 2012-11-18 16:47:52 -07:00