Commit Graph

11216 Commits

Author SHA1 Message Date
Kelenius fd450561c2 Carbon now clears ingested chemicals
Also fixes a bug that made ethy-thing not work.
2015-05-19 15:41:14 +03:00
Zuhayr 06c04edb5e Merge pull request #9337 from comma/ghettoMD
Ghetto MDing
2015-05-19 20:38:50 +09:30
Chinsky 8e46bef3d5 Merge pull request #9351 from PsiOmegaDelta/LateJoinAI
Fixes #9244.
2015-05-19 08:42:46 +03:00
Chinsky df917e1538 Changes from PR feedback. Moar feedback for inspecting mob. 2015-05-19 07:16:17 +03:00
Chinsky 8e5f5ef8e0 Merge pull request #9165 from Yoshax/trapping
Makes bear traps do damage when stepped on
2015-05-19 01:43:05 +03:00
PsiOmega c26b4e79b9 Fixes #9244.
Re-adds spawn()s for qdels in transform_procs, to prevent early .
2015-05-18 19:15:28 +02:00
PsiOmega c2200109d0 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
2015-05-18 17:50:48 +02:00
Chinsky 6a14d39209 Merge pull request #9345 from Zuhayr/master
Set vine mouse opacity to 2.
2015-05-18 18:19:45 +03:00
Zuhayr f72203c611 Set vine mouse opacity to 2. 2015-05-18 22:07:00 +09:30
Kelenius cd9aa7c9af Fixes mankini typo 2015-05-18 12:34:03 +03:00
PsiOmegaDelta 2ff11b4390 Merge pull request #9340 from GinjaNinja32/table_reinf_icon
New reinforced table overlays that better match the old sprites.
2015-05-18 08:24:36 +02:00
GinjaNinja32 cda71446eb Fixes #9341 2015-05-18 07:10:37 +01:00
Chinsky 814d38ce66 Adds more info to self-examine 2015-05-18 08:25:34 +03:00
Chinsky c62958fc89 Fixes #9336 2015-05-18 07:58:41 +03:00
Chinsky ef0f21bd1a Ghetto MD part 2
Examining people with grab-exmaine move now can tell you if they have toxins in blood, or are short of breath.
Stethoscopes now actually give real info about severe oxyloss/internal organs damage.
2015-05-18 07:45:29 +03:00
Zuhayr 3ed1917c3a Vine tweaks. Fireaxes one-shot vines, vines are mouse opaque. 2015-05-18 13:23:21 +09:30
Chinsky 26e5630e23 Ghetto diagnostics!
Grab + click with help intent to inspect the bodypart. You'll learn what injuries there are without stripping the guy. After delay, you also learn if there's a fracture here.
Also surgical incisions are now visible on examine because goddamnit.
2015-05-18 06:37:51 +03:00
Chinsky f016d51f38 Fixes cavity surgery using old organ names 2015-05-18 06:15:09 +03:00
Chinsky 57a7c307b9 Fixes dislocation not being set properly on an actual targeted limb.
Fixes being unable to pop back joints of other people. (it was making victim pick the limb)
2015-05-18 03:50:47 +03:00
Chinsky d374cd2681 Merge pull request #9292 from mwerezak/vital-areas
Allows damage to accumulate past max_damage on vital organs
2015-05-18 00:38:16 +03:00
PsiOmega c16d033b18 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-05-17 11:30:04 +02:00
Chinsky 1f76ae4250 Merge pull request #9306 from PsiOmegaDelta/ArtifactTele-150516
Teleport anomaly fix.
2015-05-17 09:07:53 +03:00
PsiOmega 8b39f9201a Compilation fixes. 2015-05-16 22:41:13 +02:00
PsiOmega 83a09faf07 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/living/carbon/brain/MMI.dm
	code/modules/projectiles/guns/launcher/crossbow.dm
	code/modules/projectiles/guns/launcher/pneumatic.dm
