Commit Graph

7858 Commits

Author SHA1 Message Date
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
Chinsky
965efe9d23 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-21 08:19:36 +04:00
Chinsky
59a31bab86 Added delay to vessel repair surgery.
Fixed metroid core surgery exploit.
2012-11-21 08:19:10 +04:00
SkyMarshal
0644ac9af0 Merge pull request #1974 from CIB/master
Medical fixes and balancing
2012-11-19 11:19:10 -08:00
cib
c5d35839ba Fixes issue #1959
Crew transfer shuttles now force the mode to finish, even if the mode has other finish conditions.
2012-11-19 12:24:14 +01: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
Ispil
afe7e4642a Fix to Issue #1978. Removes the extra "t" in "the." 2012-11-18 16:38:01 -07: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
cib
3a3f2ff4a1 Medical scanner additions.
- Stationary scanners detect vira.
- Portable scanners detect internal bleeding.
2012-11-18 16:38:29 +01:00
Chinsky
56c20b7fb3 Fixed couple of runtimes 2012-11-18 19:32:58 +04:00
cib
d0a542bc54 You now come out of cloning with slightly more damage. 2012-11-18 16:18:22 +01:00
cib
e24d6ee902 Reduced internal bleeding speed. 2012-11-18 15:59:28 +01:00
cib
8947dc7a0e Lung damage now occurs pressure-based, not oxyloss-based. 2012-11-18 15:48:38 +01:00
Chinsky
684679cefb Fixes issue #1971
Lasertag and practice beams won't explode tanks anymore.
2012-11-18 11:24:17 +04: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
Ispil
ce0c2fc792 Fix to Issue #1961. Changes the Space Law book to link to the Baystation 12 wiki. Also changes the Engineering Textbook to link to the Baystation 12 wiki. 2012-11-17 12:16:02 -07: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
Mloc
49a81a62b5 Merge pull request #1964 from AterIgnis/tajdarkee_iconsupd
Icons Updated & Tajarnan Darksight
2012-11-16 12:11:00 -08: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
Chinsky
25a3466285 Runtime fix. 2012-11-16 19:37:09 +04:00
Ater Ignis
137ed48938 clean out 2012-11-16 19:18:28 +04:00
Ater Ignis
a96e4c3600 if amputated full arm or leg, make hand or foot amputated too 2012-11-16 19:00:45 +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
Chinsky
e6a2bb594b Reverted revert of my fix. No idea why I did that at all... 2012-11-16 18:28:09 +04:00
Ater Ignis
3d88251a3f limbs patch
*don't drop limbs if already did that
*subraces icons for limbs
*left and right legs
2012-11-16 17:12:17 +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
Chinsky
750dc608fc Should prevent cloned Skrells and cats losing ears/tentacles after cloning. 2012-11-16 13:36:58 +04:00
Cael_Aislinn
7b7a200155 added nullcheck to ZAS func, fix for severed powernets still being connected
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-11-16 18:53:03 +10:00
Chinsky
c431877bf0 Made burns not cause internal wounds. 2012-11-16 12:18:28 +04:00
Chinsky
cee6603d59 Fixes for some surgery messages. 2012-11-16 00:57:34 +04:00
Mloc
aab9c1b946 Merge pull request #1952 from comma/master
More fixes for the fix throne.
2012-11-15 12:52:48 -08:00
Chinsky
cda5f5c755 Fixes buckled people being still buckled after teleportation with artifact.
Issue #1854
2012-11-16 00:49:49 +04:00
Chinsky
a1ccbfe198 Fixes issue #1889
Timers, proxy and other trigger =RSD= properly again.
2012-11-15 23:39:28 +04:00
Mloc
be9ab53289 Merge pull request #1951 from CIB/master
Fixes
2012-11-15 10:47:47 -08: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
7af340aa59 Merge pull request #1950 from comma/master
Fixes, fixes.
2012-11-15 08:49:09 -08:00
cib
0e11e0c041 Fix for issue #1947
Fire alarms now clear from computers when cancelled.
2012-11-15 17:48:13 +01:00
Mloc
a2bced69bc Merge pull request #1949 from CIB/master
Fixes
2012-11-15 08:45:45 -08:00