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
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
RavingManiac
6ce738b716
Wrapping paper can now wrap storage containers (e.g. backpacks, boxes, pill bottles).
...
Packages now have the same w_class as the item wrapped inside, and the sprite of the package will also vary according to the w_class.
2012-11-19 00:30:11 +08: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
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
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
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
