Zuhayr
326f3821e1
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-07-09 15:52:31 +09:30
mwerezak
ffcb068b96
Fixed wrong operator
2014-07-09 00:11:20 -04:00
mwerezak
5e56d09512
Sterilizine reduces germ_level on contact
2014-07-08 18:57:07 -04:00
mwerezak
910ce676b0
Fixes advanced trauma kits claiming to disinfect but not doing so
2014-07-08 18:49:51 -04:00
unknown
dcfbeb0924
Fixes missing length check before pick()
2014-07-08 16:12:55 -04:00
unknown
9297b56b7a
Cyborgs now understand all languages besides vox-pidgin
2014-07-08 16:01:44 -04:00
Zuhayr
8d90c40265
Merge pull request #5537 from Hubblenaut/wheelchair
...
Fixes canmove updating wrongly on movable chairs
2014-07-08 20:54:19 +09:30
Zuhayr
6499385279
Temp commit with robot module work
2014-07-08 19:44:33 +09:30
Hubblenaut
a6e6a8939f
Cleans code up for easier editing
2014-07-08 07:39:49 +02:00
Zuhayr
c239ec432a
Merge pull request #5536 from Ccomp5950/mentor_no_highlight
...
Mentors will no longer see highlighed names in ahelps / msay for players with special roles (Antags, etc.).
2014-07-08 14:55:04 +09:30
mwerezak
4ac685afd9
Removes duplicate defines, updates comments
2014-07-07 23:18:12 -04:00
Hubblenaut
6568533d0d
Fixes canmove updating wrongly on movable chairs
2014-07-08 04:48:21 +02:00
Ccomp5950
36cf4bd41e
Mentors will no longer see highlighed names in ahelps / msay for players with special roles (Antags, etc.).
2014-07-07 21:37:28 -05:00
Hubblenaut
d6caeb79d6
Fix: Painkillers stay in body for decent time
2014-07-08 02:47:37 +02:00
Hubblenaut
38ac5ece7c
Health Analyzer can read all types of beneficial medicine
2014-07-08 02:09:53 +02:00
mwerezak
b8a102beb4
Increases cough rate for lung infections
2014-07-07 17:30:19 -04:00
mwerezak
008c5447b7
Tweaks internal organ spread rate
2014-07-07 17:27:01 -04:00
mwerezak
5764d95808
Makes minor wounds harder to infect
2014-07-07 17:19:13 -04:00
mwerezak
a4c9f31b49
Fixes #5532 and increases the time required for organs to become infected from wounds
...
Also removes the now unnecessary get_cure_threshold() proc, caps the
rate at which an organ can receive germs from wounds, and makes germs
spread from external to internal organs happen one organ at a time
instead of all at once.
2014-07-07 17:01:15 -04:00
Mloc
a00f6a40c8
Merge pull request #5510 from GinjaNinja32/changeui
...
Fix Change UI verb
2014-07-07 13:42:33 +01:00
Mark Aherne
1b8d865061
Work in progress on a major revision of the NanoUI templating system.
2014-07-07 02:05:39 +01:00
Mark Aherne
4703526738
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
nano/templates/escape_pod_console.tmpl
nano/templates/simple_docking_console_pod.tmpl
2014-07-06 23:26:26 +01:00
Mark Aherne
4376465f5d
Work in progress on a major revision of the NanoUI templating system.
2014-07-06 23:02:09 +01:00
mwerezak
88f3618e9f
Required spaceacillin levels no longer scale
...
The amount of spaceacillin required to stop infections is now a flat 5
units, instead of scaling with germ_level.
2014-07-06 15:53:41 -04:00
mwerezak
6f2fff4a5e
Increases the time it takes for germ_level to rise to ambient
2014-07-06 15:45:44 -04:00
mwerezak
cdd27aec4a
Infected wounds show up more readily on the health scanner
2014-07-06 15:44:59 -04:00
mwerezak
f3951c702c
Spaceacillin now prevents wounds from transferring germs
2014-07-06 15:40:24 -04:00
mwerezak
cb0437ecca
Fixes reagent_containers not being usable for surgery
2014-07-06 15:37:05 -04:00
mwerezak
30dc2519e9
Makes bleeding logic a little clearer
2014-07-06 13:22:52 -04:00
mwerezak
aeb587f90b
Allows necrosis to be fixed with peridaxon and surgery
2014-07-06 13:02:58 -04:00
Mloc-Argent
64d2a69a32
Merge remote-tracking branch 'upstream/master' into dev
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/modules/mob/living/carbon/human/human_damage.dm
2014-07-06 17:50:53 +01:00
mwerezak
5948ed591e
Reduces amount of toxin damage dealt by infections
...
Reduces the toxin damage dealt by non-necrotic infections by a factor of
1.5. Also increases the germ_level required to reach necrosis.
2014-07-06 11:19:19 -04:00
mwerezak
267fe55430
Adjusts the curing of infections
2014-07-06 11:04:12 -04:00
mwerezak
f1f9641bb5
Fixes dionaea getting infections
2014-07-06 02:34:49 -04:00
mwerezak
b376f117b8
Makes infections cure faster
2014-07-06 02:33:10 -04:00
Mloc
4981d620d0
Merge pull request #5507 from mwerezak/supply-shuttle-fix
...
Supply shuttle fixes
2014-07-05 23:16:42 +01:00
GinjaNinja32
d389466c8a
Fix Change UI verb
2014-07-05 21:28:11 +01:00
mwerezak
6d0a3b864d
Shuttle now can only be late when arriving
2014-07-05 14:49:30 -04:00
mwerezak
cd6594f223
Fixes shuttle being late AFTER it arrives
2014-07-05 14:44:07 -04:00
Mloc
bda1dac41c
Merge pull request #5502 from mwerezak/robot-actuator
...
Fixes #5499
2014-07-05 11:33:04 +01:00
Mloc
4c2767203c
Merge pull request #5503 from mwerezak/heist-fix
...
Fixes Heist ending immediately
2014-07-05 11:32:37 +01:00
Ccomp5950
2bdab3b5d3
Merge pull request #5504 from mwerezak/supply-shuttle-fix
...
Fixes the supply shuttle being stuck in warmup if forbidden atoms are aboard
2014-07-05 04:15:27 -05:00
Zuhayr
21e625d89b
Added Crisis and Surgeon modules, removed Medical module, added Construction module, altered Mining and Engineering modules.
2014-07-05 16:48:59 +09:30
Zuhayr
c9ca3cc43e
Removes NO_BLOOD from Vox.
2014-07-05 16:04:10 +09:30
mwerezak
6e5824ac33
Fixes the supply shutting being stuck in warmup if forbidden atoms are aboard
...
Might be related to #5459 , not sure though.
2014-07-04 19:52:50 -04:00
mwerezak
d538c5c640
Fixes #5499
2014-07-04 19:35:57 -04:00
mwerezak
1aeb094a79
Fixes Heist ending immediately
2014-07-04 19:06:55 -04:00
Walter0o
3e95ad9786
adds shuttle_control access check to proper place
2014-07-04 21:38:39 +02:00
Mloc
53de412107
Merge pull request #5493 from Zuhayr/master
...
Fixes
2014-07-04 19:28:54 +01:00
Mloc-Argent
25ec90ba26
mob: fix a movement issue
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-07-04 17:54:25 +01:00
