Commit Graph

2424 Commits

Author SHA1 Message Date
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
d55170ab97 fixed an extra line added
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-03 01:04:14 +10: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
Hawk-v3
74ed33360b Merge pull request #1975 from RavingManiac/master
Wrapping paper fixes and improvements
2012-11-23 17:52:52 -08: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
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
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
c686245263 Fixes issue #1981
Only secborgs are THE LAW.
2012-11-21 20:54:50 +04: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
d6505fd064 Fix to Issue #1972. Humans now spawn with full SE length, as do monkeys. 2012-11-18 15:40:55 -07:00
cib
7b74e199c5 Fix to breath pressure tresholds.
This also increases default breathing speed a good deal.
2012-11-18 18:12:37 +01:00
Chinsky
56c20b7fb3 Fixed couple of runtimes 2012-11-18 19:32:58 +04:00
cib
8947dc7a0e Lung damage now occurs pressure-based, not oxyloss-based. 2012-11-18 15:48:38 +01:00
RavingManiac
7c76e0758d Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-18 22:04:20 +08:00
Chinsky
ffe541adec Fixes issue #1970
Did not unlock CPR in case CPR was not completed successfully.
2012-11-18 11:05:21 +04:00
Chinsky
6017e8c5db Can never have too much nullchecks. 2012-11-17 19:46:44 +04:00
Chinsky
ea4f34d53c Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/ZAS/FEA_system.dm
2012-11-17 00:20:23 +04:00
Chinsky
beb028d196 Using spawn in proc that deletes self was not so smart... GC outrun me. 2012-11-17 00:17:50 +04:00
Chinsky
f520a79384 Added logging for what I believe to be cause of CPR failing.
Apparently SOMEHOW it goes into shake proc where it quietly returns meeting check for health being above zero.
I ahve no idea why it is not stopped bu check right before the shake proc call, that's what logging is for, maybe health was computed incorrectly, or threshold for crit is wrong.
2012-11-16 21:12:55 +04:00
Chinsky
650dc3dab8 Changed way CPR lock works, no dependancy on world time.stored time now.
When someone starts doing CPR, it locks. After 3 ticks after CPR is done it unlocks. No other mobs can do CPR on same mob while it is locked.
((also it's one of places that can make CPR not start so I wanted ot replace timer with more simple semaphore))
2012-11-16 20:11:28 +04:00
Ater Ignis
8c5b8f8d50 final pass of merging with my branch
I hope I have not forgot anything
Still, it compiled for me at least, and passes test cases i did
2012-11-16 18:54:43 +04:00
Ater Ignis
4ed9b40cb9 tajarans see_in_dark -> 8, disembodied organs rendering correction 2012-11-16 18:41:26 +04:00
Ater Ignis
7f55f25ead comments, and better hulk color 2012-11-16 17:06:47 +04:00
Ater Ignis
cc79346c3b forgot one row 2012-11-16 16:02:36 +04:00
Ater Ignis
c140e3b7d0 update to remote view 2012-11-16 15:55:41 +04:00
Ater Ignis
46bd2ce7e6 human icon generation update, tajarnan darkseeing
*lying icon generated from standing one
*sprites for dismembering major races (tajarnan,skrell,soghun)
*tajarnans can see in darkness better than others
2012-11-16 15:19:20 +04:00
cib
b6f16cb62a Fix for the emote fix. 2012-11-15 19:07:45 +01:00
cib
866a113494 Fixes for issue #1872 2012-11-15 18:40:24 +01:00
cib
1213a50298 Removed alien player limit.
I don't want to know what will happen now, considering medbay *already* was more than 50% non-humans most of the time.
2012-11-15 18:09:33 +01:00
Mloc
9ca5caa419 Fixed the fix of the movement fix thing. Or something.
Signed-off-by: Mloc <colmohici@gmail.com>
2012-11-14 21:39:49 +00:00
Mloc
7cd054e09a Merge pull request #1941 from CIB/master
Ported autopsy
2012-11-14 13:29:20 -08:00
cib
19d2e9d390 Made the autopsy report for projectiles a bit clearer. 2012-11-14 21:33:09 +01:00
cib
2b5d3cac39 Fixed a few organ getter bugs. 2012-11-14 20:59:38 +01:00
cib
7ae7099098 Ported autopsy. 2012-11-14 20:31:31 +01:00