Commit Graph

12987 Commits

Author SHA1 Message Date
unknown
7b59cbec5c Fixes large amounts of damage being carried by minor wound types 2014-06-16 18:42:17 -04: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
sick-trigger
027514c6f3 Feed other text fix
Fixes #5199
2014-06-10 10:37:43 +10: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
Zuhayr
d713b6517d Merge pull request #5152 from sick-trigger/master
Small fixes/changes
2014-06-07 03:03:14 +09:30
SparklySheep
8c6ee1061e Removes Impedrezene from the Paralysis Pen
Because random brain damage from a pen is terrible, especially if you're trying to extract information from the person.
2014-06-05 21:53:16 -05:00
Zuhayr
4233f2eb8c Update drone.dm
Typo fix and message trim fix.
2014-06-06 10:13:40 +09:30
sick-trigger
2df8eca7cb Health analyzers display blood type
Saves having to mess around with your PDA during a crisis (not really,
just grab that O- bag)
2014-06-05 18:09:31 +10:00
sick-trigger
aecf06028e Painkillers leave body correctly
Tramadol, paracetamol and oxy will now leave a mob's body. Fixes #5150.
2014-06-05 18:09:18 +10:00
sick-trigger
72ca3372b6 Airlock construction fix
- door electronics now stay on mob until fully installed
- text fix
2014-06-05 18:09:05 +10:00
Hubblenaut
d5aacc8e79 Fixes setting internals on belt- and suit storage slots being ignored 2014-06-05 00:41:54 +02:00
Hubblenaut
106d0a4811 Fixed an issue with IBs being almost twice as bad 2014-06-05 00:02:44 +02:00
Zuhayr
65a2f590b7 Merge pull request #5136 from Zuhayr/master
Serithi's request, taj and unathi spawn with sandals.
2014-06-04 19:52:00 +09:30
Chinsky
13633b06db Merge pull request #5142 from mwerezak/vox-breathmask
Fixes #5138
2014-06-04 13:14:18 +04:00
Zuhayr
a00d4295a4 Fixed small drone talk and Bump() issues. 2014-06-04 16:26:12 +09:30
Zuhayr
e0fb68d810 Fixed that odd name issue with podspawn dionaea. 2014-06-04 16:25:51 +09:30
Zuhayr
a661f3ee50 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-06-04 16:11:45 +09:30
Zuhayr
1865d5f8e7 Merge pull request #5135 from DJSnapshot/hotfix
color change for mentor OOC
2014-06-04 15:48:03 +09:30
Ccomp5950
e490cfbea9 Merge pull request #5130 from mwerezak/drone-access
Drone Fixes
2014-06-03 19:49:15 -05:00
mwerezak
cc50ddf0d5 Fixes #5138 2014-06-03 20:10:24 -04:00
mwerezak
715056fca7 Readds tator fab to drone bay 2014-06-03 20:01:16 -04:00
Ccomp5950
f0a75407b8 Rights check instead of holder check? Sure why not.
Mentors can now see ahelps.
2014-06-03 15:28:14 -05:00
Zuhayr
aa643865dd Serithi's request, taj and unathi spawn with sandals. 2014-06-04 00:56:17 +09:30
DJSnapshot
32bb0f25c1 color change ( http://i.imgur.com/6SAj7OT.png ) 2014-06-02 23:17:23 -07:00
mwerezak
a6bc516313 Readds flashes to all robots except drones.
Drones also get a special low-power flashlight, now.
2014-06-02 23:05:37 -04:00
mwerezak
29fac4e05c Adds drone cameras to engineering network 2014-06-02 20:13:23 -04:00
mwerezak
6b11904e28 Fixes all robot_modules having access to flashes 2014-06-02 20:09:09 -04:00
mwerezak
5a1782f2f1 ID swiping drones now uses visible_message() 2014-06-02 19:52:18 -04:00
mwerezak
475bd59284 Fixes #5118
Also fixes robot/access() so that it will accept any one of the accesses
in req_access, instead of all - a much more likely use case.
2014-06-02 19:38:33 -04:00
Mloc
171a8e2111 Merge pull request #5127 from Ccomp5950/mentor_change
Mentor Unnerf.
2014-06-02 22:20:24 +01:00
Chinsky
6599545499 Merge pull request #5119 from boopcat/happydrones
refactors some disposals filtering code and remaps some disposals pipes
2014-06-02 18:19:28 +04:00
Ccomp5950
1350115824 Mentor Unnerf.
JMP was doing a rights check in the Topic instead of doing it on the proc, just went ahead and fixed the rights check to include mentors.
Mentors now have player panel but can't see traitor panel.  The idea is so they can't tell who is an antag through this.
2014-06-02 07:09:00 -05:00
Chinsky
2c4e9a2f38 Merge pull request #5117 from Ccomp5950/mentor_change
Mentor changes.
2014-06-02 10:36:18 +04:00
Zuhayr
ff20919ab5 Fixes a minor icon-flicker thing with the drone fabricator. 2014-06-02 15:41:38 +09:30
Boop
168c39dd54 refactors some disposals filtering code and remaps some disposals pipes
New things!
/obj/structure/disposalpipe/tagger
 - retags a holder when it passes through
/obj/structure/disposalpipe/tagger/partial - retags a holder when it passes through two times; good for loop detection
/obj/structure/disposalpipe/sortjunction/wildcard - filters out all holders that are tagged
/obj/structure/disposalpipe/sortjunction/untagged - filters out untagged holders

Tagging doesn't use an icky list index system any more, tags are put into a global list and directly checked against.

Changed the map around a bit, disposals is now a proper loop but anything that's not tagged, is tagged with "Disposals" or anything that passes the tagger twice will be filtered out.

Not a feature, just a fix for drones being sad about weird disposals. <3
2014-06-01 23:30:20 +01:00