cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,224 Commits 5 Branches 0 Tags
69a080e2d611c6d45cb157861cade41f05d23721
Commit Graph

230 Commits

Author SHA1 Message Date
unknown
c5e09980b9 Fixes bleeding checks not respecting merged wounds 2014-06-16 18:49:20 -04:00
unknown
7b59cbec5c Fixes large amounts of damage being carried by minor wound types 2014-06-16 18:42:17 -04:00
mwerezak
8461e5b01f Fixes bruises not having the right damage_type set 2014-06-16 12:15:31 -04:00
mwerezak
e829f8a633 Fixes wound merging 
Fixes wound merging completely ignoring things like bleed_timers,
bandaged and salved states, etc.
 2014-06-16 12:15:11 -04:00
mwerezak
832fb31941 Fixes many small wounds protecting against... 
...internal damage.

Also removed started_healing() proc because it doesn't actually report
whether the wound is healing and isn't really used for anything.
 2014-06-16 01:04:30 -04:00
mwerezak
1b33ca943d Separates the sharp flag into edge and sharp 
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.

Also separates is_sharp, has_edge, and can_puncture.
 2014-06-15 20:25:39 -04:00
mwerezak
cbec032ae3 Fixes wrong wound types being used 
This fixes the autoheal bug, which was being caused by wound types such
as tiny bruises from being used even for large amounts of damage.

I imagine that relying on the order of the list returned by typesof() is
always a bad idea.
 2014-06-15 19:08:29 -04:00
Hubblenaut
106d0a4811 Fixed an issue with IBs being almost twice as bad 2014-06-05 00:02:44 +02:00
Mloc-Argent
6a11ca32f8 Merge remote-tracking branch 'upstream/master' into dev 2014-05-05 22:22:01 +01:00
Mloc-Argent
e1ddec4a73 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/game/area/Space Station 13 areas.dm
	code/game/objects/items/weapons/manuals.dm
	code/modules/mob/living/say.dm
	code/modules/organs/organ_internal.dm
	code/modules/paperwork/paper.dm
	code/modules/supermatter/supermatter.dm
	html/changelog.html
	icons/mob/uniform.dmi

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-05-03 16:56:19 +01:00
Zuhayr
1a2ad49b8e Removed 'You are now sterile' line from groin loss due to spam issues when lost by an IPC as well as general pointlessness. 2014-05-03 21:27:49 +09:30
suethecake
2b2d64f05f Initial commit containing all the necessary code files that allow Tajaran, Unathi, and Skrell to change both their hair and body color to match. NO MORE GREEN/GREY! 2014-04-27 01:00:16 -06:00
Ccomp5950
b2d03d67a0 Merge pull request #4819 from Mloc/bs12-itemorgans 
human: move organ generation into a species proc
 2014-04-25 15:33:34 -05:00
Ccomp5950
dada7f1d96 Merge pull request #4767 from comma/master 
has_reagents baguette
 2014-04-22 17:02:03 -05:00
Ccomp5950
fbfcb03788 Fixes the bug where people with broke arms don't drop what they are holding. 2014-04-18 04:53:22 -05:00
Mloc-Argent
28a57a1029 human: move organ generation into a species proc 
New proc: /datum/species/create_organs
Called in set_species when no organs exist or it's forced.
Also shuffled set_species around a bit, adding a var to human/new to
specify a species to start as.
Should fix the adminspawn vox organ runtime.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-04-18 10:44:21 +01:00
Chinsky
a2035bb69b Better check for toxins. 
Didn't realize class tree was so neat nao.
 2014-04-18 04:24:06 +04:00
Chinsky
a3e6e416dc has_reagent crackdown TROIX FUCK 
Got condition backwards, it was internal wounds don't grow bigger UNLESS they have bicard.
 2014-04-18 04:05:46 +04:00
Chinsky
35bf44cce5 has_reagent crackdown Deux 
Nothing fancy, I assume that get_amount is as bad as has_reagent, so might as well cut it.
 2014-04-18 03:55:32 +04:00
Chinsky
96a40af9d1 has_reagent crackdown Uno 
Moved check for toxins inside the loop checking for booze.
Instead of looping over reagents for EACH type of toxin.
 2014-04-18 03:43:23 +04:00
Ravensdale
a3e4a43536 Changes most viable, used entries of plasma with phoron. 2014-04-10 05:05:04 -07:00
Ccomp5950
56ef5c165c Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/reagents/reagent_containers/food/cans.dm
 2014-03-28 18:46:04 -05:00
Ccomp5950
f1506acf1e Code effeciency project: Handle_Organs (human/life()) 
We do a bit of pre-processing to see if we want to do checks on all the organs.

First we don't even do preprocessing unless we have damage of some kind
afterwards we process what is hurt until it gets better or overall we get worse
when we go ahead and check everything else out again.

Can add a safety check in life every 30 ticks or so go ahead and check every organ again but I don't think it's needed.
 2014-03-22 04:33:48 -05:00