2015-05-16 22:38:01 +02:00
Zuhayr dbe8221c60 Merge pull request #9308 from Karolis2011/dev
Made sorting and tagger pipes dispensible
2015-05-17 03:23:10 +09:30
PsiOmegaDelta d4c205e12a Merge pull request #9200 from mwerezak/tail-swish
Tail swish animations, tail icon caching
2015-05-16 18:16:41 +02:00
Karolis2011 0999f1ab78 Made sorting pipes dispesible
also fixes #9305
2015-05-16 17:27:39 +03:00
PsiOmega 21dad8bdc0 Teleport anomaly fix.
It should no longer teleport mobs inside other atoms.
Making the dangerous assumption that touch-teleportation actually works.
2015-05-16 14:46:57 +02:00
PsiOmegaDelta 98fce1fa1e Merge pull request #9301 from Kelenius/ofChemAndRuntime
Fixes #9294
2015-05-16 13:47:05 +02:00
Chinsky 2359245f06 Merge pull request #9285 from mwerezak/master-fixes
Pneumatic cannon fix
2015-05-16 14:19:22 +03:00
GinjaNinja32 137c77c19d Typo fix 2015-05-16 10:48:59 +01:00
Zuhayr 1de493c272 Fixes #9021 2015-05-16 18:45:31 +09:30
Kelenius b4bfe917eb Fixes #9294 2015-05-16 12:05:14 +03:00
Zuhayr 36acf64f18 Partial fix for #8825 2015-05-16 18:33:03 +09:30
Zuhayr e1a14e3c41 Removes xenoarch reconstitutors entirely. "Fixes" #5413 2015-05-16 17:40:49 +09:30
GinjaNinja32 76654321e4 Merge remote-tracking branch 'upstream/dev' into new_tables
Conflicts:
	code/setup.dm
2015-05-16 08:53:33 +01:00
PsiOmegaDelta 05033b5762 Merge pull request #9278 from Ccomp5950/ravensrequest
Admin log fix:  Something that really annoys ravensdale.
2015-05-16 09:29:15 +02:00
PsiOmegaDelta 07cb2aa1ad Merge pull request #9291 from Techhead0/seeTheInvisible
Invisible people can now be heard by visible_message
2015-05-16 08:57:21 +02:00
mwerezak 413276a4c5 Allows damage to accumulate past max_damage on vital organs
Fixes #9214
2015-05-16 02:05:44 -04:00
Ccomp5950 10a8c56c5d Merge pull request #9286 from Zuhayr/dev
Fixes, clothes stripping refactor.
2015-05-16 00:53:14 -04:00
mwerezak d71a727131 remove_from_mob() considered harmful 2015-05-16 00:32:44 -04:00
mwerezak 5d620ff05b Span classes 2015-05-16 00:21:40 -04:00
mwerezak 3e41d6ff6e Fixes crossbow icon issue
Fixes an issue with the crossbow icon that occurred when releasing the
tension soon after starting to draw it back.
2015-05-15 23:06:29 -04:00
mwerezak 65819302f3 Fixes #8986, one less object verb 2015-05-15 23:06:02 -04:00
mwerezak 29609f7ec6 Fixes #8985, ammo magazine examine grammar. 2015-05-15 23:04:50 -04:00
Techhead0 35e44ab8d9 Invisible people can now be heard by visible_message
Uses blind_message instead of letting the Ninja/whatever do things
unseen.
2015-05-15 21:06:16 -04:00
ccomp5950 19cc6df391 Conversion to admin_attack_log() 2015-05-15 17:07:07 -04:00
Techhead0 ec37652997 Fixes #7999 2015-05-15 13:34:46 -04:00
Zuhayr f021467f8b Merges two redundant procs. 2015-05-16 01:55:19 +09:30
Zuhayr 890693b839 Allowed accessories to function as custom items using icon_override 2015-05-16 01:37:04 +09:30