Commit Graph

13022 Commits

Author SHA1 Message Date
Chinsky
e304d0010d Merge pull request #5273 from boopcat/happydrones
fixes!
2014-06-17 14:43:55 +04:00
Chinsky
dd4a937ca9 Merge pull request #5275 from GinjaNinja32/lighters
Fixes cheap lighters burning body parts other than the hands they're being held in
2014-06-17 14:43:24 +04:00
Chinsky
1ca6a54d3a Merge pull request #5265 from mwerezak/wound-fixes
Fixes the wounding system
2014-06-17 14:41:22 +04:00
mwerezak
944394a042 Fixes armour being applied to projectiles twice 2014-06-17 01:20:49 -04:00
mwerezak
72377d160f Fixes apply_damage ignoring species mods
Also adds some adjust*Loss type procs for adjusting the damage on
specific body parts. apply_damage() should be the standard way to deal
damage to a mob, though.
2014-06-17 00:54:20 -04:00
GinjaNinja32
fcdd0198c0 Fix lighter burning random body parts 2014-06-17 04:50:14 +01:00
mwerezak
274b03b083 Adds thrown object sharp and edge flags 2014-06-16 23:21:01 -04:00
unknown
e16658c37f Adds diona unarmed attack type 2014-06-16 19:23:20 -04:00
unknown
95e05a894b Fixes projectile sharp and edge flags being ignored 2014-06-16 19:17:20 -04:00
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
Boop
07a6ad4897 Fixes #5270
Changes simple_animal/Die() to use death from mob/living instead.
2014-06-16 23:30:37 +01:00
mwerezak
6dee9cf65d Adds sharp and edge flags to appropriate items
Went through as many /obj/item/weapons as I could find and added sharp
and edge flags where appropriate.
2014-06-16 13:26:44 -04:00
mwerezak
45c2274b0a Species claws are now sharp 2014-06-16 12:54:09 -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
9f594e4755 Bullets are now properly sharp 2014-06-15 20:28:34 -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
Walter0o
85a6d8a32d fixes vox armalis being a choosable race
the IS_WHITELISTED flag will add the species to the whitelisted_species list,
which in turn gets used as the base list of choosable species in the char setup when
the server config has species whitelisting off.

unless you want giant combat spessbirds as crew ( as a security force maybe ? ;) ),
this is a bug.
2014-06-15 20:27:51 +02:00
Chinsky
09420d9fba Merge pull request #5248 from Zuhayr/master
Robot fixes.
2014-06-14 23:05:46 +04:00
Zuhayr
cd4a8ff745 Amending a runtime in the mmi change. 2014-06-15 03:39:27 +09:30
Zuhayr
194f1121c3 Amending a previous commit. 2014-06-14 20:31:35 +09:30
Zuhayr
5ad652e90c Fixes #5195 2014-06-14 18:48:13 +09:30
Zuhayr
05a1bededb Fixes #5236 2014-06-14 18:39:33 +09:30
Zuhayr
15d063c130 Fixes #4959 2014-06-14 18:33:06 +09:30
Zuhayr
98bddb9612 Fixes #5245 2014-06-14 18:06:47 +09:30
Zuhayr
cd5818fd29 Fixes #5243 2014-06-14 18:06:31 +09:30
Zuhayr
cf1fe85e62 Fixes #5246 2014-06-14 18:04:19 +09:30
Ccomp5950
5c115525cf Bugfix: Humans will no longer send the same message twice when talking on binary.
Also:  Removed the beep boop boop from showing up if you are the src of the communication.
2014-06-13 20:47:02 -05:00
Ravensdale
1fe53510ed Merge branch 'master' of https://github.com/Baystation12/Baystation12 into freeze-master-merge 2014-06-12 05:04:28 -07:00
Chinsky
c56ab301d1 Compile fix for a fix for legcuffs. 2014-06-12 02:50:11 +04:00
Chinsky
238d5dfc2a Merge pull request #5211 from Ccomp5950/mentor_change
Mentor permissions fixes and such.
2014-06-11 13:16:18 +04:00
Chinsky
95781d751a Merge pull request #5206 from mwerezak/shoe-cuffs
Fixes #5190
2014-06-11 13:10:43 +04:00
Ccomp5950
0e0c692634 Removed debugverb 2014-06-11 00:51:20 -05:00
Ccomp5950
3aa766c689 Merge branch 'master' of github.com:Baystation12/Baystation12 into mentor_change 2014-06-10 19:49:42 -05:00
Ccomp5950
77c733b17c Mentor permissions fixes and such.
Created a helper proc /proc/is_mentor(client) use this when determining if someone is a mentor and they aren't the usr of the proc (rights_check uses usr)

Mentors will no longer hear ghosts while playing
Mentors will no longer see orange text around names in check_player_age panel if they have special_roles
Mentors will no longer be able to tell players with special roles through the use of player_panel
Mentors will no longer be able to aghost, use antagHUD, then return to their bodies.
2014-06-10 19:48:41 -05:00
PsiOmega
6dd8e1e022 Fixes #5205.
Creates a new area instance for the PDA messaging room in the AI zone.
2014-06-10 20:32:16 +02:00
sick-trigger
027514c6f3 Feed other text fix
Fixes #5199
2014-06-10 10:37:43 +10:00
unknown
58700869fe Fixes #5190 2014-06-09 12:35:00 -04:00
sick-trigger
ba83728e47 Scientist records photo fix
Fixes #5156
2014-06-09 17:45:16 +10:00
Chinsky
6c78188007 Merge pull request #5175 from Hubblenaut/master
Fixes some printouts causing a runtime error when photocopied
2014-06-08 18:40:21 +04:00
GinjaNinja32
07e1701fbb Fixes shoulder holster 2014-06-08 15:25:04 +01:00
Hubblenaut
f12ee3f7b3 Fixes some printouts causing a runtime error when photocopied 2014-06-07 18:27:22 +02:00
Chinsky
e5a468521d Merge pull request #5167 from Hubblenaut/master
Minor fixes
2014-06-07 19:25:14 +04:00
Hubblenaut
33917763df Probability to bleed by airflow_hit lowered from 100% to 33% 2014-06-07 04:52:19 +02:00
Hubblenaut
eb2f9f0de1 Fixes stamp overlays being partly off the paper 2014-06-07 04:43:58 +02:00
Hubblenaut
a522cf9399 Fixes runtime error when copying the stamped EFTPOS paper 2014-06-06 20:45:39 +02:00
Hubblenaut
2200ac8f47 Fixes suit icons not updating when bloodied by airflow 2014-06-06 20:43:47 +02:00