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
Chinsky
5064989b26
Merge pull request #3423 from NicholasDV/ertChanges
...
ERT Changes
2013-08-03 14:47:43 -07:00
Segrain
f13c84ed04
Fix for power alarms cameras.
2013-08-04 01:05:50 +03: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
81487c9cdb
Minor hair fix.
2013-08-04 01:50:00 -07: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
37f134ec42
Corruption fix - we had way too many strings somehow.
2013-08-02 20:14:20 -07:00
Zuhayr
a470444963
TEMPORARY fix for the too-many-strings RSC corruption issue.
2013-08-03 09:21:53 -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
cf5d3f9a2e
Variable inject amounts for sleepers.
2013-08-02 19:34:10 +03:00
Segrain
826ce1c0f1
Fixes for handling embedded objects.
2013-08-02 19:32:58 +03:00
Segrain
d51809faa2
Separating autoinjectors box from injector box.
2013-08-02 19:30:02 +03:00
Segrain
dd3a8fc568
Advanced medical equipment for NanoMeds.
2013-08-02 19:27:23 +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
c2712dd9d3
Fix for #3410 .
2013-08-01 20:58:35 +03: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
bbdcb81868
Added advanced medikits.
2013-08-01 09:58:09 +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
8008a27ec4
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2013-07-31 18:54:45 -07:00
comma
8735254b87
Moved code from parent class with checks to subclasses.
...
Lots of copypaste code, but better that bloating that one main function even more IMHO.
As for bloat reason - readded advanced medithingies. Work same as lesser ones, but heal some damage directly instead, and have different messages/
2013-08-01 05:53:48 +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
Segrain
8021250804
Type mismatch fix.
2013-07-31 10:32:19 +03:00
Segrain
bd6c5f4b30
Removing internal cameras again.
2013-07-31 05:43:23 +03:00
Chinsky
36619656b8
Merge pull request #3395 from Zuhayr/feature
...
Podman rewrite, icons. Fixes from master. ERT stuff from Meyar.
2013-07-30 14:47:55 -07:00
Zuhayr
2644684a81
Proper runtime fix for ablative armour and tasers.
2013-07-31 07:30:57 -07:00
Zuhayr
76e18b0ebe
Derp, compile fix.
2013-07-31 04:49:15 -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
