Cael_Aislinn
fb2eb8008e
resolved supply_pack runtime, added stuff to contraband pack to make it not-empty, added icon for absinthe
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-25 16:26:19 +10:00
Chinsky
581f2c4db5
Merge branch 'master' into crates
2012-12-21 01:03:20 +04:00
cib
e0a500377c
Fixes dropped cyborg limbs being human.
...
Makes them cyborg parts instead.
2012-12-19 23:30:58 +01:00
cib
2233d0dc8e
Fixed a bug with EMP's and robolimbs.
...
Light EMP's were much more likely to destroy robolimbs than heavy ones.
2012-12-19 23:00:01 +01:00
Chinsky
ecc73ec805
Made contraband crate not being LABELED as contraband and removed supply manifest from it.
...
I mean, really, paperwork for contraband?
2012-12-06 18:57:44 +04:00
Chinsky
d567d88749
Fixed issue with severed heads not being visible
2012-12-06 18:20:56 +04:00
Chinsky
0b614a488c
Made bandages stop bleeding when applied, not waiting until next 20-tick organ update cycle.
2012-12-02 00:02:43 +04:00
Chinsky
2e2c1e8c4c
Merge branch 'master' into crates
2012-12-01 07:14:31 +04:00
Hawk-v3
2197fd6cbc
Merge pull request #2000 from Whitellama/master
...
Map Fixes
2012-11-23 17:52:27 -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
Whitellama
20bf7f6a2b
Fixed the lack of job alt-titles in Crew Manifest
2012-11-21 22:02:18 -08:00
cib
316af619f8
Rebalanced internal bleeding.
2012-11-21 22:42:20 +01:00
cib
6fbff77163
Re-nerf lung capacity due to problems with internals.
2012-11-21 22:41:35 +01:00
cib
e24d6ee902
Reduced internal bleeding speed.
2012-11-18 15:59:28 +01: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
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
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
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
Chinsky
c431877bf0
Made burns not cause internal wounds.
2012-11-16 12:18:28 +04:00
Chinsky
3f0eb4836f
Ported some crate types frpm pre-merge.
...
Moved posters to arts crate and lipstick with cigs to party crate.
Contraband crate now has killer tomato seeds, illegal booze and drugs.
2012-11-15 17:17:56 +04:00
cib
7ae7099098
Ported autopsy.
2012-11-14 20:31:31 +01:00
cib
c96d245f2d
Fixed a bug where all organs would heal always.
2012-11-14 18:01:55 +01:00
cib
397f010de5
Buff bandage healing speed. A LOT.
2012-11-14 16:51:58 +01:00
cib
450248864b
Added lung rupturing and lung surgery.
2012-11-14 16:20:47 +01:00
cib
422ec63bfc
Merge branch 'master' of github.com:Baystation12/Baystation12
...
Conflicts:
code/game/objects/items/devices/scanners.dm
code/modules/mob/living/carbon/human/human.dm
2012-11-13 19:01:03 +01:00
cib
c1fb2766b7
Increased the progression time for appendicitis and alien embryo.
2012-11-13 18:54:54 +01:00
cib
2eb4022fe4
Surgery now triggers specialized pain messages if not done with anesthetic.
2012-11-13 17:06:06 +01:00
cib
ef4ee093a5
Balance fixes to internal wounds.
...
- Their damage now increases more slowly.
- They now cause faster bleeding.
- They can't be cured anymore with bicaridine etc.
2012-11-13 16:01:43 +01:00
Chinsky
d5e8f90a9e
Made virus crate spawn with virus2 samples instead of old ones.
2012-11-13 17:45:22 +04:00
cib
4b331f3676
Fixes to internal bleeding.
...
- Created internal wound doesn't close instantly anymore.
- Small fix to body scanner display.
2012-11-12 14:16:19 +01:00
cib
6d3e742992
Large amounts of damage can now trigger internal bleeding.
2012-11-12 13:38:55 +01:00
cib
95181d96a8
Several fixes to germs.
2012-11-12 13:17:11 +01:00
cib
e92cecdefe
Added basic germ code.
...
This will only trigger in surgery for now - That is when you cut someone open in surgery, you'd better wash your hands before, or otherwise you'll get infected wounds.
2012-11-12 12:51:28 +01:00
Chinsky
18f56f4a38
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-11-09 14:32:49 +04:00
SkyMarshal
9b3389145e
Fixed some runtimes with mulebots, the security computer, and the medical computer, as well as readded the nice prompt the cloner gives to ghosts when they are being cloned. Fixed an odd compile error.
2012-11-08 14:49:01 -07:00
Chinsky
47db4eded3
Can attach limbs now. No preparations needed yet.
2012-11-07 20:01:55 +04:00
Chinsky
4a9c7b82ae
Commented out gibbing when torso takes too much damage. Because no one likes when you gib someone by poking knife in their chest enough times.
2012-11-06 16:37:16 +04:00
Chinsky
771389f871
Added warning messages before vomiting.
...
You have in total two warnings and to react now.
2012-10-31 14:36:09 +04:00
Chinsky
a2e83e962d
Alternative titles system.
...
Custom character records.
Different clothing for alternative titles.
2012-10-31 08:40:51 +04:00
Chinsky
3583d78a45
Made stronger EMP pulses have BIGGER chance of exploding robolimb. It was backwards for some reason, so weak pulses had higher chance of explosion.
2012-10-30 07:56:43 +04:00
headswe
0d98248b6f
Merge pull request #1821 from comma/master
...
Pain & Other Ported Things
2012-10-23 08:47:30 -07:00
Cael_Aislinn
9340f70252
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
...
Conflicts:
icons/obj/items.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-22 19:35:03 +10:00
Chinsky
91b61f91e7
Readded pain and shock system.
...
Tramadol and oxycodone are back too.
2012-10-22 06:38:57 +04:00
Chinsky
7ae59ba6f7
Slapped a few nullchecks near reported runtimes.
2012-10-21 16:41:44 +04:00
Chinsky
52f9c0c9dc
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-10-21 05:52:18 +04:00
Chinsky
77d12b5e19
Added photos to security and medical records terminals.
...
Generated during record creation, smaller version of char setup preview code.
2012-10-21 05:45:36 +04:00
