Zuhayr
b5d89b8929
Generalizes whitelist/species lists for datacore/preferences/new player code. Removes vox whitelist check from raid spawn.
2013-08-07 01:16:38 -07:00
Zuhayr
e9a1272d34
Moved species defines to setup.dm, add whitelisted species global.
2013-08-07 01:12:11 -07:00
Zuhayr
221324d29b
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-07 00:25:53 -07:00
Segrain
858d6d8131
Tape is not a lattice.
2013-08-07 02:56:21 +03:00
Segrain
81c8478e74
Fix for #3450 . Also, stuff.
2013-08-07 00:50:46 +03:00
Akai Alonkai
2db7beb19c
Removed Z-up function from Client/Center()
...
Turns out this was allowing mecha to travel semi-unrestricted upwards
through z-levels, including to Central Command and the Away Mission.
2013-08-06 10:46:23 -04:00
Mloc-Argent
dd303f9f82
Fixes for virology machinery.
...
Browser UI properly updates on click and on process()
Dishincubator now properly removes radiation (again)
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-08-06 11:59:50 +01:00
Zuhayr
5d80ae657d
Merge pull request #3437 from Segrain/dev
...
Camera console controls.
2013-08-05 16:36:47 -07:00
Segrain
c0742c9ca3
Camera console controls.
2013-08-06 01:42:33 +03:00
Mloc-Argent
cf193b4893
Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev
2013-08-05 22:53:25 +01:00
Mloc-Argent
c0490ca81d
String cleanup.
...
Removes VOX announcement system.
Cleans up a small amount of admin HTML procs.
Cleans tags off of the map.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-08-05 22:52:10 +01:00
Segrain
0a4e4310fd
Fix for #3432 .
2013-08-06 01:32:34 +03:00
Segrain
170c66ee8a
Fix for ERT spawning.
2013-08-06 01:30:49 +03:00
Zuhayr
cd30be7067
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-06 07:40:21 -07:00
Zuhayr
6f9b6e9704
Fixed language datum comparison, fixed staff of change runtime.
2013-08-06 07:33:07 -07:00
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
9176d56b56
Merge pull request #3434 from Mloc/master
...
Made IRCbot's password and host a config option.
2013-08-05 14:19:00 -07:00
Zuhayr
520d1b34d2
Merge resolution.
2013-08-05 08:00:03 -07:00
Mloc-Argent
9a5a1dc82c
Made IRCbot's password and host a config option.
...
Added a hook to send a message to the bot when a round starts.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-08-05 14:07:06 +01: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