Ccomp5950
731f08eb10 Rejuvination verb fix for IPC's limbs don't suddenly become organic. 2014-03-20 20:31:33 -05:00
Chinsky
fa274ab1a7 Fixed blood injections not transmitting viruses properly. 
Keep forgetting that list is associative.
 2014-03-10 16:16:14 +04:00
Chinsky
12a97e01eb Fixed some runtimes with specieism, and blood transfer ignoring viruses' racial preferences. 2014-03-10 00:06:22 +04:00
Jeremy Liberman
d41d3b2b9e Fixes UI glitch when losing cuffs from fractures, resisting, or cult magic 2014-03-02 15:08:55 -06:00
Jeremy Liberman
4025ccbee5 Fractures and severed limbs cause cuffs to fall off. Deranged spessmen can chew their own wrists to break free. 2014-03-01 22:56:47 -06:00
Rob Nelson
3121e4fb2d DNA2 Bug Fixes - Part 2 
We discovered that most of the problems were were having was because of BYOND passing lists (e.g. SE and UI) by-ref instead of the assumed by-val.

This commit adds dna.Clone() and (UI|SE).Copy() where needed.  These should be used where DNA or SE/UI lists are COPIED, otherwise changes made in the reference will affect the real strand.

This change also messes with the gene activation logic.
 2014-02-06 23:07:35 -08:00
Zuhayr
f1b77d0ed6 Master merge. 2014-02-05 18:34:23 +10:30
Segrain
b7059519c2 Merge remote-tracking branch 'upstream/master' into dev 2014-02-03 04:36:03 +03:00
Loganbacca
70a1c768ad Broken heart fix 
Code was using a switch with variables in it. This doesn't work.
Replaced it with an if..else sequence.

Thanks to the guys from Paradise for finding this.

Note: this only fixes literal heart problems, it won't do anything for relationship issues.
 2014-02-03 00:28:15 +13:00
DJSnapshot
810de4ddaa Merge pull request #4337 from Baystation12/dev-freeze 
0.1.8 Staging [Do not merge]
 2014-01-31 12:40:15 -08:00
Segrain
4df59faf76 Surgery tracking. 2014-01-31 16:28:24 +03:00
Zuhayr
4a0fb22530 IPC brain surgery code. 2014-01-29 16:01:25 +10:30
Zuhayr
69d260a11d Preliminary surgery work for IS_SYNTHETIC. 2014-01-28 16:00:36 +10:30
Zuhayr
3b072b32b0 More dionaea tweaks, NO_PAIN, IS_PLANT and IS_SLOW specifically. 2014-01-06 14:54:35 +10:30
Zuhayr
b70a79f853 Implemented NO_PAIN and parts of NO_BLOOD, restructured species flags. 2014-01-05 23:59:39 +10:30
Zuhayr
b05f81df3d Added NO_BLOOD checks to drips, syringes. 2014-01-05 14:13:58 +10:30
Zuhayr
6fed0c70da Applying NO_BLOOD flag to bleeding code. 2014-01-05 14:06:51 +10:30
Chinsky
5068a54568 Adds update_icon to drips 2013-12-26 18:39:29 +04:00
Chinsky
5191cb4c6c Made drips use species blood too. 2013-12-26 14:12:28 +04:00
Ravensdale
95ac40a04a Re-balancing for IB, bleed rate is back to usual settings, minor nerf for 
appendicitis initial bleed rate, harder to get IB.
 2013-12-20 17:01:51 -08:00
Ravensdale
13fa1709b3 IB nerf: Makes it harder to get IB, makes the initial bleed less. 2013-12-20 14:03:24 -08:00
Mloc-Argent
b175c6906b Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 
Conflicts:
	html/changelog.html
 2013-12-13 19:13:43 +00:00
Zuhayr
b3c0079e18 Merge pull request #4004 from volas/master 
Minor fixes
 2013-12-05 02:56:06 -08:00
volas
e05b7f4341 brainmob fix: decapitated head is now really dead 2013-11-30 15:45:53 +04:00
Chinsky
ca649d95aa Fixed issue with chopped off heads not having hair icons. 
Also threw in some eyecandy, limbs now turn at random angle (70 - 130) instead of straight 90.
 2013-11-29 16:13:45 +04:00
Mloc
503302dae5 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/implants/implant.dm
	code/modules/reagents/Chemistry-Machinery.dm
 2013-11-24 23:37:09 +00:00
Nanai
7786e7a96c Sleeper Addition, Chemical Rebalance 2 
Tweaked soporific and new chems a bit more. Added Paracetamol, a lesser drug to tramadol, known to all as tylenol, and implemented it into sleepers! Gave inaprovaline the IB slowing property to keep sleepers in the game and allow EMTs better usage. Oxycodone made easier to craft by making the plasma a catalyst, but decreased it's overdose limit. Applied oxycodone and paracetamol to be able to handle things painkillers should.
 2013-11-14 19:11:31 -05:00