cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,790 Commits 8 Branches 0 Tags
a4e5bad4098b901bab0594fccf921ebaf831e4fe
Commit Graph

65 Commits

Author SHA1 Message Date
Chinsky
fb0fb4da6a Merge pull request #3759 from Baystation12/dev-freeze 
freeze -> dev
 2013-10-11 11:41:06 -07:00
jack-fractal
32c3f27675 * adding a 'rejuvinate' function to organs that fixes all types of damage 
* adding a 'restore_all_organs' function to living creatures
* adding a 'restore_blood_loss' function to humans
* fixing changeling stasis power to heal organ and blood damage
* fixing adming rejuvinate verb to fix organ and blood damage
 2013-10-11 12:39:54 -04:00
Chinsky
77d7cffa57 No idea why, but it caused all mobs spawn with deformed limbs. 2013-10-06 14:11:13 +04:00
Chinsky
4d42a3a36d Changes to Shutdown Syndrome. 
Now it only affects limbs.
Icon is changed to deformed to reflect it.
Dead limbs do not cause pain messages.
 2013-10-06 09:04:41 +04:00
Erthilo
8f3d303e45 Bicaridine slows but does not stop internal bleeding. 2013-09-02 17:53:28 +01:00
Erthilo
720d74a0b7 Internal bleeding tweaked. Cryo and Bicaridine will prevent IB from bleeding and getting worse. Bicaridine over 30 units will slowly heal IB. IB cannot be completely healed by bicaridine until 10 minutes after getting IB. Bleeding rate for IB reduced. 2013-09-01 21:31:22 +01:00
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