comma
625eecddaa
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into pain
...
Conflicts:
html/changelog.html
2013-08-04 00:43:10 +04:00
comma
747c71096e
Fixed monkeys not getting space rabies via syringes.
2013-08-04 00:32:37 +04:00
comma
1bca7c7454
Made character HUD show pain level instead of actual health.
...
Pain are calculated based on health, but all damages contribute differently, for example 50u burn will feel like 100u, but 50u poisoning would only feel like 25u.
2013-08-04 00:12:38 +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
840e4b7a7d
Deleted a redundant file.
2013-08-04 01:45:20 -07:00
Zuhayr
610a3210e0
Continued species rewrite. Modified life.dm, moved species.dm around due to define issue.
2013-08-04 01:40:09 -07:00
Zuhayr
b875ff021b
Vast array of changes to replace mutantrace with species datum
2013-08-03 15:08:54 -07:00
Zuhayr
11621e3f8c
Added pressure and temperature variables to species, checked them in life() to determine damage by-species.
2013-08-03 14:04:37 -07:00
Zuhayr
197f2a3e8b
Commented out luchador string replacement.
2013-08-03 12:52:10 -07:00
Zuhayr
0f0ac218b3
Commented out blob and wish granter.
2013-08-03 12:51:41 -07:00
Zuhayr
dec28dda86
Merge branch 'feature' of https://github.com/Zuhayr/Baystation12
2013-08-03 12:41:46 -07:00
Zuhayr
49d53c376b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2013-08-03 12:39:51 -07:00
NicholasDV
8da16aac47
Made admins able to override the 'can_call_ert' via force...
...
And removed a few // DEC I put in for being able to easily hop in the code.
2013-08-03 05:23:44 -04:00
NicholasDV
3e364635b2
Separated ERT from red alert and other small changes...
...
Separated the ERT to be callable via the keycard auth device.
Gave the ERT call different messages to work with the above, as well as a message when it has been denied.
The old base amount of 50 was way too stronk. Furthermore, it was added to by other factors from the game. It has been lowered a bit and a proc added in to increase it the longer the round has been going on.
Made it so that you may only attempt to call the ERT a single time.
Changed it so that you only have 5 minutes to join the ERT after it has been called.
2013-08-03 05:13:28 -04:00
Segrain
63dc2dc345
Runtime error fix.
2013-08-03 04:10:22 -04:00
Zuhayr
27f7d1580d
Merge branch 'feature' of https://github.com/Zuhayr/Baystation12
2013-08-02 20:16:50 -07:00
Zuhayr
618afa1be7
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2013-08-03 09:16:41 -07:00
Zuhayr
a8c04cefc6
Merge.
2013-08-03 09:14:20 -07:00
Segrain
826ce1c0f1
Fixes for handling embedded objects.
2013-08-02 19:32:58 +03:00
Segrain
d21a29dc09
Runtime error fix.
2013-08-02 19:09:54 +03:00
comma
019e8aa0d4
Alcohol causes liver damage and some toxic damage, at the stage where you pass out.
2013-08-02 18:41:07 +04: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
Segrain
fb4552f394
Fix for #3383 . Again.
2013-08-01 17:15:16 +03:00
Segrain
2e2cca058c
Fix for #3406 .
2013-08-01 17:11:12 +03:00
Peter Wall
0bd10c628d
Fixed ore processing machines not updating properly
2013-08-01 14:42:53 +02:00
comma
95f00d0523
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into medtweaks
2013-08-01 10:03:46 +04:00
comma
c8f5b98a95
Autoinjectors.
...
Now they are one-use, as they were intended.
You can still change their contents with syringes before they are used.
To mitigate their one-use nature, box of them is added to medical closets and supply pack.
2013-08-01 08:12:56 +04:00
Zuhayr
b4e8c60472
Merge resolution.
2013-07-31 19:21:58 -07: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
Zuhayr
f50256eabb
Work progresses on species datums. Mass-commit due to repo issues requiring a reset.
2013-07-31 11:50:56 -07:00
Segrain
c8381b6e90
Pipe painter addition.
2013-07-31 14:23:30 +03:00
Zuhayr
2644684a81
Proper runtime fix for ablative armour and tasers.
2013-07-31 07:30:57 -07:00
Zuhayr
486f46d71e
Moved around podmen code, adjusted a lot of strings, rewrote/modified a lot of the podman generation code, added podman icons, commented out potato person green tint.
2013-07-31 04:17:17 -07:00
Zuhayr
361ecb4e2b
Merge resolution.
2013-07-30 17:33:18 -07:00
Segrain
578a020c8b
Fix for #3392 .
2013-07-30 12:15:12 +03:00
Zuhayr
a39aff3471
Removed a very very redundant check in the ablative armour code. Thanks Segrain.
2013-07-29 12:51:20 -07:00
Zuhayr
5adc32cf8e
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-07-29 12:15:23 -07:00
Zuhayr
b1ac1d58f9
Fixes #3383
2013-07-29 12:15:04 -07:00
Zuhayr
c361e6f4b7
Commented out debug string.
2013-07-29 16:55:03 -07:00
Zuhayr
6c53208115
Taser and examine fixes.
2013-07-29 16:50:37 -07:00
Zuhayr
2d45713d69
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
2013-07-29 15:47:44 -07:00
Segrain
ea320dca67
Conflict fix?
2013-07-29 08:15:54 +03:00
Segrain
da2786891a
Fix for #3337 .
2013-07-29 08:12:02 +03:00
Zuhayr
af1f0108a2
Armalis pinning fix.
2013-07-29 07:06:55 -07:00
Zuhayr
08ff3df905
Vox gear tweaks. Dartgun buff, removal of tank sounds, addition of multitools.
2013-07-29 06:43:37 -07:00
Zuhayr
8c3c26e2e8
Added cortical stacks for vox survival objective.
2013-07-29 06:36:55 -07:00
Zuhayr
c2e75f9ddb
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2013-07-29 06:05:00 -07:00
Segrain
fdce68fe66
Magboots fix.
2013-07-28 14:31:23 +03:00
