cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-05-18 20:59:56 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,974 Commits 8 Branches 26 Tags
e6f679d147c75a405b080aa41e5b64158366b114
Commit Graph

1259 Commits

Author SHA1 Message Date
Erthilo b75d97a488 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/game/machinery/kitchen/gibber.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	maps/tgstation2.dmm
 2013-08-31 17:45:31 +01:00
Erthilo 0cb361f737 Removed undeeded "ATTACK:" 2013-08-28 03:37:11 +01:00
Erthilo 5437b1bbac Added two ears back. 2013-08-27 22:05:27 +01:00
Segrain 5f8c8d9cce Fix for negative damage. 2013-08-23 15:33:51 +03:00
Mloc e20f2e1409 Small fixes to hair. 
Hair styles that aren't designed to have color shifts will no longer be affected.
Balding virus symptom now only applies to humans.

Signed-off-by: Mloc <colmohici@gmail.com>
 2013-08-22 15:12:59 +01:00
Mloc de79aa733b More dismemberment fixes 
More elegant solution to gasping torsos.
Applying damage to torso will no longer gib everything connected to it.

Signed-off-by: Mloc <colmohici@gmail.com>
 2013-08-20 02:06:56 +01:00
Mloc-Argent b2a3405f80 Two fixes for dismemberment. 
Species dismemberment now creates the correctly textured gibs.
Decapitation now kills you.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-19 23:49:53 +01:00
Segrain 2ea03c0925 Fix for #3535. 2013-08-17 00:26:27 +03:00
Zuhayr 520d1b34d2 Merge resolution. 2013-08-05 08:00:03 -07:00
Zuhayr 98798ea5fc Compile fixes for organ/reagent code. 2013-08-04 11:25:40 -07:00
Zuhayr b34effdc4b Merge pull request #3420 from comma/medtweaks 
Liver's delight
 2013-08-03 17:39:21 -07:00
Chinsky f460deb459 Typo 2013-08-04 04:29:37 +04:00
comma e45f429e4c Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
	maps/tgstation.2.1.0.0.1.dmm
 2013-08-04 01:40:32 +04:00
comma 747c71096e Fixed monkeys not getting space rabies via syringes. 2013-08-04 00:32:37 +04:00
comma 4e68b1c042 Bicaridine stops internal wounds from growing bigger over time. 
Does not stop bleeding itself though.
 2013-08-03 23:06:17 +04:00
comma fb1f32a427 Painkillers stop regular pain messages too, not only custom ones. 2013-08-03 23:05:04 +04:00
Zuhayr b875ff021b Vast array of changes to replace mutantrace with species datum 2013-08-03 15:08:54 -07:00
Zuhayr 49d53c376b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2013-08-03 12:39:51 -07:00
Segrain d21a29dc09 Runtime error fix. 2013-08-02 19:09:54 +03:00
comma ba9d3fa1eb High toxins level cause damage to liver. 
Antitoxin stops that damage, and heals liver if it's not too damaged (over 10 damage)
 2013-08-02 18:40:30 +04:00
comma de1309102e Splints! 
Actually added 2 commits before, but now with full capabilities.
 2013-08-01 05:58:55 +04:00
comma b4bc37db06 Capped regen from treated wounds at 50 damage. 
If there is a wound with more than 50 damage, it only can be healed with chems or advanced medikits (if they heal it past 50 on their use).
 2013-08-01 05:57:30 +04:00
Mloc-Argent f29cd5946f Merge branch 'master' into bleeding-edge-freeze 2013-07-19 14:48:40 +01:00
Mloc-Argent cf53dd7a10 Revert "Adds in the Kida" 
This reverts commit a2fddc0fc1.
 2013-07-12 12:22:35 +01:00
