Zuhayr
98bbb095ad
Swapped languages and datums over to global lists. Updated verbs.
2013-08-05 20:34:38 -07:00
Zuhayr
dcad0bc6b4
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-05 19:31:31 -07:00
Zuhayr
520d1b34d2
Merge resolution.
2013-08-05 08:00:03 -07:00
Segrain
440b37dcf4
Fix for #3430 .
2013-08-05 03:06:31 +03:00
Segrain
498f95929d
Maint_all_access and req_one_access.
2013-08-04 16:29:41 +03:00
Chinsky
c8cb496efa
Merge pull request #3427 from NicholasDV/keyCardAndRadStormAdditions
...
Key card and rad storm additions
2013-08-03 21:55:02 -07:00
Kilakk
2eae729426
Absolute paths for shuttle controller
2013-08-04 00:19:37 -04:00
NicholasDV
a21b7deb1f
Changes to the radiation storm event...
...
It now opens up maintenance access to all people upon start. Furthermore,
one minute after ending (and with a warning), it will return maintenance
requirements to how they were before the event. In addition to this, it
has been buffed to closer to the original amount of damage for the event.
2013-08-04 00:16:36 -04:00
NicholasDV
d4b189cd74
Actually added the button...
2013-08-04 00:07:21 -04:00
NicholasDV
9f1ae93379
Made maintenance all access capable of being revoked...
...
Via the keycard authentication consoles.
2013-08-03 23:43:11 -04:00
Kilakk
603fa03826
Shuttle doors will now close and lock upon departure
2013-08-03 23:39:51 -04:00
Zuhayr
98798ea5fc
Compile fixes for organ/reagent code.
2013-08-04 11:25:40 -07:00
Zuhayr
ed52e5010b
Merge pull request #3419 from comma/pain
...
Pain
2013-08-03 17:41:52 -07:00
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
e45f429e4c
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
...
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
maps/tgstation.2.1.0.0.1.dmm
2013-08-04 01:40:32 +04:00
Mloc
0091294204
Merge pull request #3418 from comma/dev-freeze
...
Fixed monkeys not getting space rabies via syringes.
2013-08-03 14:08:57 -07:00
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
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
Alex
35e7ec3228
Allow cyborgs to hack vending machines
2013-08-03 14:08:27 +02: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 and NicholasDV
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
Zuhayr