igalan
a27b2ac005
Removed commented out useless crap.
2014-07-11 05:43:59 +01:00
igalan
fc3648a523
Syntiflesh is defined twice, both as a food/snack and obj/item/weapon. The first one is edible while the second one is not.
...
This PR comments out the non-edible one and replaces any reference of it to the edible one.
2014-07-10 22:20:13 +01:00
Ccomp5950
87d907ef8d
Merge pull request #5545 from Zuhayr/dev
...
Added Roaper's custom item, generalized the hardsuit modification kit so...
2014-07-10 01:04:08 -05:00
DJSnapshot
eacd384d39
Merge pull request #5554 from Baystation12/master
...
Updating dev with master
2014-07-09 23:00:04 -07:00
Zuhayr
f477012ab8
Merge pull request #5533 from mwerezak/wound-infections
...
Fix for #5532 and the last of the infection changes, I hope
2014-07-09 19:28:00 +09:30
Mloc
c7b2aefdc7
Merge pull request #5534 from Hubblenaut/master
...
Fixes painkillers leaving the body way too fast and adds minor feature to health analyzers
2014-07-09 10:41:22 +01:00
Zuhayr
7c6bec03ae
Added Roaper's custom item, generalized the hardsuit modification kit somewhat, modified Solaruin's custom item accordingly.
2014-07-09 16:58:38 +09:30
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
Zuhayr
8d90c40265
Merge pull request #5537 from Hubblenaut/wheelchair
...
Fixes canmove updating wrongly on movable chairs
2014-07-08 20:54:19 +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
Decius-R
b6c61b5293
Updated rune.dm to switch some options in an alert
...
As per requested.
2014-07-07 22:38:33 -04: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
Decius
021c48ea02
Added in damage towards people being converted by cult, and fixed a typo...
...
People who are being converted by the cult now take 10 damage in the first
place. Additionally, those who resist take a little bit more damage and get
a fair number of messages showing their great painful resisting and whatnot.
Light and fun.
Signed-off-by: Decius <deciusreln97@gmail.com >
2014-07-07 22:23:20 -04:00
Hubblenaut
6f1759a7aa
Fixes me being dumb with renaming variables
2014-07-08 03:07:22 +02: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
Zuhayr
ee432f24ec
Merge pull request #5524 from zekesulastin/fix-ui-targeting
...
Fixes #4584 and #5200
2014-07-07 23:02:49 +09:30
Mloc
d45e8cd2d1
Merge pull request #5516 from DJSnapshot/laptop
...
Added Goon-esque environmental sounds
2014-07-07 13:42:48 +01:00
Mloc
d1556b0d69
Merge pull request #5513 from Walter0o/patch-1
...
fixes another heist mode breaking bug
2014-07-07 13:42:39 +01:00
Mloc
a00f6a40c8
Merge pull request #5510 from GinjaNinja32/changeui
...
Fix Change UI verb
2014-07-07 13:42:33 +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
ZekeSulastin
c6e1dc461a
Makes DNA modifier look at dna.real_name instead of name
2014-07-06 13:02:57 -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
ZekeSulastin
fb4d19d8ee
Replaces hardcoded UI length with constant
2014-07-05 23:37:12 -04:00
Walter0o
68ad7c7373
fixes another heist mode breaking bug
...
vox can never win their inviolate_crew objective due to not having cortical stacks put in them on setup.
i took this code from one_click_antag's create_vox_raider() and edited it slightly.
i was thinking about merging the two procs into one but i will leave that for you to decide.
2014-07-06 03:32:21 +02:00
DJSnapshot
784707b16c
volume fallout over distance to make it even better.
2014-07-05 17:04:28 -07: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
Boop
8c3f6f2226
fix a world << THING
...
(help)
2014-07-05 20:28:08 +01:00