comma 50f94ddd93 Merge branch 'bleeding-edge-freeze' into viro 2013-07-01 17:33:24 +04:00
comma da884f4ddc Merge branch 'bleeding-edge-freeze' of https://github.com/comma/Baystation12 into viro 2013-07-01 17:23:09 +04:00
Zuhayr d89950487a Added a clot timer to wounds. If a wound is smaller than 30 damage, it will stop bleeding after <damage> seconds. More damage increases the counter. 2013-06-27 08:47:15 -07:00
Zuhayr 5dbb0bcb87 Changelog. 2013-06-27 06:41:47 -07:00
Zuhayr 333e59190c Added minimum damage for cutting wounds to bleed visibly. 2013-06-27 02:09:36 -07:00
Segrain a944cda68e Autopsy fix. 2013-06-26 16:12:32 +03:00
Zuhayr a877a2a9a8 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-25 23:55:01 -07:00
Zuhayr 59119fea07 Fixes #3146 2013-06-24 22:09:03 -07:00
Chinsky a4325d69eb Fixes for runtimes and viruses staying in blood after curing. 2013-06-21 21:37:20 +04:00
Chinsky dd8ae321f9 Merge pull request #3119 from CIB/bleeding-edge-freeze 
Lowered organ max damage across the board.
 2013-06-21 01:14:29 -07:00
Zuhayr a16c8e0595 Fixes #3081 2013-06-21 18:00:25 -07:00
cib b4c6fc306f Lowered organ max damage across the board. 
As it was, the only way for organs to be detached was when you were dead.
 2013-06-21 10:00:51 +02:00
Chinsky 960a22ee43 Changes way viruses are stored in mobs. 
Now it's an associative list:
uniqueID - virus datum

Updated most instances to match it.
 2013-06-19 02:28:53 +04:00
Chinsky fd13ff0d64 Merge branch 'vials' into viro 2013-06-16 11:22:15 +04:00
NicholasDV a2fddc0fc1 Adds in the Kida 
Adds in the Kida Race to all parts.
 2013-06-13 18:22:05 -04:00
Chinsky 300a73da71 Should make unusable limbs treated as such. 2013-06-09 16:51:07 +04:00
Chinsky 28c15adaa3 Fixed runtime in blood transfer. 
Fixed cure machine producing virus blood wrong.
Changes to existing syndromes:
-Cough : now has chance to infect people around mob.
-Telepathy : now should properly give powers to the mob.

New syndromes:
-Topographical Cretinism : confusing directions, much like drunk effect.
-Blackout : short-time blindness
 2013-06-09 16:30:22 +04:00
Chinsky 7a8a822a92 Made it possible for mob to be infected with several viruses at once. 2013-06-09 13:31:16 +04:00
MisterBook e05a20ad6f Putting VOX back in. 2013-06-07 12:31:38 -05:00
MisterBook eab6f4fc44 Taser fix v.3.2 
Now accounts for multiple layers of armor.

I've also commented out Vox stuff, while Zuhayr fixes it. Because, no compile.

I also fixed whistle.dm
 2013-06-05 19:37:29 -05:00
Zuhayr 06f04e6374 Vox mutantrace, vox clothing, minor surgery mod for mutantrace specific surgery steps. Fixed captain's jacket sprite. 2013-06-05 17:35:38 +09:30
Chinsky ceddb499d3 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into organ 
Conflicts:
	html/changelog.html
 2013-06-01 18:48:09 +04:00
Chinsky 28b62d0207 Merge branch 'bleeding-edge-freeze' into organ 
Conflicts:
	html/changelog.html
 2013-06-01 18:33:58 +04:00
Chinsky f728fedccd Set wound update accuracy to 1. 
In profiler results organ processing was like in the bottom. Time to bump it up.

Changed healing speed.
For some reason untreated wounds did not heal at all previously.
Now they do at the speed of 0.2 health per tick for one organ.
If wound is treated, 0.3 bonus is added, so overall organs can be healed up to 0.5 per tick with first aid.
If wound damage is over 20, 0.2 natural regeneration doesn't happen.
 2013-06-01 18:25:26 +04:00
Chinsky 275003afa8 Fixed indentation. 2013-06-01 18:20:59 +04:00
Chinsky 5de37def3d Moved blood compatibility check to the related file. 2013-06-01 09:08:45 +04:00